mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/tracing): make cargo check and clippy happy

Browse source 
In case the otlp feature is not enabled, these generate warnings during
`cargo check`.
Fix by moving some imports into their functions, or using the
fully-qualified name (and one #[allow(unused_mut)])

Change-Id: I5afd89dcd4c772b6002cebdd5d0469932eacfdac
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11873
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Reviewed-by: Simon Hauser <simon.hauser@helsinki-systems.de>
This commit is contained in:
Florian Klink 2024-06-25 20:53:11 +03:00 committed by flokli
parent a0993e7304
commit 89361b2a7f
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tvix/tracing/src/propagate/tonic.rs
View file

@ -1,9 +1,3 @@
use tonic::{
metadata::{MetadataKey, MetadataMap, MetadataValue},
Status,
};
use tracing::{warn, Span};
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
use opentelemetry::{global, propagation::Injector}; use opentelemetry::{global, propagation::Injector};
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
@ -22,17 +16,20 @@ pub fn accept_trace<B>(request: http::Request<B>) -> http::Request<B> {
let parent_context = global::get_text_map_propagator(|propagator| { let parent_context = global::get_text_map_propagator(|propagator| {
propagator.extract(&HeaderExtractor(request.headers())) propagator.extract(&HeaderExtractor(request.headers()))
}); });
Span::current().set_parent(parent_context); tracing::Span::current().set_parent(parent_context);
} }
request request
} }
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
struct MetadataInjector<'a>(&'a mut MetadataMap); struct MetadataInjector<'a>(&'a mut tonic::metadata::MetadataMap);
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
impl Injector for MetadataInjector<'_> { impl Injector for MetadataInjector<'_> {
fn set(&mut self, key: &str, value: String) { fn set(&mut self, key: &str, value: String) {
use tonic::metadata::{MetadataKey, MetadataValue};
use tracing::warn;
match MetadataKey::from_bytes(key.as_bytes()) { match MetadataKey::from_bytes(key.as_bytes()) {
Ok(key) => match MetadataValue::try_from(&value) { Ok(key) => match MetadataValue::try_from(&value) {
Ok(value) => { Ok(value) => {
@ -47,11 +44,12 @@ impl Injector for MetadataInjector<'_> {
/// Trace context propagation: send the trace context by injecting it into the metadata of the given /// Trace context propagation: send the trace context by injecting it into the metadata of the given
/// request. This only injects the current span if the otlp feature is also enabled. /// request. This only injects the current span if the otlp feature is also enabled.
pub fn send_trace<T>(mut request: tonic::Request<T>) -> Result<tonic::Request<T>, Status> { #[allow(unused_mut)]
pub fn send_trace<T>(mut request: tonic::Request<T>) -> Result<tonic::Request<T>, tonic::Status> {
#[cfg(feature = "otlp")] #[cfg(feature = "otlp")]
{ {
global::get_text_map_propagator(|propagator| { global::get_text_map_propagator(|propagator| {
let context = Span::current().context(); let context = tracing::Span::current().context();
propagator.inject_context(&context, &mut MetadataInjector(request.metadata_mut())) propagator.inject_context(&context, &mut MetadataInjector(request.metadata_mut()))
}); });
} }