Skip to content

Commit 6ec63b9

Browse files
feat(tracing): correlate trace IDs in relay logs (#3608)
## Summary Correlates trace + span IDs with logs, allowing traces and logs to be bridged seamlessly ### Related issue none found ### Testing Unit tests Signed-off-by: David Grochowski <[email protected]> Co-authored-by: Amp <[email protected]>
1 parent 25ad05a commit 6ec63b9

2 files changed

Lines changed: 368 additions & 4 deletions

File tree

‎crates/buzz-relay/src/main.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,34 @@ async fn main() -> anyhow::Result<()> {
102102
// spans under the correct service identity.
103103
let resource = telemetry::service_resource();
104104
let tracer_init = telemetry::try_init_tracer(resource.clone());
105+
let otel_enabled = matches!(&tracer_init, telemetry::TracerInit::Enabled(_));
105106
let otel_layer = match &tracer_init {
106107
telemetry::TracerInit::Enabled(p) => {
107108
use opentelemetry::trace::TracerProvider as _;
108109
Some(tracing_opentelemetry::layer().with_tracer(p.tracer("buzz-relay")))
109110
}
110111
_ => None,
111112
};
113+
let trace_context_lookup = telemetry::TraceContextLookup::default();
114+
let trace_context_lookup_layer = otel_enabled.then(|| {
115+
trace_context_lookup
116+
.clone()
117+
.with_filter(tracing_subscriber::filter::LevelFilter::OFF)
118+
});
112119

113120
tracing_subscriber::registry()
114121
.with(
115122
fmt::layer()
116123
.json()
117-
.flatten_event(true)
124+
.event_format(trace_context_lookup.json_formatter(otel_enabled))
118125
.with_filter(log_env_filter(std::env::var("RUST_LOG").ok().as_deref())),
119126
)
120127
.with(otel_layer.map(|layer| {
121128
layer.with_filter(telemetry::otel_env_filter(
122129
std::env::var("BUZZ_OTEL_FILTER").ok().as_deref(),
123130
))
124131
}))
132+
.with(trace_context_lookup_layer)
125133
.init();
126134

127135
// Log any exporter-build failure now that the subscriber is installed.

0 commit comments

Comments
 (0)