Otel 28 manual changes

Cargo.toml

@@ -38,9 +38,9 @@ chrono = { version = "0.4.39", features = ["serde"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["json", "env-filter"] }
 tracing-opentelemetry = "0.28.0"
-opentelemetry = { version = "0.27.1", features = ["trace"] }
-opentelemetry-otlp = { version = "0.27.0", optional = true }
-opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio"] }
+opentelemetry = { version = "0.28.0", features = ["trace"] }
+opentelemetry-otlp = { version = "0.28.0", optional = true, default-features=false, features = ["trace", "grpc-tonic"] }
+opentelemetry_sdk = { version = "0.28.0", features = ["rt-tokio"] }
 thiserror = "2.0.11"
 anyhow = "1.0.95"
 prometheus-client = "0.23.1"

src/telemetry.rs

@@ -1,30 +1,33 @@
 #![allow(unused_imports)] // some used only for telemetry feature
 use opentelemetry::trace::{TraceId, TracerProvider};
-use opentelemetry_sdk::{runtime, trace as sdktrace, trace::Config, Resource};
+use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
+use sdktrace::{Config, SdkTracerProvider};
 use tracing_subscriber::{prelude::*, EnvFilter, Registry};
 
 ///  Fetch an opentelemetry::trace::TraceId as hex through the full tracing stack
 pub fn get_trace_id() -> TraceId {
     use opentelemetry::trace::TraceContextExt as _; // opentelemetry::Context -> opentelemetry::trace::Span
     use tracing_opentelemetry::OpenTelemetrySpanExt as _; // tracing::Span to opentelemetry::Context
-    tracing::Span::current()
+    TraceId::INVALID
+    /*tracing::Span::current()
         .context()
         .span()
         .span_context()
         .trace_id()
+    */
 }
 
 #[cfg(feature = "telemetry")]
 fn resource() -> Resource {
     use opentelemetry::KeyValue;
-    Resource::new([
-        KeyValue::new("service.name", env!("CARGO_PKG_NAME")),
-        KeyValue::new("service.version", env!("CARGO_PKG_VERSION")),
-    ])
+    Resource::builder()
+        .with_service_name(env!("CARGO_PKG_NAME"))
+        .with_attribute(KeyValue::new("service.version", env!("CARGO_PKG_VERSION")))
+        .build()
 }
 
 #[cfg(feature = "telemetry")]
-fn init_tracer() -> sdktrace::Tracer {
+fn init_tracer() -> SdkTracerProvider {
     use opentelemetry_otlp::{SpanExporter, WithExportConfig};
     let endpoint = std::env::var("OPENTELEMETRY_ENDPOINT_URL").expect("Needs an otel collector");
     let exporter = SpanExporter::builder()
@@ -33,9 +36,9 @@ fn init_tracer() -> sdktrace::Tracer {
         .build()
         .unwrap();
 
-    let provider = sdktrace::TracerProvider::builder()
-        .with_batch_exporter(exporter, runtime::Tokio)
+    let provider = SdkTracerProvider::builder()
         .with_resource(resource())
+        .with_batch_exporter(exporter)
         .build();
 
     opentelemetry::global::set_tracer_provider(provider.clone());