Update opentelemetry

Author: piotrm50

crates/telemetry-subscribers/Cargo.toml

@@ -17,17 +17,17 @@ crossterm.workspace = true
 futures.workspace = true
 once_cell.workspace = true
 opentelemetry = "0.24"
-opentelemetry-otlp = { version = "0.17", features = ["grpc-tonic"] }
-opentelemetry-proto = "0.7"
-opentelemetry_sdk = { version = "0.24", features = ["rt-tokio"] }
+opentelemetry-otlp = { version = "0.25", features = ["grpc-tonic"] }
+opentelemetry-proto = "0.25"
+opentelemetry_sdk = { version = "0.25", features = ["rt-tokio"] }
 prometheus.workspace = true
 prost.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tonic.workspace = true
 tracing.workspace = true
 tracing-appender = "0.2.2"
-tracing-opentelemetry = "0.25"
+tracing-opentelemetry = "0.26"
 tracing-subscriber.workspace = true
 
 [features]

crates/telemetry-subscribers/src/file_exporter.rs

@@ -80,29 +80,27 @@ impl CachedOpenFile {
 #[derive(Debug)]
 pub(crate) struct FileExporter {
     pub cached_open_file: CachedOpenFile,
+    resource: ResourceAttributesWithSchema,
 }
 
 impl FileExporter {
     pub fn new(file_path: Option<PathBuf>) -> std::io::Result<Self> {
         Ok(Self {
             cached_open_file: CachedOpenFile::new(file_path)?,
+            resource: ResourceAttributesWithSchema::default(),
         })
     }
 }
 
 impl SpanExporter for FileExporter {
     fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
         let cached_open_file = self.cached_open_file.clone();
+        let resource_spans = group_spans_by_resource_and_scope(batch, &self.resource);
         async move {
             cached_open_file
                 .with_file(|maybe_file| {
                     if let Some(file) = maybe_file {
-                        let request = ExportTraceServiceRequest {
-                            resource_spans: group_spans_by_resource_and_scope(
-                                batch,
-                                &ResourceAttributesWithSchema::default(),
-                            ),
-                        };
+                        let request = ExportTraceServiceRequest { resource_spans };
 
                         let buf = request.encode_length_delimited_to_vec();
 

crates/telemetry-subscribers/src/lib.rs

@@ -20,7 +20,7 @@ use opentelemetry::{
 };
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::{
-    Resource,
+    Resource, runtime,
     trace::{BatchSpanProcessor, Sampler, ShouldSample, TracerProvider},
 };
 use span_latency_prom::PrometheusSpanLatencyLayer;
@@ -425,18 +425,20 @@ impl TelemetryConfig {
                 let endpoint = env::var("OTLP_ENDPOINT")
                     .unwrap_or_else(|_| "http://localhost:4317".to_string());
 
-                let tracer = opentelemetry_otlp::new_pipeline()
+                let p = opentelemetry_otlp::new_pipeline()
                     .tracing()
                     .with_exporter(
                         opentelemetry_otlp::new_exporter()
                             .tonic()
                             .with_endpoint(endpoint),
                     )
                     .with_trace_config(config)
-                    .install_batch(opentelemetry_sdk::runtime::Tokio)
+                    .install_batch(runtime::Tokio)
                     .expect("Could not create async Tracer")
                     .tracer("iota-node");
 
+                let tracer = p.tracer(service_name);
+
                 tracing_opentelemetry::layer().with_tracer(tracer)
             };
 
@@ -486,15 +488,12 @@ impl TelemetryConfig {
         // too early then no output will appear!
         let guards = TelemetryGuards::new(config_clone, worker_guard, provider);
 
-        (
-            guards,
-            TracingHandle {
-                log: log_filter_handle,
-                trace: trace_filter_handle,
-                file_output,
-                sampler,
-            },
-        )
+        (guards, TracingHandle {
+            log: log_filter_handle,
+            trace: trace_filter_handle,
+            file_output,
+            sampler,
+        })
     }
 }