update to opentelemetry 0.29 (#40)

Author: davidhewitt

Cargo.toml

@@ -19,14 +19,14 @@ tonic = { version = "0.12", optional = true }
 
 rand = "0.9.0"
 
-opentelemetry = { version = "0.28", default-features = false, features = ["trace"] }
-opentelemetry_sdk = { version = "0.28", default-features = false, features = ["trace"] }
-opentelemetry-otlp = { version = "0.28", default-features = false, features = ["trace", "metrics"] }
+opentelemetry = { version = "0.29", default-features = false, features = ["trace"] }
+opentelemetry_sdk = { version = "0.29", default-features = false, features = ["trace"] }
+opentelemetry-otlp = { version = "0.29", default-features = false, features = ["trace", "metrics"] }
 futures-util = "0.3"
 
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-opentelemetry = "0.29"
+tracing-opentelemetry = "0.30"
 
 thiserror = "2"
 
@@ -38,7 +38,7 @@ regex = "1.11.1"
 [dev-dependencies]
 async-trait = "0.1.88"
 insta = "1.42.1"
-opentelemetry_sdk = { version = "0.28", default-features = false, features = ["testing"] }
+opentelemetry_sdk = { version = "0.29", default-features = false, features = ["testing"] }
 regex = "1.11.1"
 tokio = {version = "1.44.1", features = ["test-util"] }
 ulid = "1.2.0"

src/bridges/tracing.rs

@@ -294,19 +294,20 @@ mod tests {
     fn test_tracing_bridge() {
         let exporter = InMemorySpanExporterBuilder::new().build();
 
-        let handler = crate::configure()
-            .local()
-            .send_to_logfire(false)
-            .with_additional_span_processor(SimpleSpanProcessor::new(Box::new(
-                DeterministicExporter::new(exporter.clone(), file!(), line!()),
-            )))
-            .install_panic_handler()
-            .with_default_level_filter(LevelFilter::TRACE)
-            .with_advanced_options(
-                AdvancedOptions::default().with_id_generator(DeterministicIdGenerator::new()),
-            )
-            .finish()
-            .unwrap();
+        let handler =
+            crate::configure()
+                .local()
+                .send_to_logfire(false)
+                .with_additional_span_processor(SimpleSpanProcessor::new(
+                    DeterministicExporter::new(exporter.clone(), file!(), line!()),
+                ))
+                .install_panic_handler()
+                .with_default_level_filter(LevelFilter::TRACE)
+                .with_advanced_options(
+                    AdvancedOptions::default().with_id_generator(DeterministicIdGenerator::new()),
+                )
+                .finish()
+                .unwrap();
 
         let guard = set_local_logfire(handler);
 
@@ -340,7 +341,7 @@ mod tests {
                 },
                 parent_span_id: 0000000000000000,
                 span_kind: Internal,
-                name: "event src/bridges/tracing.rs:314",
+                name: "event src/bridges/tracing.rs:315",
                 start_time: SystemTime {
                     tv_sec: 0,
                     tv_nsec: 0,
@@ -1280,7 +1281,7 @@ mod tests {
                                         "code.lineno",
                                     ),
                                     value: I64(
-                                        322,
+                                        323,
                                     ),
                                 },
                             ],
@@ -1346,7 +1347,7 @@ mod tests {
                                         "code.lineno",
                                     ),
                                     value: I64(
-                                        323,
+                                        324,
                                     ),
                                 },
                             ],

src/internal/exporters/console.rs

@@ -5,7 +5,6 @@ use std::{
 };
 
 use chrono::{DateTime, Utc};
-use futures_util::future::BoxFuture;
 use nu_ansi_term::{Color, Style};
 use opentelemetry::Value;
 use opentelemetry_sdk::trace::SpanData;
@@ -35,14 +34,14 @@ impl SimpleConsoleSpanExporter {
 }
 
 impl opentelemetry_sdk::trace::SpanExporter for SimpleConsoleSpanExporter {
-    fn export(
-        &mut self,
+    async fn export(
+        &self,
         batch: Vec<opentelemetry_sdk::trace::SpanData>,
-    ) -> BoxFuture<'static, opentelemetry_sdk::error::OTelSdkResult> {
+    ) -> opentelemetry_sdk::error::OTelSdkResult {
         if !self.stopped {
             self.writer.write_batch(&batch);
         }
-        Box::pin(std::future::ready(Ok(())))
+        Ok(())
     }
 
     fn shutdown(&mut self) -> opentelemetry_sdk::error::OTelSdkResult {
@@ -384,7 +383,7 @@ mod tests {
         1970-01-01T00:00:00.000002Z DEBUG logfire::internal::exporters::console::tests debug span
         1970-01-01T00:00:00.000003Z DEBUG logfire::internal::exporters::console::tests debug span with explicit parent
         1970-01-01T00:00:00.000004Z  INFO logfire::internal::exporters::console::tests hello world log
-        [2m1970-01-01T00:00:00.000005Z[0m[31m ERROR[0m [2;3mlogfire[0m [1mpanic: oh no![0m [3mlocation[0m=src/internal/exporters/console.rs:370:17, [3mbacktrace[0m=disabled backtrace
+        [2m1970-01-01T00:00:00.000005Z[0m[31m ERROR[0m [2;3mlogfire[0m [1mpanic: oh no![0m [3mlocation[0m=src/internal/exporters/console.rs:369:17, [3mbacktrace[0m=disabled backtrace
         "#);
     }
 }

src/internal/exporters/remove_pending.rs

@@ -1,6 +1,5 @@
 use std::collections::HashMap;
 
-use futures_util::future::BoxFuture;
 use opentelemetry_sdk::{
     error::OTelSdkResult,
     trace::{SpanData, SpanExporter},
@@ -18,7 +17,7 @@ impl<Inner> RemovePendingSpansExporter<Inner> {
 }
 
 impl<Inner: SpanExporter> SpanExporter for RemovePendingSpansExporter<Inner> {
-    fn export(&mut self, mut spans: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
+    async fn export(&self, mut spans: Vec<SpanData>) -> OTelSdkResult {
         let mut spans_by_id = HashMap::new();
 
         spans = spans
@@ -44,7 +43,7 @@ impl<Inner: SpanExporter> SpanExporter for RemovePendingSpansExporter<Inner> {
             .collect();
 
         spans.extend(spans_by_id.into_values());
-        self.0.export(spans)
+        self.0.export(spans).await
     }
 
     fn shutdown(&mut self) -> OTelSdkResult {

src/lib.rs

@@ -158,7 +158,11 @@ pub enum ConfigureError {
 
     /// Error configuring the OpenTelemetry tracer.
     #[error("Error configuring the OpenTelemetry tracer: {0}")]
-    Trace(#[from] opentelemetry::trace::TraceError),
+    Trace(#[from] opentelemetry_sdk::trace::TraceError),
+
+    /// OpenTelemetry exporter failed to build
+    #[error("Error building the OpenTelemetry exporter: {0}")]
+    ExporterBuildError(#[from] opentelemetry_otlp::ExporterBuildError),
 
     /// Error installing the OpenTelemetry tracer.
     #[error("Error configuring the OpenTelemetry tracer: {0}")]
@@ -548,7 +552,7 @@ impl LogfireConfigBuilder {
 
         if let Some(console_writer) = console_writer.clone() {
             tracer_provider_builder = tracer_provider_builder.with_span_processor(
-                SimpleSpanProcessor::new(Box::new(SimpleConsoleSpanExporter::new(console_writer))),
+                SimpleSpanProcessor::new(SimpleConsoleSpanExporter::new(console_writer)),
             );
         }
 

src/test_utils.rs

@@ -4,7 +4,6 @@ use std::{
     borrow::Cow,
     collections::{HashMap, hash_map::Entry},
     future::Future,
-    pin::Pin,
     sync::{
         Arc, Mutex,
         atomic::{AtomicU64, Ordering},
@@ -72,10 +71,7 @@ impl<Inner> DeterministicExporter<Inner> {
 }
 
 impl<Inner: SpanExporter> SpanExporter for DeterministicExporter<Inner> {
-    fn export(
-        &mut self,
-        mut batch: Vec<SpanData>,
-    ) -> Pin<Box<dyn Future<Output = OTelSdkResult> + Send>> {
+    fn export(&self, mut batch: Vec<SpanData>) -> impl Future<Output = OTelSdkResult> + Send {
         for span in &mut batch {
             // By remapping timestamps to deterministic values, we should find that
             // - pending spans have the same start time as their real span
@@ -133,30 +129,32 @@ impl<Inner: SpanExporter> SpanExporter for DeterministicExporter<Inner> {
 
 #[async_trait]
 impl<Inner: PushMetricExporter> PushMetricExporter for DeterministicExporter<Inner> {
-    async fn export(&self, metrics: &mut ResourceMetrics) -> OTelSdkResult {
-        let timestamp_remap = self.timestamp_remap.clone();
-        for scope in &mut metrics.scope_metrics {
-            for metric in &mut scope.metrics {
-                if let Some(sum) = (*metric.data).as_mut().downcast_mut::<Sum<u64>>() {
-                    sum.start_time = timestamp_remap
-                        .lock()
-                        .unwrap()
-                        .remap_timestamp(sum.start_time);
-                    sum.time = timestamp_remap.lock().unwrap().remap_timestamp(sum.time);
-
-                    for data_point in &mut sum.data_points {
-                        data_point
-                            .attributes
-                            .sort_by_cached_key(|kv| kv.key.to_string());
+    fn export(&self, metrics: &mut ResourceMetrics) -> impl Future<Output = OTelSdkResult> {
+        async move {
+            let timestamp_remap = self.timestamp_remap.clone();
+            for scope in &mut metrics.scope_metrics {
+                for metric in &mut scope.metrics {
+                    if let Some(sum) = (*metric.data).as_mut().downcast_mut::<Sum<u64>>() {
+                        sum.start_time = timestamp_remap
+                            .lock()
+                            .unwrap()
+                            .remap_timestamp(sum.start_time);
+                        sum.time = timestamp_remap.lock().unwrap().remap_timestamp(sum.time);
+
+                        for data_point in &mut sum.data_points {
+                            data_point
+                                .attributes
+                                .sort_by_cached_key(|kv| kv.key.to_string());
+                        }
                     }
                 }
             }
+            self.exporter.export(metrics).await
         }
-        self.exporter.export(metrics).await
     }
 
-    async fn force_flush(&self) -> OTelSdkResult {
-        self.exporter.force_flush().await
+    fn force_flush(&self) -> OTelSdkResult {
+        self.exporter.force_flush()
     }
 
     fn shutdown(&self) -> OTelSdkResult {
@@ -179,7 +177,7 @@ impl<Inner> DeterministicExporter<Inner> {
         }
     }
 
-    fn remap_timestamp(&mut self, from: SystemTime) -> SystemTime {
+    fn remap_timestamp(&self, from: SystemTime) -> SystemTime {
         self.timestamp_remap.lock().unwrap().remap_timestamp(from)
     }
 }

tests/test_basic_exports.rs

@@ -6,10 +6,8 @@ use insta::assert_debug_snapshot;
 use opentelemetry_sdk::{
     Resource,
     metrics::{
-        InMemoryMetricExporterBuilder, ManualReader,
-        data::ResourceMetrics,
-        exporter::{self},
-        reader::MetricReader,
+        InMemoryMetricExporterBuilder, ManualReader, data::ResourceMetrics,
+        exporter::PushMetricExporter, reader::MetricReader,
     },
     trace::{InMemorySpanExporterBuilder, SimpleSpanProcessor},
 };
@@ -33,8 +31,10 @@ fn test_basic_span() {
     let handler = logfire::configure()
         .local()
         .send_to_logfire(false)
-        .with_additional_span_processor(SimpleSpanProcessor::new(Box::new(
-            DeterministicExporter::new(exporter.clone(), file!(), line!()),
+        .with_additional_span_processor(SimpleSpanProcessor::new(DeterministicExporter::new(
+            exporter.clone(),
+            file!(),
+            line!(),
         )))
         .install_panic_handler()
         .with_default_level_filter(LevelFilter::TRACE)
@@ -1032,7 +1032,7 @@ fn test_basic_span() {
                         "code.lineno",
                     ),
                     value: I64(
-                        690,
+                        694,
                     ),
                 },
                 KeyValue {
@@ -1239,7 +1239,7 @@ impl SharedManualReader {
         }
     }
 
-    async fn export(&self, exporter: &mut dyn exporter::PushMetricExporter) {
+    async fn export<E: PushMetricExporter>(&self, exporter: &E) {
         let mut metrics = ResourceMetrics {
             resource: Resource::builder_empty().build(),
             scope_metrics: Vec::new(),