use unified config bridge

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/PropertyTranslator.java

@@ -8,6 +8,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+@SuppressWarnings("NonApiType")
 class PropertyTranslator {
   // lookup order matters - we choose the first match
   private final LinkedHashMap<String, String> translationMap;

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/internal/PropertyTranslatorBuilder.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.extension.internal;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -18,11 +19,13 @@ public class PropertyTranslatorBuilder {
 
   PropertyTranslatorBuilder() {}
 
+  @CanIgnoreReturnValue
   public PropertyTranslatorBuilder addTranslation(String propertyName, String yamlPath) {
     translationMap.put(propertyName, yamlPath);
     return this;
   }
 
+  @CanIgnoreReturnValue
   public PropertyTranslatorBuilder addFixedValue(String propertyName, Object value) {
     fixedValues.put(propertyName, value);
     return this;

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/internal/ConfigPropertiesUtilTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.sdk.autoconfigure;
+package io.opentelemetry.javaagent.extension.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -13,7 +13,6 @@
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.javaagent.extension.internal.ConfigPropertiesUtil;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

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

@@ -4,19 +4,16 @@
  */
 
 package io.opentelemetry.javaagent.extension.internal;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.javaagent.extension.internal.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -25,56 +22,31 @@
 
 class DeclarativeConfigPropertiesBridgeTest {
 
-  private static final String YAML =
-      "file_format: 0.4\n"
-          + "instrumentation/development:\n"
-          + "  java:\n"
-          + "    common:\n"
-          + "      default-enabled: true\n"
-          + "    runtime-telemetry:\n"
-          + "      enabled: false\n"
-          + "    example-instrumentation:\n"
-          + "      string_key: value\n"
-          + "      bool_key: true\n"
-          + "      int_key: 1\n"
-          + "      double_key: 1.1\n"
-          + "      list_key:\n"
-          + "        - value1\n"
-          + "        - value2\n"
-          + "        - true\n"
-          + "      map_key:\n"
-          + "        string_key1: value1\n"
-          + "        string_key2: value2\n"
-          + "        bool_key: true\n"
-          + "    acme:\n"
-          + "      full_name:\n"
-          + "        preserved: true";
-
   private ConfigProperties bridge;
   private ConfigProperties emptyBridge;
 
   @BeforeEach
   void setup() {
-    bridge = createBridge(Collections.emptyMap());
+    bridge = create(ConfigPropertiesUtil.propertyTranslatorBuilder());
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
             .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
-        DeclarativeConfigPropertiesBridge.fromInstrumentationConfig(
-            Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()),
-            Collections.emptyMap());
+        ConfigPropertiesUtil.resolveInstrumentationConfig(
+            Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
   }
 
-  private static DeclarativeConfigPropertiesBridge createBridge(
-      Map<String, String> translationMap) {
+  private static ConfigProperties create(PropertyTranslatorBuilder builder) {
     OpenTelemetryConfigurationModel model =
         DeclarativeConfiguration.parse(
-            new ByteArrayInputStream(YAML.getBytes(StandardCharsets.UTF_8)));
-    return DeclarativeConfigPropertiesBridge.fromInstrumentationConfig(
-        Objects.requireNonNull(SdkConfigProvider.create(model).getInstrumentationConfig()),
-        translationMap);
+            DeclarativeConfigPropertiesBridgeTest.class
+                .getClassLoader()
+                .getResourceAsStream("config.yaml"));
+    SdkConfigProvider configProvider = SdkConfigProvider.create(model);
+    return ConfigPropertiesUtil.resolveInstrumentationConfig(
+        configProvider.getInstrumentationConfig(), builder);
   }
 
   @Test
@@ -88,7 +60,6 @@ void getProperties() {
         .isTrue();
 
     // common cases
-    assertThat(bridge.getBoolean("otel.instrumentation.common.default-enabled")).isTrue();
     assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isFalse();
 
     // check all the types
@@ -151,23 +122,34 @@ void vendor() {
   }
 
   @Test
-  void translation() {
-    DeclarativeConfigPropertiesBridge propertiesBridge =
-        createBridge(Collections.singletonMap("acme", "acme.full_name"));
+  void vendorTranslation() {
+    ConfigProperties propertiesBridge =
+        create(
+            ConfigPropertiesUtil.propertyTranslatorBuilder()
+                .addTranslation("acme", "acme.full_name"));
     assertThat(propertiesBridge.getBoolean("acme.preserved")).isTrue();
   }
 
   @Test
-  void common() {
-    assertThat(bridge.getBoolean("otel.instrumentation.common.default-enabled")).isFalse();
+  void agentCommonTranslation() {
+    assertThat(
+            create(
+                    ConfigPropertiesUtil.propertyTranslatorBuilder()
+                        .addTranslation(
+                            "otel.instrumentation.common.default-enabled",
+                            "common.default.enabled"))
+                .getBoolean("otel.instrumentation.common.default-enabled"))
+        .isFalse();
   }
 
   @Test
-  void agent() {
-    Map<String, Object> earlyInitProperties = new HashMap<>();
-    earlyInitProperties.put("otel.javaagent.debug", true);
-    earlyInitProperties.put("otel.javaagent.logging", "application");
-    DeclarativeConfigPropertiesBridge bridge = create(earlyInitProperties);
+  void agentTranslation() {
+    ConfigProperties bridge =
+        create(
+            ConfigPropertiesUtil.propertyTranslatorBuilder()
+                .addTranslation("otel.javaagent", "agent")
+                .addFixedValue("otel.javaagent.debug", true)
+                .addFixedValue("otel.javaagent.logging", "application"));
 
     assertThat(bridge.getBoolean("otel.javaagent.debug")).isTrue();
     assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();

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

@@ -1,31 +1,5 @@
 file_format: 0.4
 instrumentation/development:
-  general:
-    peer:
-      service_mapping:
-        - peer: 1.2.3.4
-          service: FooService
-        - peer: 2.3.4.5
-          service: BarService
-    http:
-      #      known_methods:
-      #        - GET
-      #        - POST
-      #        - PUT
-      client:
-        request_captured_headers:
-          - Content-Type
-          - Accept
-        response_captured_headers:
-          - Content-Type
-          - Content-Encoding
-      server:
-        request_captured_headers:
-          - Content-Type
-          - Accept
-        response_captured_headers:
-          - Content-Type
-          - Content-Encoding
   java:
     acme:
       full_name: