Make sending traces to Tempo less confusing

Author: ndr-ds

linera-base/src/tracing_otel.rs

@@ -11,10 +11,7 @@ use {
     opentelemetry_otlp::{SpanExporter, WithExportConfig},
     opentelemetry_sdk::{trace::SdkTracerProvider, Resource},
     tracing_opentelemetry::OpenTelemetryLayer,
-    tracing_subscriber::{
-        filter::{filter_fn, FilterExt as _},
-        layer::Layer,
-    },
+    tracing_subscriber::{filter::filter_fn, layer::Layer},
 };
 
 /// Initializes tracing with OpenTelemetry OTLP exporter to Tempo.
@@ -43,15 +40,9 @@ pub fn init_with_opentelemetry(log_name: &str, otlp_endpoint: Option<&str>) {
     global::set_tracer_provider(tracer_provider.clone());
     let tracer = tracer_provider.tracer("linera");
 
-    let telemetry_only_filter =
-        filter_fn(|metadata| metadata.is_span() && metadata.target() == "telemetry_only");
+    let tempo_filter = filter_fn(|metadata| metadata.is_span() && metadata.target() != "no_tempo");
 
-    let otel_env_filter = tracing_subscriber::EnvFilter::builder()
-        .with_default_directive(tracing_subscriber::filter::LevelFilter::INFO.into())
-        .from_env_lossy();
-
-    let opentelemetry_filter = otel_env_filter.or(telemetry_only_filter);
-    let opentelemetry_layer = OpenTelemetryLayer::new(tracer).with_filter(opentelemetry_filter);
+    let opentelemetry_layer = OpenTelemetryLayer::new(tracer).with_filter(tempo_filter);
 
     let config = crate::tracing::get_env_config(log_name);
     let maybe_log_file_layer = config.maybe_log_file_layer();

linera-chain/src/block_tracker.rs

@@ -101,7 +101,7 @@ impl<'resources, 'blobs> BlockExecutionTracker<'resources, 'blobs> {
     }
 
     /// Executes a transaction in the context of the block.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id,
         block_height = %self.block_height,
     ))]

linera-chain/src/chain.rs

@@ -392,7 +392,7 @@ where
         self.context().extra().chain_id()
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
     ))]
     pub async fn query_application(
@@ -412,7 +412,7 @@ where
             .with_execution_context(ChainExecutionContext::Query)
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         application_id = %application_id
     ))]
@@ -427,7 +427,7 @@ where
             .with_execution_context(ChainExecutionContext::DescribeApplication)
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         target = %target,
         height = %height
@@ -519,7 +519,7 @@ where
 
     /// Verifies that this chain is up-to-date and all the messages executed ahead of time
     /// have been properly received by now.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     pub async fn validate_incoming_bundles(&self) -> Result<(), ChainError> {
@@ -544,7 +544,7 @@ where
 
     /// Collects all missing sender blocks from removed bundles across all inboxes.
     /// Returns a map of origin chain IDs to their respective missing block heights.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     pub async fn collect_missing_sender_blocks(
@@ -610,7 +610,7 @@ where
     /// round timeouts.
     ///
     /// Returns `true` if incoming `Subscribe` messages created new outbox entries.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         origin = %origin,
         bundle_height = %bundle.height
@@ -709,7 +709,7 @@ where
     }
 
     /// Removes the incoming message bundles in the block from the inboxes.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
     ))]
     pub async fn remove_bundles_from_inboxes(
@@ -801,7 +801,7 @@ where
 
     /// Executes a block: first the incoming messages, then the main operation.
     /// Does not update chain state other than the execution state.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %block.chain_id,
         block_height = %block.height
     ))]
@@ -914,7 +914,7 @@ where
 
     /// Executes a block: first the incoming messages, then the main operation.
     /// Does not update chain state other than the execution state.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.height
     ))]
@@ -978,7 +978,7 @@ where
     /// Applies an execution outcome to the chain, updating the outboxes, state hash and chain
     /// manager. This does not touch the execution state itself, which must be updated separately.
     /// Returns the set of event streams that were updated as a result of applying the block.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.inner().inner().header.height
     ))]
@@ -1016,7 +1016,7 @@ where
 
     /// Adds a block to `preprocessed_blocks`, and updates the outboxes where possible.
     /// Returns the set of streams that were updated as a result of preprocessing the block.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.inner().inner().header.height
     ))]
@@ -1046,7 +1046,7 @@ where
     }
 
     /// Verifies that the block is valid according to the chain's application permission settings.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         block_height = %block.height,
         num_transactions = %block.transactions.len()
     ))]
@@ -1092,7 +1092,7 @@ where
     }
 
     /// Returns the hashes of all blocks we have in the given range.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         next_block_height = %self.tip_state.get().next_block_height,
         start_height = ?range.start_bound(),
@@ -1143,7 +1143,7 @@ where
     /// Updates the outboxes with the messages sent in the block.
     ///
     /// Returns the set of all recipients.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.header.height
     ))]
@@ -1238,7 +1238,7 @@ where
     /// Updates the event streams with events emitted by the block if they form a contiguous
     /// sequence (might not be the case when preprocessing a block).
     /// Returns the set of updated event streams.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.header.height
     ))]