diff --git a/trace/src/ctx.rs b/trace/src/ctx.rs index 54606b7c33..0c8699c82d 100644 --- a/trace/src/ctx.rs +++ b/trace/src/ctx.rs @@ -3,6 +3,7 @@ use std::str::FromStr; use std::sync::Arc; use http::HeaderMap; +use observability_deps::tracing::info; use rand::Rng; use serde::{Deserialize, Serialize}; use snafu::Snafu; @@ -176,7 +177,11 @@ fn decode_b3( // Debug implies an accept decision true => true, false => decoded_header(headers, B3_SAMPLED_HEADER)? - .map(|value| value == "1" || value == "true") + .map(|value| { + // TEMPORARY (#2297) + info!(sampled=%value, "traced request"); + value == "1" || value == "true" + }) .unwrap_or(false), }; @@ -184,6 +189,16 @@ fn decode_b3( return Ok(None); } + let ctx = SpanContext { + trace_id: required_header(headers, B3_TRACE_ID_HEADER)?, + parent_span_id: parsed_header(headers, B3_PARENT_SPAN_ID_HEADER)?, + span_id: required_header(headers, B3_SPAN_ID_HEADER)?, + collector: Some(Arc::clone(collector)), + }; + + // TEMPORARY (#2297) + info!(?ctx, "tracing request"); + Ok(Some(SpanContext { trace_id: required_header(headers, B3_TRACE_ID_HEADER)?, parent_span_id: parsed_header(headers, B3_PARENT_SPAN_ID_HEADER)?, diff --git a/trace/src/tower.rs b/trace/src/tower.rs index bc9e2ac84b..313f173735 100644 --- a/trace/src/tower.rs +++ b/trace/src/tower.rs @@ -16,7 +16,7 @@ use crate::{ctx::SpanContext, span::EnteredSpan, TraceCollector}; use futures::ready; use http::{Request, Response}; use http_body::SizeHint; -use observability_deps::tracing::{error, info}; +use observability_deps::tracing::error; use pin_project::pin_project; use std::future::Future; use std::pin::Pin; @@ -69,9 +69,6 @@ where } fn call(&mut self, mut request: Request) -> Self::Future { - use itertools::Itertools; - // TEMPORARY - info!(headers=%request.headers().keys().join(","), "gRPC request with headers"); let span = match SpanContext::from_headers(&self.collector, request.headers()) { Ok(Some(ctx)) => { let span = ctx.child("IOx");