Skip to content
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

Revert "Datadog sampling priority not set (#5703)" #5780

Merged
merged 3 commits into from
Aug 7, 2024
+45 −9
Merged

Revert "Datadog sampling priority not set (#5703)" #5780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bc6542
Revert "Datadog sampling priority not set (#5703)"
Aug 6, 2024
29ee373
Re-add lost test
Aug 7, 2024
ebfcff5
Changelog
Aug 7, 2024
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: 5 additions & 0 deletions .changesets/fix_bryn_revert_5703.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Datadog underreported APM metrics ([PR #5780](https://github.com/apollographql/router/pull/5780))

This reverts [PR #5703](https://github.com/apollographql/router/pull/5703) which causes Datadog APM span metrics to be under-reported.

By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5780
8 changes: 6 additions & 2 deletions apollo-router/src/plugins/telemetry/tracing/datadog_exporter/exporter/model/v05.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ fn write_unified_tag<'a>(
Ok(())
}

fn get_sampling_priority(_span: &SpanData) -> f64 {
1.0
fn get_sampling_priority(span: &SpanData) -> f64 {
if span.span_context.trace_state().priority_sampling_enabled() {
1.0
} else {
0.0
}
}

fn get_measuring(span: &SpanData) -> f64 {
Expand Down
41 changes: 34 additions & 7 deletions apollo-router/src/plugins/telemetry/tracing/datadog_exporter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ pub(crate) mod propagator {
const DATADOG_SAMPLING_PRIORITY_HEADER: &str = "x-datadog-sampling-priority";

const TRACE_FLAG_DEFERRED: TraceFlags = TraceFlags::new(0x02);
pub(crate) const TRACE_STATE_PRIORITY_SAMPLING: &str = "psr";
const TRACE_STATE_PRIORITY_SAMPLING: &str = "psr";
pub(crate) const TRACE_STATE_MEASURE: &str = "m";
pub(crate) const TRACE_STATE_TRUE_VALUE: &str = "1";
pub(crate) const TRACE_STATE_FALSE_VALUE: &str = "0";
Expand Down Expand Up @@ -243,6 +243,10 @@ pub(crate) mod propagator {
fn with_measuring(&self, enabled: bool) -> TraceState;

fn measuring_enabled(&self) -> bool;

fn with_priority_sampling(&self, enabled: bool) -> TraceState;

fn priority_sampling_enabled(&self) -> bool;
}

impl DatadogTraceState for TraceState {
Expand All @@ -256,6 +260,20 @@ pub(crate) mod propagator {
.map(trace_flag_to_boolean)
.unwrap_or_default()
}

fn with_priority_sampling(&self, enabled: bool) -> TraceState {
self.insert(
TRACE_STATE_PRIORITY_SAMPLING,
boolean_to_trace_state_flag(enabled),
)
.unwrap_or_else(|_err| self.clone())
}

fn priority_sampling_enabled(&self) -> bool {
self.get(TRACE_STATE_PRIORITY_SAMPLING)
.map(trace_flag_to_boolean)
.unwrap_or_default()
}
}

enum SamplingPriority {
Expand Down Expand Up @@ -293,7 +311,16 @@ pub(crate) mod propagator {
}

fn create_trace_state_and_flags(trace_flags: TraceFlags) -> (TraceState, TraceFlags) {
(TraceState::default(), trace_flags)
if trace_flags & TRACE_FLAG_DEFERRED == TRACE_FLAG_DEFERRED {
(TraceState::default(), trace_flags)
} else {
(
DatadogTraceStateBuilder::default()
.with_priority_sampling(trace_flags.is_sampled())
.build(),
TraceFlags::SAMPLED,
)
}
}

impl DatadogPropagator {
Expand Down Expand Up @@ -373,7 +400,7 @@ pub(crate) mod propagator {
}

fn get_sampling_priority(span_context: &SpanContext) -> SamplingPriority {
if span_context.is_sampled() {
if span_context.trace_state().priority_sampling_enabled() {
SamplingPriority::AutoKeep
} else {
SamplingPriority::AutoReject
Expand Down Expand Up @@ -433,8 +460,8 @@ pub(crate) mod propagator {
(vec![(DATADOG_TRACE_ID_HEADER, "garbage")], SpanContext::empty_context()),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "garbage")], SpanContext::new(TraceId::from_u128(1234), SpanId::INVALID, TRACE_FLAG_DEFERRED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TRACE_FLAG_DEFERRED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "0")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::default(), true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "1")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "0")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, DatadogTraceStateBuilder::default().with_priority_sampling(false).build())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "1")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, DatadogTraceStateBuilder::default().with_priority_sampling(true).build())),
]
}

Expand All @@ -446,8 +473,8 @@ pub(crate) mod propagator {
(vec![], SpanContext::new(TraceId::from_hex("1234").unwrap(), SpanId::INVALID, TRACE_FLAG_DEFERRED, true, TraceState::default())),
(vec![], SpanContext::new(TraceId::from_hex("1234").unwrap(), SpanId::INVALID, TraceFlags::SAMPLED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TRACE_FLAG_DEFERRED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "0")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::default(), true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "1")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, TraceState::default())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "0")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, DatadogTraceStateBuilder::default().with_priority_sampling(false).build())),
(vec![(DATADOG_TRACE_ID_HEADER, "1234"), (DATADOG_PARENT_ID_HEADER, "12"), (DATADOG_SAMPLING_PRIORITY_HEADER, "1")], SpanContext::new(TraceId::from_u128(1234), SpanId::from_u64(12), TraceFlags::SAMPLED, true, DatadogTraceStateBuilder::default().with_priority_sampling(true).build())),
]
}

Expand Down
Loading