From 5b110b1ac0630218ec5c48b4fbec6dfd2cf17b6f Mon Sep 17 00:00:00 2001
From: Matthew Li <matthew.li@datadoghq.com>
Date: Mon, 6 Apr 2026 14:32:01 -0400
Subject: [PATCH] guarnatee query env var for OTel configs

---
 .../config/provider/OtelEnvironmentConfigSource.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
index 35093ca9724..7b193304480 100644
--- a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
+++ b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
@@ -318,9 +318,12 @@ private String getDatadogProperty(String sysProp) {
    * <p>Checks system properties and environment variables.
    */
   private static String getProperty(String sysProp) {
-    String value = SystemProperties.get(sysProp);
-    if (null == value) {
-      value = ConfigHelper.env(toEnvVar(sysProp));
+    // Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
+    String value = ConfigHelper.env(toEnvVar(sysProp));
+    // System property takes precedence over environment variable
+    String sysPropValue = SystemProperties.get(sysProp);
+    if (sysPropValue != null) {
+      value = sysPropValue;
     }
     return value;
   }