Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changesets/fix_telemetry_fix_downstream_traces.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### fix: Include the cargo feature and TraceContextPropagator to send otel headers downstream - @swcollard PR #307

Inside the reqwest middleware, if the global text_map_propagator is not set, it will no op and not send the traceparent and tracestate headers to the Router. Adding this is needed to correlate traces from the mcp server to the router or other downstream APIs
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/apollo-mcp-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ opentelemetry-stdout = "0.30.0"
opentelemetry_sdk = "0.30.0"
regex = "1.11.1"
reqwest-middleware = "0.4.2"
reqwest-tracing = "0.5.8"
reqwest-tracing = { version = "0.5.8", features = ["opentelemetry_0_30"] }
reqwest.workspace = true
rmcp = { version = "0.2", features = [
"server",
Expand Down
3 changes: 3 additions & 0 deletions crates/apollo-mcp-server/src/runtime/trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use opentelemetry::{KeyValue, global, trace::TracerProvider as _};
use opentelemetry_sdk::{
Resource,
metrics::{MeterProviderBuilder, PeriodicReader, SdkMeterProvider},
propagation::TraceContextPropagator,
trace::{RandomIdGenerator, SdkTracerProvider},
};

Expand Down Expand Up @@ -65,6 +66,8 @@ fn init_tracer_provider() -> Result<SdkTracerProvider, anyhow::Error> {
.with_batch_exporter(exporter)
.build();

// Set the global propagator (usually early in main())
global::set_text_map_propagator(TraceContextPropagator::new());
global::set_tracer_provider(trace_provider.clone());

Ok(trace_provider)
Expand Down