use unified bridge

Author: zeitlinger

declarative-config-bridge/src/main/java/io/opentelemetry/contrib/sdk/autoconfigure/ConfigPropertiesUtil.java

@@ -10,13 +10,9 @@
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
-import java.util.Collections;
-import java.util.Map;
 import javax.annotation.Nullable;
 
-public class ConfigPropertiesUtil {
+public final class ConfigPropertiesUtil {
   private ConfigPropertiesUtil() {}
 
   /** Resolve {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
@@ -31,41 +27,35 @@ public static ConfigProperties resolveConfigProperties(
         AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
     if (configProvider != null) {
       return resolveInstrumentationConfig(
-          configProvider.getInstrumentationConfig(), Collections.emptyMap());
+          configProvider.getInstrumentationConfig(), propertyTranslatorBuilder());
     }
     // Should never happen
     throw new IllegalStateException(
         "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");
   }
 
-  public static ConfigProperties resolveModel(OpenTelemetryConfigurationModel model) {
-    return resolveModel(model, Collections.emptyMap());
-  }
-
-  public static ConfigProperties resolveModel(
-      OpenTelemetryConfigurationModel model, Map<String, String> translationMap) {
-    return resolveInstrumentationConfig(
-        SdkConfigProvider.create(model).getInstrumentationConfig(), translationMap);
-  }
-
   public static ConfigProperties resolveInstrumentationConfig(
       @Nullable DeclarativeConfigProperties instrumentationConfig) {
-    return resolveInstrumentationConfig(instrumentationConfig, Collections.emptyMap());
+    return resolveInstrumentationConfig(instrumentationConfig, propertyTranslatorBuilder());
   }
 
   public static ConfigProperties resolveInstrumentationConfig(
       @Nullable DeclarativeConfigProperties instrumentationConfig,
-      Map<String, String> translationMap) {
+      PropertyTranslatorBuilder builder) {
     return DeclarativeConfigPropertiesBridge.fromInstrumentationConfig(
-        instrumentationConfig, translationMap);
+        instrumentationConfig, builder.build());
   }
 
   public static ConfigProperties resolveConfig(
-      @Nullable DeclarativeConfigProperties config, Map<String, String> translationMap) {
-    return DeclarativeConfigPropertiesBridge.create(config, translationMap);
+      @Nullable DeclarativeConfigProperties config, PropertyTranslatorBuilder builder) {
+    return DeclarativeConfigPropertiesBridge.create(config, builder.build());
   }
 
   public static String propertyYamlPath(String propertyName) {
     return DeclarativeConfigPropertiesBridge.yamlPath(propertyName);
   }
+
+  public static PropertyTranslatorBuilder propertyTranslatorBuilder() {
+    return new PropertyTranslatorBuilder();
+  }
 }

declarative-config-bridge/src/main/java/io/opentelemetry/contrib/sdk/autoconfigure/DeclarativeConfigPropertiesBridge.java

@@ -50,81 +50,114 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
+  private final PropertyTranslator translator;
   @Nullable private final DeclarativeConfigProperties baseNode;
-  private final Map<String, String> translationMap;
 
   static DeclarativeConfigPropertiesBridge fromInstrumentationConfig(
-      @Nullable DeclarativeConfigProperties instrumentationConfig,
-      Map<String, String> translationMap) {
+      @Nullable DeclarativeConfigProperties instrumentationConfig, PropertyTranslator translator) {
     if (instrumentationConfig == null) {
       instrumentationConfig = DeclarativeConfigProperties.empty();
     }
     return new DeclarativeConfigPropertiesBridge(
-        instrumentationConfig.getStructured("java", empty()), translationMap);
+        instrumentationConfig.getStructured("java", empty()), translator);
   }
 
   static DeclarativeConfigPropertiesBridge create(
-      @Nullable DeclarativeConfigProperties node, Map<String, String> translationMap) {
-    return new DeclarativeConfigPropertiesBridge(node, translationMap);
+      @Nullable DeclarativeConfigProperties node, PropertyTranslator translator) {
+    return new DeclarativeConfigPropertiesBridge(node, translator);
   }
 
   private DeclarativeConfigPropertiesBridge(
-      @Nullable DeclarativeConfigProperties baseNode, Map<String, String> translationMap) {
+      @Nullable DeclarativeConfigProperties baseNode, PropertyTranslator translator) {
     this.baseNode = baseNode;
-    this.translationMap = translationMap;
+    this.translator = translator;
   }
 
   @Nullable
   @Override
   public String getString(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return value.toString();
+    }
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getString);
   }
 
   @Nullable
   @Override
   public Boolean getBoolean(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (Boolean) value;
+    }
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getBoolean);
   }
 
   @Nullable
   @Override
   public Integer getInt(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (Integer) value;
+    }
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getInt);
   }
 
   @Nullable
   @Override
   public Long getLong(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (Long) value;
+    }
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getLong);
   }
 
   @Nullable
   @Override
   public Double getDouble(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (Double) value;
+    }
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getDouble);
   }
 
   @Nullable
   @Override
   public Duration getDuration(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (Duration) value;
+    }
     Long millis = getPropertyValue(propertyName, DeclarativeConfigProperties::getLong);
     if (millis == null) {
       return null;
     }
     return Duration.ofMillis(millis);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public List<String> getList(String propertyName) {
+    Object value = translator.get(propertyName);
+    if (value != null) {
+      return (List<String>) value;
+    }
     List<String> propertyValue =
         getPropertyValue(
             propertyName,
             (properties, lastPart) -> properties.getScalarList(lastPart, String.class));
     return propertyValue == null ? Collections.emptyList() : propertyValue;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Map<String, String> getMap(String propertyName) {
+    Object fixed = translator.get(propertyName);
+    if (fixed != null) {
+      return (Map<String, String>) fixed;
+    }
     DeclarativeConfigProperties propertyValue =
         getPropertyValue(propertyName, DeclarativeConfigProperties::getStructured);
     if (propertyValue == null) {
@@ -151,7 +184,7 @@ private <T> T getPropertyValue(
       return null;
     }
 
-    String[] segments = getSegments(translate(property));
+    String[] segments = getSegments(translator.translateProperty(property));
     if (segments.length == 0) {
       return null;
     }
@@ -168,21 +201,12 @@ private <T> T getPropertyValue(
     return extractor.apply(target, lastPart);
   }
 
-  private String translate(String property) {
-    for (Map.Entry<String, String> entry : translationMap.entrySet()) {
-      if (property.startsWith(entry.getKey())) {
-        return entry.getValue() + property.substring(entry.getKey().length());
-      }
-    }
-    return property;
-  }
-
   private static String[] getSegments(String property) {
     if (property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
       property = property.substring(OTEL_INSTRUMENTATION_PREFIX.length());
     }
     // Split the remainder of the property on "."
-    return property.split("\\.");
+    return property.replace('-', '_').split("\\.");
   }
 
   static String yamlPath(String property) {

declarative-config-bridge/src/main/java/io/opentelemetry/contrib/sdk/autoconfigure/PropertyTranslator.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.sdk.autoconfigure;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+@SuppressWarnings("NonApiType")
+class PropertyTranslator {
+  // lookup order matters - we choose the first match
+  private final LinkedHashMap<String, String> translationMap;
+  private final Map<String, Object> fixedValues;
+
+  PropertyTranslator(
+      LinkedHashMap<String, String> translationMap, Map<String, Object> fixedValues) {
+    this.translationMap = translationMap;
+    this.fixedValues = fixedValues;
+  }
+
+  String translateProperty(String property) {
+    for (Map.Entry<String, String> entry : translationMap.entrySet()) {
+      if (property.startsWith(entry.getKey())) {
+        return entry.getValue() + property.substring(entry.getKey().length());
+      }
+    }
+    return property;
+  }
+
+  @Nullable
+  public Object get(String propertyName) {
+    return fixedValues.get(propertyName);
+  }
+}

declarative-config-bridge/src/main/java/io/opentelemetry/contrib/sdk/autoconfigure/PropertyTranslatorBuilder.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.sdk.autoconfigure;
+
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class PropertyTranslatorBuilder {
+  private final LinkedHashMap<String, String> translationMap = new LinkedHashMap<>();
+  private final Map<String, Object> fixedValues = new LinkedHashMap<>();
+
+  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;
+  }
+
+  PropertyTranslator build() {
+    return new PropertyTranslator(translationMap, fixedValues);
+  }
+}