From 0f894bf55ed0ae33a98936f63fc24a9bb28b4d6c Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Thu, 2 Apr 2026 14:58:35 -0400 Subject: [PATCH 1/2] init --- .../src/main/java/datadog/trace/util/ConfigStrings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java index 137280ad539..b533e7f633f 100644 --- a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java +++ b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java @@ -23,6 +23,10 @@ public static String toEnvVarLowerCase(String string) { */ @Nonnull public static String propertyNameToEnvironmentVariableName(final String setting) { + // OTel configurations should not be normalized with DD_ + if (setting.startsWith("otel.") || setting.startsWith("OTEL_")) { + return toEnvVar(setting); + } return "DD_" + toEnvVar(setting); } From 85854dff43a1733b8077f8635ce6782c8646a5ac Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Fri, 3 Apr 2026 11:15:13 -0400 Subject: [PATCH 2/2] moving normalization to ConfigSetting --- .../src/main/java/datadog/trace/api/ConfigSetting.java | 5 +++++ .../src/main/java/datadog/trace/util/ConfigStrings.java | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java b/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java index 46aaed2fe04..cf77e3bfb35 100644 --- a/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java +++ b/utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java @@ -1,6 +1,7 @@ package datadog.trace.api; import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName; +import static datadog.trace.util.ConfigStrings.toEnvVar; import java.util.Arrays; import java.util.BitSet; @@ -53,6 +54,10 @@ private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId, } public String normalizedKey() { + // OTel configurations should not be normalized with DD_ + if (key.startsWith("otel.") || key.startsWith("OTEL_")) { + return toEnvVar(key); + } return propertyNameToEnvironmentVariableName(key); } diff --git a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java index b533e7f633f..137280ad539 100644 --- a/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java +++ b/utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java @@ -23,10 +23,6 @@ public static String toEnvVarLowerCase(String string) { */ @Nonnull public static String propertyNameToEnvironmentVariableName(final String setting) { - // OTel configurations should not be normalized with DD_ - if (setting.startsWith("otel.") || setting.startsWith("OTEL_")) { - return toEnvVar(setting); - } return "DD_" + toEnvVar(setting); }