Skip to content

Datadog sampling priority not set #5703

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
BrynCooke merged 2 commits into from
Jul 22, 2024
Merged

Datadog sampling priority not set #5703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f752bf
Datadog sampling priority not set
Jul 22, 2024
25619f0
Merge branch 'dev' into bryn/remove-agent-based-sampling-code
BrynCooke Jul 22, 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
2 changes: 1 addition & 1 deletion .changesets/fix_bryn_datadog_exporter_span_metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ telemetry:
my_custom_span: true
```

By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5609
By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5609 and https://github.com/apollographql/router/pull/5703
8 changes: 2 additions & 6 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,12 +128,8 @@ fn write_unified_tag<'a>(
Ok(())
}

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

fn get_measuring(span: &SpanData) -> f64 {
Expand Down
41 changes: 7 additions & 34 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);
const TRACE_STATE_PRIORITY_SAMPLING: &str = "psr";
pub(crate) 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,10 +243,6 @@ 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 @@ -260,20 +256,6 @@ 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 @@ -311,16 +293,7 @@ pub(crate) mod propagator {
}

fn create_trace_state_and_flags(trace_flags: TraceFlags) -> (TraceState, TraceFlags) {
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,
)
}
(TraceState::default(), trace_flags)
}

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

fn get_sampling_priority(span_context: &SpanContext) -> SamplingPriority {
if span_context.trace_state().priority_sampling_enabled() {
if span_context.is_sampled() {
SamplingPriority::AutoKeep
} else {
SamplingPriority::AutoReject
Expand Down Expand Up @@ -460,8 +433,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::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())),
(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())),
]
}

Expand All @@ -473,8 +446,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::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())),
(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())),
]
}

Expand Down
14 changes: 14 additions & 0 deletions apollo-router/tests/integration/telemetry/datadog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ impl TraceSpec {
tracing::debug!("{}", serde_json::to_string_pretty(&trace)?);
self.verify_trace_participants(&trace)?;
self.verify_operation_name(&trace)?;
self.verify_priority_sampled(&trace)?;
self.verify_version(&trace)?;
self.verify_spans_present(&trace)?;
self.validate_span_kinds(&trace)?;
Expand Down Expand Up @@ -576,4 +577,17 @@ impl TraceSpec {
}
Ok(())
}

fn verify_priority_sampled(&self, trace: &Value) -> Result<(), BoxError> {
let binding = trace.select_path("$.._sampling_priority_v1")?;
let sampling_priority = binding.first();
assert_eq!(
sampling_priority
.expect("sampling priority expected")
.as_f64()
.expect("sampling priority must be a number"),
1.0
Copy link
Contributor Author

@BrynCooke BrynCooke Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was 0.0 but is now 1.0!

);
Ok(())
}
}