Skip to content

Revert "Add _dd.measured to spans when agent sampling is enabled" #7403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abernix merged 1 commit into from
May 6, 2025
Merged

Revert "Add _dd.measured to spans when agent sampling is enabled" #7403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions .changesets/fix_bryn_otlp_export_dd_measured.md
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions apollo-router/src/plugins/telemetry/tracing/datadog/span_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use opentelemetry::Context;
use opentelemetry::KeyValue;
use opentelemetry::trace::SpanContext;
use opentelemetry::trace::TraceResult;
use opentelemetry_sdk::Resource;
Expand Down Expand Up @@ -37,7 +36,6 @@ impl<T: SpanProcessor> SpanProcessor for DatadogSpanProcessor<T> {
span.span_context.is_remote(),
span.span_context.trace_state().clone(),
);
span.attributes.push(KeyValue::new("_dd.measured", 1));
self.delegate.on_end(span)
}

Expand Down
18 changes: 12 additions & 6 deletions apollo-router/tests/integration/telemetry/otlp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ async fn test_untraced_request_sample_datadog_agent() -> Result<(), BoxError> {
.services(["router", "subgraph"].into())
.priority_sampled("1")
.subgraph_sampled(true)
.measured_spans(["router", "supergraph"].into())
.build()
.validate_otlp_trace(
&mut router,
Expand Down Expand Up @@ -720,13 +719,20 @@ impl Verifier for OtlpTraceSpec<'_> {
}

fn measured_span(&self, trace: &Value, name: &str) -> Result<bool, BoxError> {
let binding = trace.select_path(&format!(
"$..[?(@.attributes[?(@.key == 'otel.original_name' && @.value.stringValue == '{}')])].attributes[?(@.key == '_dd.measured')].value.intValue",
let binding1 = trace.select_path(&format!(
"$..[?(@.meta.['otel.original_name'] == '{}')].metrics.['_dd.measured']",
name
))?;

let measured = binding.first().and_then(|v| v.as_i64()).unwrap_or_default();
Ok(measured == 1)
let binding2 = trace.select_path(&format!(
"$..[?(@.name == '{}')].metrics.['_dd.measured']",
name
))?;
Ok(binding1
.first()
.or(binding2.first())
.and_then(|v| v.as_f64())
.map(|v| v == 1.0)
.unwrap_or_default())
}

async fn find_valid_metrics(&self) -> Result<(), BoxError> {
Expand Down