chore(deps): update opentelemetry

Author: renovate[bot]

Cargo.toml

@@ -27,27 +27,27 @@ axum = { version = "0.8", default-features = false }
 http = "^1"
 hyper = "1"
 insta = { version = "1.40", features = ["yaml", "redactions"] }
-opentelemetry = { version = "0.27", features = [
+opentelemetry = { version = "0.28", features = [
   "trace",
 ], default-features = false }
-opentelemetry_sdk = { version = "0.27", default-features = false, features = [
+opentelemetry_sdk = { version = "0.28", default-features = false, features = [
   "rt-tokio",
 ] }
-opentelemetry-aws = { version = "0.15", default-features = false }
-opentelemetry-jaeger-propagator = { version = "0.27", default-features = false }
-opentelemetry-resource-detectors = { version = "0.6", default-features = false }
-opentelemetry-semantic-conventions = { version = "0.27", default-features = false }
-opentelemetry-zipkin = { version = "0.27", default-features = false }
-opentelemetry-otlp = { version = "0.27", default-features = false }
-opentelemetry-proto = { version = "0.27", default-features = false }
-opentelemetry-stdout = { version = "0.27" }
+opentelemetry-aws = { version = "0.16", default-features = false }
+opentelemetry-jaeger-propagator = { version = "0.28", default-features = false }
+opentelemetry-resource-detectors = { version = "0.7", default-features = false }
+opentelemetry-semantic-conventions = { version = "0.28", default-features = false }
+opentelemetry-zipkin = { version = "0.28", default-features = false }
+opentelemetry-otlp = { version = "0.28", default-features = false }
+opentelemetry-proto = { version = "0.28", default-features = false }
+opentelemetry-stdout = { version = "0.28" }
 rstest = "0.24"
 tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
 tonic = { version = "0.12", default-features = false } #should be sync with opentelemetry-proto
 tower = { version = "0.5", default-features = false }
 tracing = "0.1"
-tracing-opentelemetry = "0.28"
+tracing-opentelemetry = "0.29"
 
 [profile.dev.package.insta]
 opt-level = 3

fake-opentelemetry-collector/src/lib.rs

@@ -96,26 +96,25 @@ async fn recv_many<T>(rx: &mut Receiver<T>, at_least: usize, timeout: Duration)
 
 pub async fn setup_tracer_provider(
     fake_server: &FakeCollectorServer,
-) -> opentelemetry_sdk::trace::TracerProvider {
+) -> opentelemetry_sdk::trace::SdkTracerProvider {
     // if the environment variable is set (in test or in caller), `with_endpoint` value is ignored
     std::env::remove_var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT");
 
-    opentelemetry_sdk::trace::TracerProvider::builder()
+    opentelemetry_sdk::trace::SdkTracerProvider::builder()
         .with_batch_exporter(
             SpanExporter::builder()
                 .with_tonic()
                 .with_endpoint(fake_server.endpoint())
                 .build()
                 .expect("failed to install tracer"),
-            opentelemetry_sdk::runtime::Tokio,
         )
         .build()
 }
 
 pub async fn setup_logger_provider(
     fake_server: &FakeCollectorServer,
-) -> opentelemetry_sdk::logs::LoggerProvider {
-    opentelemetry_sdk::logs::LoggerProvider::builder()
+) -> opentelemetry_sdk::logs::SdkLoggerProvider {
+    opentelemetry_sdk::logs::SdkLoggerProvider::builder()
         //Install simple so we don't have to wait for batching in tests
         .with_simple_exporter(
             LogExporter::builder()

init-tracing-opentelemetry/src/otlp.rs

@@ -1,21 +1,21 @@
 use opentelemetry::trace::TraceError;
 use opentelemetry_otlp::SpanExporter;
-use opentelemetry_sdk::{trace::TracerProvider, Resource};
+use opentelemetry_sdk::{trace::SdkTracerProvider, trace::TracerProviderBuilder, Resource};
 #[cfg(feature = "tls")]
 use {opentelemetry_otlp::WithTonicConfig, tonic::transport::ClientTlsConfig};
 
 #[must_use]
-pub fn identity(v: opentelemetry_sdk::trace::Builder) -> opentelemetry_sdk::trace::Builder {
+pub fn identity(v: TracerProviderBuilder) -> TracerProviderBuilder {
     v
 }
 
 // see https://opentelemetry.io/docs/reference/specification/protocol/exporter/
 pub fn init_tracerprovider<F>(
     resource: Resource,
     transform: F,
-) -> Result<TracerProvider, TraceError>
+) -> Result<SdkTracerProvider, TraceError>
 where
-    F: FnOnce(opentelemetry_sdk::trace::Builder) -> opentelemetry_sdk::trace::Builder,
+    F: FnOnce(TracerProviderBuilder) -> TracerProviderBuilder,
 {
     debug_env();
     let (maybe_protocol, maybe_endpoint) = read_protocol_and_endpoint_from_env();
@@ -40,11 +40,9 @@ where
             None
         }
     };
-    let mut trace_provider: opentelemetry_sdk::trace::Builder =
-        TracerProvider::builder().with_resource(resource);
+    let mut trace_provider = SdkTracerProvider::builder().with_resource(resource);
     if let Some(exporter) = exporter {
-        trace_provider =
-            trace_provider.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio);
+        trace_provider = trace_provider.with_batch_exporter(exporter);
     }
 
     trace_provider = transform(trace_provider);

init-tracing-opentelemetry/src/resource.rs

@@ -2,7 +2,6 @@ use opentelemetry::KeyValue;
 // use opentelemetry_resource_detectors::OsResourceDetector;
 use opentelemetry_sdk::{resource::ResourceDetector, Resource};
 use opentelemetry_semantic_conventions::resource;
-use std::time::Duration;
 
 /// To log detected value set environement variable `RUST_LOG="...,otel::setup::resource=debug"`
 /// ```rust
@@ -42,19 +41,14 @@ impl DetectResource {
 
     #[must_use]
     pub fn build(mut self) -> Resource {
-        let base = Resource::default();
-        let fallback = Resource::from_detectors(
-            Duration::from_secs(0),
-            vec![
-                Box::new(ServiceInfoDetector {
-                    fallback_service_name: self.fallback_service_name.take(),
-                    fallback_service_version: self.fallback_service_version.take(),
-                }),
-                //Box::new(OsResourceDetector), //FIXME enable when available for opentelemetry >= 0.25
-                //Box::new(ProcessResourceDetector),
-            ],
-        );
-        let rsrc = base.merge(&fallback); // base has lower priority
+        //Box::new(OsResourceDetector), //FIXME enable when available for opentelemetry >= 0.25
+        //Box::new(ProcessResourceDetector),
+        let rsrc = Resource::builder()
+            .with_detector(Box::new(ServiceInfoDetector {
+                fallback_service_name: self.fallback_service_name.take(),
+                fallback_service_version: self.fallback_service_version.take(),
+            }))
+            .build();
         debug_resource(&rsrc);
         rsrc
     }
@@ -73,7 +67,7 @@ pub struct ServiceInfoDetector {
 }
 
 impl ResourceDetector for ServiceInfoDetector {
-    fn detect(&self, _timeout: Duration) -> Resource {
+    fn detect(&self) -> Resource {
         let service_name = std::env::var("OTEL_SERVICE_NAME")
             .or_else(|_| std::env::var("SERVICE_NAME"))
             .or_else(|_| std::env::var("APP_NAME"))
@@ -91,6 +85,13 @@ impl ResourceDetector for ServiceInfoDetector {
                     .map(std::string::ToString::to_string)
             })
             .map(|v| KeyValue::new(resource::SERVICE_VERSION, v));
-        Resource::new(vec![service_name, service_version].into_iter().flatten())
+        let mut resource = Resource::builder_empty();
+        if let Some(service_name) = service_name {
+            resource = resource.with_attribute(service_name);
+        }
+        if let Some(service_version) = service_version {
+            resource = resource.with_attribute(service_version);
+        }
+        resource.build()
     }
 }

init-tracing-opentelemetry/src/stdio.rs

@@ -2,27 +2,25 @@ use opentelemetry::trace::{TraceError, TracerProvider as _};
 use opentelemetry::InstrumentationScope;
 use opentelemetry_sdk::trace as sdktrace;
 use opentelemetry_sdk::trace::BatchSpanProcessor;
-use opentelemetry_sdk::trace::TracerProvider;
+use opentelemetry_sdk::trace::SdkTracerProvider;
+use opentelemetry_sdk::trace::TracerProviderBuilder;
 use opentelemetry_sdk::Resource;
 use std::fmt::Debug;
 use std::io::Write;
 
 #[must_use]
-pub fn identity<W: Write>(
-    v: opentelemetry_sdk::trace::Builder,
-) -> opentelemetry_sdk::trace::Builder {
+pub fn identity<W: Write>(v: TracerProviderBuilder) -> TracerProviderBuilder {
     v
 }
 
 pub fn init_tracer<F, W>(resource: Resource, transform: F) -> Result<sdktrace::Tracer, TraceError>
 where
-    F: FnOnce(opentelemetry_sdk::trace::Builder) -> opentelemetry_sdk::trace::Builder,
+    F: FnOnce(TracerProviderBuilder) -> TracerProviderBuilder,
     W: Write + Debug + Send + Sync + 'static,
 {
     let exporter = opentelemetry_stdout::SpanExporter::default();
-    let processor =
-        BatchSpanProcessor::builder(exporter, opentelemetry_sdk::runtime::Tokio).build();
-    let mut provider_builder: opentelemetry_sdk::trace::Builder = TracerProvider::builder()
+    let processor = BatchSpanProcessor::builder(exporter).build();
+    let mut provider_builder = SdkTracerProvider::builder()
         .with_span_processor(processor)
         .with_resource(resource)
         .with_sampler(sdktrace::Sampler::AlwaysOn);

init-tracing-opentelemetry/src/tracing_subscriber_ext.rs

@@ -1,5 +1,5 @@
 use opentelemetry::trace::{TraceError, TracerProvider};
-use opentelemetry_sdk::trace::{self, Tracer};
+use opentelemetry_sdk::trace::{SdkTracerProvider, Tracer};
 use tracing::{info, Subscriber};
 use tracing_opentelemetry::OpenTelemetryLayer;
 use tracing_subscriber::{filter::EnvFilter, layer::SubscriberExt, registry::LookupSpan, Layer};
@@ -94,12 +94,13 @@ where
 
 #[must_use = "Recommend holding with 'let _guard = ' pattern to ensure final traces are sent to the server"]
 pub struct TracingGuard {
-    tracerprovider: trace::TracerProvider,
+    tracerprovider: SdkTracerProvider,
 }
 
 impl Drop for TracingGuard {
     fn drop(&mut self) {
-        self.tracerprovider.force_flush();
+        #[allow(unused_must_use)]
+        let _ = self.tracerprovider.force_flush();
     }
 }
 

testing-tracing-opentelemetry/src/lib.rs

@@ -88,7 +88,7 @@ pub struct FakeEnvironment {
     fake_collector: fake_opentelemetry_collector::FakeCollectorServer,
     rx: Receiver<Vec<u8>>,
     _subsciber_guard: tracing::subscriber::DefaultGuard,
-    tracer_provider: opentelemetry_sdk::trace::TracerProvider,
+    tracer_provider: opentelemetry_sdk::trace::SdkTracerProvider,
 }
 
 impl FakeEnvironment {