Skip to content

fix(trace-exporter): mark OTLP client-computed stats #2245

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

Open
bengl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(trace-exporter): mark OTLP client-computed stats #2245

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: 3 additions & 2 deletions libdd-data-pipeline/src/trace_exporter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,8 @@ impl<
r.language = self.metadata.language.clone();
r.tracer_version = self.metadata.tracer_version.clone();
r.runtime_id = self.metadata.runtime_id.clone();
r.client_computed_stats = self.otlp_stats_enabled;
r.client_computed_stats =
self.metadata.client_computed_stats || self.otlp_stats_enabled;
r.instrumentation_scope_name = config.instrumentation_scope_name.clone();
r.instrumentation_scope_version = config.instrumentation_scope_version.clone();
r
Expand All @@ -694,7 +695,7 @@ impl<
})?;
// Also set the header: resource attributes survive Collector hops, headers don't.
let effective_config;
let config_to_use = if self.otlp_stats_enabled {
let config_to_use = if self.metadata.client_computed_stats || self.otlp_stats_enabled {
effective_config = {
let mut c = config.clone();
c.headers.insert(
Expand Down
15 changes: 12 additions & 3 deletions libdd-data-pipeline/tests/test_trace_exporter_otlp_export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,26 @@ mod otlp_export_tests {
let server = MockServer::start_async().await;

// Assert the OTLP request structure using json_body_includes matchers.
// resourceSpans must be present with the correct service.name and environment resource
// attributes, and spans must contain the expected name prefix.
// resourceSpans must be present with the expected resource attributes, including
// client-computed-stats, and the redundant header must be set for direct Agent requests.
let mut mock = server
.mock_async(|when, then| {
when.method("POST")
.path("/v1/traces")
.header("content-type", "application/json")
.header("datadog-client-computed-stats", "yes")
.json_body_includes(
serde_json::json!({
"resourceSpans": [{
"resource": {
"attributes": [
{"key": "service.name", "value": {"stringValue": "test"}},
{"key": "deployment.environment.name", "value": {"stringValue": "test_env"}},
{"key": "telemetry.sdk.name", "value": {"stringValue": "datadog"}},
{"key": "telemetry.sdk.language", "value": {"stringValue": "test-lang"}},
{"key": "telemetry.sdk.version", "value": {"stringValue": "1.0"}},
{"key": "runtime-id", "value": {"stringValue": "test-runtime-id"}},
{"key": "_dd.stats_computed", "value": {"stringValue": "true"}},
]
}
}]
Expand All @@ -63,7 +70,9 @@ mod otlp_export_tests {
.set_language_interpreter("interpreter")
.set_tracer_version("1.0")
.set_env("test_env")
.set_service("test");
.set_service("test")
.set_runtime_id("test-runtime-id")
.set_client_computed_stats();

let trace_exporter = builder
.build::<NativeCapabilities>()
Expand Down
Loading