Skip to content

Support OpenTelemetry deployment environment names #12324

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
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Aug 27, 2026
Merged

Support OpenTelemetry deployment environment names #12324

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
2 changes: 1 addition & 1 deletion internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ class ConfigTest extends DDSpecification {
def "otel generic config via system properties - metrics enabled"() {
setup:
System.setProperty(DD_METRICS_OTEL_ENABLED_PROP, "true")
System.setProperty(OTEL_RESOURCE_ATTRIBUTES_PROP, "service.name=my=app,service.version=1.0.0,deployment.environment=production, message=blahblah")
System.setProperty(OTEL_RESOURCE_ATTRIBUTES_PROP, "service.name=my=app,service.version=1.0.0,deployment.environment.name=production, message=blahblah")
Comment thread
tylfin marked this conversation as resolved.
System.setProperty("otel.log.level", "warning")

when:
Expand Down
21 changes: 20 additions & 1 deletion ...est/groovy/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSourceTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification {
'key4=four,' +
'key5=five,' +
'key6=six,' +
'deployment.environment=staging,' +
'deployment.environment.name=staging,' +
'key7=seven,' +
'key8=eight,' +
'key9=nine,' +
Expand Down Expand Up @@ -374,4 +374,23 @@ class OtelEnvironmentConfigSourceTest extends DDSpecification {
// only the first 10 custom attributes are mapped to tags
source.get(TAGS) == 'key1:one,key2:two,key3:three,key4:four,key5:five,key6:six,key7:seven,key8:eight,key9:nine,key10:ten'
}

def "named deployment environment takes precedence over legacy attribute"() {
setup:
injectSysConfig('dd.trace.otel.enabled', 'true', false)
injectSysConfig('otel.resource.attributes', resourceAttributes, false)

when:
def source = new OtelEnvironmentConfigSource()

then:
source.get(ENV) == 'production'
source.get(TAGS) == null

where:
resourceAttributes << [
'deployment.environment.name=production,deployment.environment=staging',
'deployment.environment=staging,deployment.environment.name=production'
]
}
}
4 changes: 3 additions & 1 deletion ...ls/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ private void setupOtelEnvironment() {
Map<String, String> attributeMap = parseOtelMap(resourceAttributes);
capture(SERVICE_NAME, attributeMap.remove("service.name"));
capture(VERSION, attributeMap.remove("service.version"));
capture(ENV, attributeMap.remove("deployment.environment"));
String environment = attributeMap.remove("deployment.environment");
String namedEnvironment = attributeMap.remove("deployment.environment.name");
capture(ENV, namedEnvironment != null ? namedEnvironment : environment);
capture(TAGS, renderDatadogMap(attributeMap, 10));
}
capture(LOG_LEVEL, logLevel);
Expand Down