map otel.javaagent.debug

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java

@@ -83,6 +83,8 @@ public final class DeclarativeConfigPropertiesBridge implements ConfigProperties
         "http.server.response_captured_headers");
   }
 
+  private final String logLevel;
+
   private static Map<String, String> getPeerServiceMapping(
       DeclarativeConfigPropertiesBridge bridge) {
     List<DeclarativeConfigProperties> configProperties =
@@ -97,7 +99,8 @@ private static Map<String, String> getPeerServiceMapping(
                 e -> Objects.requireNonNull(e.getString("service"), "service must not be null")));
   }
 
-  public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider) {
+  public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider, String logLevel) {
+    this.logLevel = logLevel;
     DeclarativeConfigProperties inst = configProvider.getInstrumentationConfig();
     if (inst == null) {
       inst = DeclarativeConfigProperties.empty();
@@ -119,6 +122,10 @@ public String getString(String propertyName) {
   @Nullable
   @Override
   public Boolean getBoolean(String propertyName) {
+    if ("otel.javaagent.debug".equals(propertyName)) {
+      return "DEBUG".equals(this.logLevel);
+    }
+
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getBoolean);
   }
 

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

@@ -35,14 +35,17 @@ void setup() {
                 .getClassLoader()
                 .getResourceAsStream("config.yaml"));
     SdkConfigProvider configProvider = SdkConfigProvider.create(model);
-    bridge = new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider));
+    String logLevel = "DEBUG";
+    bridge =
+        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider), logLevel);
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
             .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
-        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(emptyConfigProvider));
+        new DeclarativeConfigPropertiesBridge(
+            Objects.requireNonNull(emptyConfigProvider), logLevel);
   }
 
   @Test
@@ -137,9 +140,11 @@ void common() {
 
   @Test
   void agent() {
+    assertThat(bridge.getBoolean("otel.javaagent.debug")).isTrue();
     assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();
     assertThat(bridge.getString("otel.javaagent.logging")).isEqualTo("application");
     assertThat(bridge.getInt("otel.javaagent.logging.application.logs-buffer-max-records"))
         .isEqualTo(1000);
+
   }
 }

javaagent-extension-api/src/test/resources/config.yaml

@@ -1,5 +1,6 @@
-disabled: true
 file_format: 0.4
+disabled: true
+log_level: DEBUG
 instrumentation/development:
   general:
     peer:

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/DeclarativeConfigEarlyInitAgentConfig.java

@@ -38,7 +38,7 @@ public final class DeclarativeConfigEarlyInitAgentConfig implements EarlyInitAge
   DeclarativeConfigEarlyInitAgentConfig(String configurationFile) {
     this.configurationModel = loadConfigurationModel(configurationFile);
     configProvider = SdkConfigProvider.create(configurationModel);
-    this.declarativeConfigProperties = new DeclarativeConfigPropertiesBridge(configProvider);
+    this.declarativeConfigProperties = new DeclarativeConfigPropertiesBridge(configProvider, this.configurationModel.getLogLevel());
   }
 
   @Override