Make sending traces to Tempo less confusing

Author: ndr-ds

linera-base/src/tracing_otel.rs

@@ -43,14 +43,14 @@ 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 no_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_filter = otel_env_filter.and_not(no_tempo_filter);
     let opentelemetry_layer = OpenTelemetryLayer::new(tracer).with_filter(opentelemetry_filter);
 
     let config = crate::tracing::get_env_config(log_name);

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
     ))]

linera-core/src/chain_worker/state.rs

@@ -77,7 +77,7 @@ where
     StorageClient: Storage + Clone + Send + Sync + 'static,
 {
     /// Creates a new [`ChainWorkerState`] using the provided `storage` client.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %chain_id
     ))]
     #[expect(clippy::too_many_arguments)]
@@ -247,7 +247,7 @@ where
     /// That means that when this function returns, no readers will be waiting to acquire
     /// the lock and it is safe to write the chain state to storage without any readers
     /// having a stale view of it.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     pub(super) async fn clear_shared_chain_view(&mut self) {
@@ -280,7 +280,7 @@ where
     }
 
     /// Returns the requested blob, if it belongs to the current locking block or pending proposal.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         blob_id = %blob_id
     ))]
@@ -294,7 +294,7 @@ where
 
     /// Reads the blobs from the chain manager or from storage. Returns an error if any are
     /// missing.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn get_required_blobs(
@@ -317,7 +317,7 @@ where
     }
 
     /// Tries to read the blobs from the chain manager or storage. Returns `None` if not found.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn maybe_get_required_blobs(
@@ -388,7 +388,7 @@ where
     }
 
     /// Loads pending cross-chain requests, and adds `NewRound` notifications where appropriate.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn create_network_actions(
@@ -428,7 +428,7 @@ where
         })
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         num_recipients = %heights_by_recipient.len()
     ))]
@@ -503,7 +503,7 @@ where
 
     /// Returns true if there are no more outgoing messages in flight up to the given
     /// block height.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         height = %height
     ))]
@@ -533,7 +533,7 @@ where
     }
 
     /// Processes a leader timeout issued for this multi-owner chain.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         height = %certificate.inner().height()
     ))]
@@ -575,7 +575,7 @@ where
     ///
     /// If they cannot be found, it creates an entry in `pending_proposed_blobs` so they can be
     /// submitted one by one.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %proposal.content.block.height
     ))]
@@ -623,7 +623,7 @@ where
     }
 
     /// Processes a validated block issued for this multi-owner chain.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %certificate.block().header.height
     ))]
@@ -936,7 +936,7 @@ where
     }
 
     /// Updates the chain's inboxes, receiving messages from a cross-chain update.
-    #[instrument(level = "trace", target = "telemetry_only", skip(self, bundles))]
+    #[instrument(level = "trace", skip(self, bundles))]
     async fn process_cross_chain_update(
         &mut self,
         origin: ChainId,
@@ -985,7 +985,7 @@ where
     }
 
     /// Handles the cross-chain request confirming that the recipient was updated.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         recipient = %recipient,
         latest_height = %latest_height
@@ -1012,7 +1012,7 @@ where
         Ok(())
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         num_trackers = %new_trackers.len()
     ))]
@@ -1027,7 +1027,7 @@ where
     }
 
     /// Attempts to vote for a leader timeout, if possible.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         height = %height,
         round = %round
@@ -1059,7 +1059,7 @@ where
     }
 
     /// Votes for falling back to a public chain.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn vote_for_fallback(&mut self) -> Result<(), WorkerError> {
@@ -1084,7 +1084,7 @@ where
         Ok(())
     }
 
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         blob_id = %blob.id()
     ))]
@@ -1121,7 +1121,7 @@ where
 
     /// Returns a stored [`Certificate`] for the chain's block at the requested [`BlockHeight`].
     #[cfg(with_testing)]
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         height = %height
     ))]
@@ -1143,7 +1143,7 @@ where
     }
 
     /// Queries an application's state on the chain.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         query_application_id = %query.application_id()
     ))]
@@ -1158,7 +1158,7 @@ where
     }
 
     /// Returns an application's description.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         application_id = %application_id
     ))]
@@ -1172,7 +1172,7 @@ where
     }
 
     /// Executes a block without persisting any changes to the state.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.height
     ))]
@@ -1207,7 +1207,7 @@ where
     }
 
     /// Validates and executes a block proposed to extend this chain.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %proposal.content.block.height
     ))]
@@ -1358,7 +1358,7 @@ where
     }
 
     /// Prepares a [`ChainInfoResponse`] for a [`ChainInfoQuery`].
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn prepare_chain_info_response(
@@ -1431,7 +1431,7 @@ where
     }
 
     /// Executes a block, caches the result, and returns the outcome.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id(),
         block_height = %block.height
     ))]
@@ -1459,7 +1459,7 @@ where
     }
 
     /// Initializes and saves the current chain if it is not active yet.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn initialize_and_save_if_needed(&mut self) -> Result<(), WorkerError> {
@@ -1479,7 +1479,7 @@ where
     /// Stores the chain state in persistent storage.
     ///
     /// Waits until the [`ChainStateView`] is no longer shared before persisting the changes.
-    #[instrument(target = "telemetry_only", skip_all, fields(
+    #[instrument(skip_all, fields(
         chain_id = %self.chain_id()
     ))]
     async fn save(&mut self) -> Result<(), WorkerError> {