Support DD_TRACE_LOG_LEVEL (#10441)

Author: mcculls

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -1481,9 +1481,12 @@ private static void configureLogger() {
     if (isDebugMode()) {
       logLevel = "DEBUG";
     } else {
-      logLevel = ddGetProperty("dd.log.level");
+      logLevel = ddGetProperty("dd.trace.log.level");
       if (null == logLevel) {
-        logLevel = EnvironmentVariables.get("OTEL_LOG_LEVEL");
+        logLevel = ddGetProperty("dd.log.level");
+        if (null == logLevel) {
+          logLevel = EnvironmentVariables.get("OTEL_LOG_LEVEL");
+        }
       }
     }
 

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -35,6 +35,7 @@ public final class GeneralConfig {
       "experimental.propagate.process.tags.enabled";
 
   public static final String LOG_LEVEL = "log.level";
+  public static final String TRACE_LOG_LEVEL = "trace.log.level";
   public static final String TRACE_DEBUG = "trace.debug";
   public static final String TRACE_TRIAGE = "trace.triage";
   public static final String TRIAGE_REPORT_TRIGGER = "triage.report.trigger";

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -403,6 +403,7 @@
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_AGGREGATES;
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_MAX_PENDING;
 import static datadog.trace.api.config.GeneralConfig.TRACE_DEBUG;
+import static datadog.trace.api.config.GeneralConfig.TRACE_LOG_LEVEL;
 import static datadog.trace.api.config.GeneralConfig.TRACE_STATS_COMPUTATION_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.TRACE_TAGS;
 import static datadog.trace.api.config.GeneralConfig.TRACE_TRIAGE;
@@ -2718,7 +2719,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
 
     servletAsyncTimeoutError = configProvider.getBoolean(SERVLET_ASYNC_TIMEOUT_ERROR, true);
 
-    logLevel = configProvider.getString(LOG_LEVEL);
+    logLevel = configProvider.getString(TRACE_LOG_LEVEL, null, LOG_LEVEL);
     debugEnabled = configProvider.getBoolean(TRACE_DEBUG, false);
     triageEnabled = configProvider.getBoolean(TRACE_TRIAGE, instrumenterConfig.isTriageEnabled());
     triageReportTrigger = configProvider.getString(TRIAGE_REPORT_TRIGGER);

metadata/supported-configurations.json

@@ -2209,12 +2209,12 @@
         "aliases": ["DD_LOGS_INJECTION"]
       }
     ],
-    "DD_LOG_LEVEL": [
+    "DD_TRACE_LOG_LEVEL": [
       {
-        "version": "B",
+        "version": "A",
         "type": "string",
         "default": null,
-        "aliases": []
+        "aliases": ["DD_LOG_LEVEL"]
       }
     ],
     "DD_LOG_FORMAT_JSON": [