From b2c41261de19100c11160d426815c35e8034dde4 Mon Sep 17 00:00:00 2001 From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:39:18 -0600 Subject: [PATCH] more vaccilation --- server/Cargo.toml | 4 ++++ server/src/main.rs | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index f5f9b5b..82e306c 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -20,6 +20,10 @@ hyper-util = "0.1.1" indoc = "2.0.4" nalgebra = { version = "0.32.3", features = ["serde-serialize"] } opentelemetry = "0.21.0" +opentelemetry-appender-tracing = "0.2.0" +opentelemetry-jaeger = "0.20.0" +opentelemetry-otlp = { version = "0.14.0", features = ["logs", "http-proto", "reqwest-client"] } +opentelemetry-semantic-conventions = "0.13.0" opentelemetry-stdout = { version = "0.2.0", features = ["trace"] } opentelemetry_sdk = { version = "0.21.1", features = ["logs", "rt-tokio"] } parking_lot = { version = "0.11", features = ["serde"] } diff --git a/server/src/main.rs b/server/src/main.rs index 03401c7..6af8212 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -24,6 +24,7 @@ use indoc::formatdoc; use opentelemetry::trace::TracerProvider as _; use opentelemetry_sdk::{trace::TracerProvider, runtime::Tokio}; use opentelemetry_stdout as stdout; +use tracing_subscriber::prelude::*; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::Registry; @@ -57,16 +58,16 @@ async fn main() -> Result<(), Error> { None => "save".into(), })?; - let provider = TracerProvider::builder() - .with_batch_exporter(opentelemetry_stdout::SpanExporter::default(),Tokio) - .build(); + let tracer = opentelemetry_jaeger::new_agent_pipeline() + .with_service_name("avarus") + .install_simple()?; + let opentelemetry = tracing_opentelemetry::layer().with_tracer(tracer); + tracing_subscriber::registry() + .with(opentelemetry) + .try_init()?; - let tracer = provider.tracer("avarus"); - - let telemetry = tracing_opentelemetry::layer().with_tracer(tracer); - let subscriber = Registry::default().with(telemetry); - - tracing::subscriber::set_global_default(subscriber)?; + let root = span!(tracing::Level::INFO, "starting"); + let enter = root.enter(); info!("started");