fix: use DD_SERVICE for inferred spans when integration service names are removed - #834
Merged
Merged
Conversation
When DD_SERVICE (config.service) is set, use it as the service for inferred (synthetic) spans, taking precedence over DD_SERVICE_MAPPING and the AWS service representation. When DD_SERVICE is unset, the existing resolution logic is preserved.
|
🔄 Datadog auto-retried 4 jobs - 2 passed on retry 🔗 Commit SHA: 3faee2d | Docs | View more details | Give us feedback! |
The inferred-span and service-mapping tests assert the AWS service representation, which only applies when DD_SERVICE is unset. CI sets DD_SERVICE, so pin config.service to None to keep them deterministic.
Verify create_inferred_span uses DD_SERVICE as the service (over an explicit service mapping) when DD_SERVICE is set.
Inferred (synthetic) spans now use DD_SERVICE (integration-tests-python) as their service instead of the AWS service representation, so the redundant _dd.base_service tag is dropped on those spans. Regenerated via UPDATE_SNAPSHOTS for all Python versions.
1 task
…moved Gate the DD_SERVICE inferred-span service resolution behind DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: when enabled (and DD_SERVICE is set), inferred (synthetic) spans use the base service name instead of the AWS resource/instance representation. Default behavior (flag off) is unchanged, so integration snapshots match main. Reverts the earlier unconditional DD_SERVICE-first and experimental peer.service / span.kind changes.
zarirhamza
added a commit
to DataDog/datadog-lambda-extension
that referenced
this pull request
Aug 27, 2026
…ice names are removed (#1343) ## Summary - Adds `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` (default `false`). When it is set **and** `DD_SERVICE` is configured, inferred (synthetic) event-source spans report the function's base service instead of the AWS resource/instance representation. - An explicit `DD_SERVICE_MAPPING` entry still takes precedence. - Applies to the wrapped inferred spans too (SQS→SNS, SQS→EventBridge, SNS→EventBridge). ## Motivation Customers currently need one `DD_SERVICE_MAPPING` entry per trigger type per function to get their event-source spans onto their own service name. This gives them a single setting that consolidates all of them at once. Tracked by [FRSLES-869](https://datadoghq.atlassian.net/browse/FRSLES-869). This repo is the **only** inferred-span implementation for Go, Java, .NET, and Ruby, which delegate inference to the extension entirely. Companion PRs: [datadog-lambda-python#834](DataDog/datadog-lambda-python#834), [datadog-lambda-js#814](DataDog/datadog-lambda-js#814). ## Implementation note Rather than thread two more parameters through `Trigger::enrich_span` and `resolve_service_name` (a ~200-line mechanical change across all 13 trigger modules and their tests), the override is applied in `span_inferrer.rs` immediately after enrichment. To keep `DD_SERVICE_MAPPING` precedence expressed in one place, `Trigger` gains a default `has_service_mapping_entry` method that reuses the same specific/generic identifiers `resolve_service_name` looks up. Happy to switch to the full parameter-threading approach if reviewers prefer a single resolution ladder. The override lowercases `DD_SERVICE` to match the invocation span built in `processor.rs`, so both spans land on the same service. ## Scope Service-name resolution only. `complete_inferred_spans` still sets `peer.service` to the invocation span's service as it does today; revisiting that pairing is deliberately left to a follow-up. ## Test plan - [x] 6 new tests in `span_inferrer.rs`: override applies, disabled by default, yields to `DD_SERVICE_MAPPING`, no-op without `DD_SERVICE`, lowercases `DD_SERVICE`, applies to wrapped spans - [x] 3 new config tests: default off, from env, from YAML - [x] `cargo test --lib` — 550 passed - [x] `cargo clippy --lib --tests -- -D warnings` clean - [x] `cargo fmt --check` clean [FRSLES-869]: https://datadoghq.atlassian.net/browse/FRSLES-869?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=trueandDD_SERVICEis set, inferred (synthetic) spans use the base service name (DD_SERVICE) instead of the AWS resource/instance representation.DD_SERVICE_MAPPINGentry still takes precedence overDD_SERVICE.config.aws_service_representation_enabled(DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED, default true) andconfig.remove_integration_service_names_enabled(DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, default false).Resolution order in
determine_service_nameDD_SERVICE_MAPPING(specific key, then generic key)DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLEDandDD_SERVICEset →DD_SERVICEMotivation
Part of the Serverless Service Representation (SSR) work. The flag lets inferred spans collapse onto the function's base service when integration-specific service names are turned off, while keeping the resource-name behavior by default.
Test plan
tests/test_tracing.py(TestServiceMapping + inferred-span tests) pass with and withoutDD_SERVICE/ the flag