declarative config: early init and property mapping

instrumentation/jmx-metrics/javaagent/src/main/java/io/opentelemetry/instrumentation/javaagent/jmx/JmxMetricInsightInstaller.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.instrumentation.jmx.yaml.RuleParser;
 import io.opentelemetry.javaagent.extension.AgentListener;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -28,7 +29,7 @@ public class JmxMetricInsightInstaller implements AgentListener {
 
   @Override
   public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
-    ConfigProperties config = AgentListener.resolveConfigProperties(autoConfiguredSdk);
+    ConfigProperties config = AutoConfigureUtil.getConfig(autoConfiguredSdk);
 
     if (config.getBoolean("otel.jmx.enabled", true)) {
       JmxMetricInsight service =

instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java

@@ -8,6 +8,7 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.AgentListener;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.lang.reflect.Method;
 
@@ -20,7 +21,7 @@ public class OshiMetricsInstaller implements AgentListener {
 
   @Override
   public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
-    ConfigProperties config = AgentListener.resolveConfigProperties(autoConfiguredSdk);
+    ConfigProperties config = AutoConfigureUtil.getConfig(autoConfiguredSdk);
 
     boolean defaultEnabled = config.getBoolean("otel.instrumentation.common.default-enabled", true);
     if (!config.getBoolean("otel.instrumentation.oshi.enabled", defaultEnabled)) {

instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/java8/JarAnalyzerInstaller.java

@@ -7,9 +7,9 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.bootstrap.InstrumentationHolder;
-import io.opentelemetry.javaagent.extension.AgentListener;
 import io.opentelemetry.javaagent.tooling.BeforeAgentListener;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.lang.instrument.Instrumentation;
 
@@ -19,7 +19,7 @@ public class JarAnalyzerInstaller implements BeforeAgentListener {
 
   @Override
   public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
-    ConfigProperties config = AgentListener.resolveConfigProperties(autoConfiguredOpenTelemetrySdk);
+    ConfigProperties config = AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
 
     boolean enabled =
         config.getBoolean("otel.instrumentation.runtime-telemetry.package-emitter.enabled", false);

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

@@ -5,11 +5,7 @@
 
 package io.opentelemetry.javaagent.extension;
 
-import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
 import java.lang.instrument.Instrumentation;
 import net.bytebuddy.agent.builder.AgentBuilder;
@@ -29,26 +25,4 @@ public interface AgentListener extends Ordered {
    * on an {@link Instrumentation}.
    */
   void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk);
-
-  /** Resolve {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
-  static ConfigProperties resolveConfigProperties(
-      AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
-    ConfigProperties sdkConfigProperties =
-        AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
-    if (sdkConfigProperties != null) {
-      return sdkConfigProperties;
-    }
-    ConfigProvider configProvider =
-        AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
-    if (configProvider != null) {
-      DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig();
-
-      if (instrumentationConfig != null) {
-        return new DeclarativeConfigPropertiesBridge(instrumentationConfig);
-      }
-    }
-    // Should never happen
-    throw new IllegalStateException(
-        "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");
-  }
 }

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

@@ -7,14 +7,21 @@
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
+import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /**
@@ -46,26 +53,87 @@
  *         string_key: value
  * </pre>
  */
-final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
+public final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
+  private static final String OTEL_JAVA_AGENT_PREFIX = "otel.javaagent.";
+
+  private static final Map<String, String> JAVA_MAPPING_RULES = new HashMap<>();
+  private static final Map<String, String> GENERAL_MAPPING_RULES = new HashMap<>();
+  private static final Set<String> AGENT_LOGGING_OUTPUTS =
+      new HashSet<>(Arrays.asList("application", "simple"));
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
 
-  DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties instrumentationNode) {
-    instrumentationJavaNode = instrumentationNode.getStructured("java", empty());
+  private final DeclarativeConfigProperties instrumentationGeneralNode;
+
+  static {
+    JAVA_MAPPING_RULES.put("otel.instrumentation.common.default-enabled", "common.default.enabled");
+    JAVA_MAPPING_RULES.put(
+        "otel.javaagent.logging.application.logs-buffer-max-records",
+        "agent.logging.output.application.logs_buffer_max_records");
+
+    // todo not supported in SDK yet (this is strictly typed)
+    //    GENERAL_MAPPING_RULES.put("otel.instrumentation.http.known-methods",
+    // "http.known_methods");
+    GENERAL_MAPPING_RULES.put(
+        "otel.instrumentation.http.client.capture-request-headers",
+        "http.client.request_captured_headers");
+    GENERAL_MAPPING_RULES.put(
+        "otel.instrumentation.http.client.capture-response-headers",
+        "http.client.response_captured_headers");
+    GENERAL_MAPPING_RULES.put(
+        "otel.instrumentation.http.server.capture-request-headers",
+        "http.server.request_captured_headers");
+    GENERAL_MAPPING_RULES.put(
+        "otel.instrumentation.http.server.capture-response-headers",
+        "http.server.response_captured_headers");
+  }
+
+  private final String logLevel;
+
+  private static Map<String, String> getPeerServiceMapping(
+      DeclarativeConfigPropertiesBridge bridge) {
+    List<DeclarativeConfigProperties> configProperties =
+        bridge
+            .instrumentationGeneralNode
+            .getStructured("peer", empty())
+            .getStructuredList("service_mapping", Collections.emptyList());
+    return configProperties.stream()
+        .collect(
+            Collectors.toMap(
+                e -> Objects.requireNonNull(e.getString("peer"), "peer must not be null"),
+                e -> Objects.requireNonNull(e.getString("service"), "service must not be null")));
+  }
+
+  public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider, String logLevel) {
+    this.logLevel = logLevel;
+    DeclarativeConfigProperties inst = configProvider.getInstrumentationConfig();
+    if (inst == null) {
+      inst = DeclarativeConfigProperties.empty();
+    }
+    instrumentationJavaNode = inst.getStructured("java", empty());
+    instrumentationGeneralNode = inst.getStructured("general", empty());
   }
 
   @Nullable
   @Override
   public String getString(String propertyName) {
+    if ("otel.javaagent.logging".equals(propertyName)) {
+      return agentLoggerName();
+    }
+
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getString);
   }
 
   @Nullable
   @Override
   public Boolean getBoolean(String propertyName) {
+    if ("otel.javaagent.debug".equals(propertyName)) {
+      return "DEBUG".equals(this.logLevel);
+    }
+
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getBoolean);
   }
 
@@ -108,6 +176,10 @@ public List<String> getList(String propertyName) {
 
   @Override
   public Map<String, String> getMap(String propertyName) {
+    if ("otel.instrumentation.common.peer-service-mapping".equals(propertyName)) {
+      return getPeerServiceMapping(this);
+    }
+
     DeclarativeConfigProperties propertyValue =
         getPropertyValue(propertyName, DeclarativeConfigProperties::getStructured);
     if (propertyValue == null) {
@@ -130,16 +202,26 @@ public Map<String, String> getMap(String propertyName) {
   @Nullable
   private <T> T getPropertyValue(
       String property, BiFunction<DeclarativeConfigProperties, String, T> extractor) {
-    if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
-      return null;
+    String generalPath = GENERAL_MAPPING_RULES.get(property);
+    if (generalPath != null) {
+      return splitOnDot(generalPath, instrumentationGeneralNode, extractor);
     }
-    String suffix = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
+    String javaPath = getJavaPath(property);
+    if (javaPath != null) {
+      return splitOnDot(javaPath, instrumentationJavaNode, extractor);
+    }
+    return null;
+  }
+
+  private static <T> T splitOnDot(
+      String path,
+      DeclarativeConfigProperties target,
+      BiFunction<DeclarativeConfigProperties, String, T> extractor) {
     // Split the remainder of the property on ".", and walk to the N-1 entry
-    String[] segments = suffix.split("\\.");
+    String[] segments = path.split("\\.");
     if (segments.length == 0) {
       return null;
     }
-    DeclarativeConfigProperties target = instrumentationJavaNode;
     if (segments.length > 1) {
       for (int i = 0; i < segments.length - 1; i++) {
         target = target.getStructured(segments[i], empty());
@@ -148,4 +230,53 @@ private <T> T getPropertyValue(
     String lastPart = segments[segments.length - 1];
     return extractor.apply(target, lastPart);
   }
+
+  private static String getJavaPath(String property) {
+    String special = JAVA_MAPPING_RULES.get(property);
+    if (special != null) {
+      return special;
+    }
+
+    if (property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
+      return property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
+    } else if (property.startsWith(OTEL_JAVA_AGENT_PREFIX)) {
+      return "agent." + property.substring(OTEL_JAVA_AGENT_PREFIX.length()).replace('-', '_');
+    }
+    return null;
+  }
+
+  private String agentLoggerName() {
+    DeclarativeConfigProperties logOutput = getLogOutput();
+    Set<String> names = logOutput.getPropertyKeys();
+
+    if (names.isEmpty()) {
+      // no log output configured, use the default
+      return "simple";
+    }
+
+    if (names.size() > 1) {
+      throw new DeclarativeConfigException(
+          "Multiple log output formats are configured: "
+              + String.join(", ", names)
+              + ". Please choose one of them.");
+    }
+
+    String name = names.iterator().next();
+    if (!AGENT_LOGGING_OUTPUTS.contains(name)) {
+      throw new DeclarativeConfigException(
+          "Unsupported log output format: '"
+              + name
+              + "' . Supported formats are: "
+              + String.join(", ", AGENT_LOGGING_OUTPUTS));
+    }
+    return name;
+  }
+
+  private DeclarativeConfigProperties getLogOutput() {
+    return getAgent().getStructured("logging", empty()).getStructured("output", empty());
+  }
+
+  private DeclarativeConfigProperties getAgent() {
+    return instrumentationJavaNode.getStructured("agent", empty());
+  }
 }