Skip to content

Commit daa425b

Browse files
mhlidddevflow.devflow-routing-intake
andauthored
Update Environment Variable Normalization to not add DD prefix for OTel Configs (#11044)
init Merge branch 'master' into mhlidd/telemetry_otel_handling moving normalization to ConfigSetting Merge branch 'master' into mhlidd/telemetry_otel_handling Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 7d1e329 commit daa425b

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datadog.trace.api;
22

33
import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName;
4+
import static datadog.trace.util.ConfigStrings.toEnvVar;
45

56
import java.util.Arrays;
67
import java.util.BitSet;
@@ -53,6 +54,10 @@ private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId,
5354
}
5455

5556
public String normalizedKey() {
57+
// OTel configurations should not be normalized with DD_
58+
if (key.startsWith("otel.") || key.startsWith("OTEL_")) {
59+
return toEnvVar(key);
60+
}
5661
return propertyNameToEnvironmentVariableName(key);
5762
}
5863

0 commit comments

Comments
 (0)