use same strategy as AutoConfigurationCustomizerProvider

Author: zeitlinger

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java

@@ -109,12 +109,18 @@ public static OpenTelemetrySdk create(OpenTelemetryConfigurationModel configurat
   public static OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
     SpiHelper spiHelper = SpiHelper.create(componentLoader);
+
+    DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
+
     for (DeclarativeConfigurationCustomizerProvider provider :
         spiHelper.loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
-      configurationModel = provider.customize(configurationModel);
+      provider.customize(builder);
     }
+
     return createAndMaybeCleanup(
-        OpenTelemetryConfigurationFactory.getInstance(), spiHelper, configurationModel);
+        OpenTelemetryConfigurationFactory.getInstance(),
+        spiHelper,
+        builder.customizeModel(configurationModel));
   }
 
   /**

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationBuilder.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig;
+
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.util.function.Function;
+
+public class DeclarativeConfigurationBuilder implements DeclarativeConfigurationCustomizer {
+  private Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel>
+      modelCustomizer = Function.identity();
+
+  @Override
+  public void addModelCustomizer(
+      Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel> customizer) {
+    modelCustomizer = mergeCustomizer(modelCustomizer, customizer);
+  }
+
+  private static <I, O1, O2> Function<I, O2> mergeCustomizer(
+      Function<? super I, ? extends O1> first, Function<? super O1, ? extends O2> second) {
+    return (I configured) -> {
+      O1 firstResult = first.apply(configured);
+      return second.apply(firstResult);
+    };
+  }
+
+  public OpenTelemetryConfigurationModel customizeModel(
+      OpenTelemetryConfigurationModel configurationModel) {
+    return modelCustomizer.apply(configurationModel);
+  }
+}

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizer.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig;
+
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.util.function.Function;
+
+public interface DeclarativeConfigurationCustomizer {
+  void addModelCustomizer(
+      Function<OpenTelemetryConfigurationModel, OpenTelemetryConfigurationModel> customizer);
+}

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCustomizerProvider.java

@@ -6,8 +6,7 @@
 package io.opentelemetry.sdk.extension.incubator.fileconfig;
 
 import io.opentelemetry.sdk.autoconfigure.spi.Ordered;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 
 public interface DeclarativeConfigurationCustomizerProvider extends Ordered {
-  OpenTelemetryConfigurationModel customize(OpenTelemetryConfigurationModel model);
+  void customize(DeclarativeConfigurationCustomizer customizer);
 }

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java

@@ -197,32 +197,34 @@ public <T> Iterable<T> load(Class<T> spiClass) {
                 + "shape=\"square\", "
                 + "telemetry.sdk.language=\"java\", "
                 + "telemetry.sdk.name=\"opentelemetry\", "
-                + "telemetry.sdk.version=\"1.48.0-SNAPSHOT\"}}");
+                + "telemetry.sdk.version=\"");
   }
 
   private static DeclarativeConfigurationCustomizerProvider getCustomizerProvider() {
-    return model -> {
-      ResourceModel resource = model.getResource();
-      if (resource == null) {
-        resource = new ResourceModel();
-        model.withResource(resource);
-      }
-      List<AttributeNameValueModel> attributes = resource.getAttributes();
-      if (attributes == null) {
-        attributes = new ArrayList<>();
-        resource.withAttributes(attributes);
-      }
-      attributes.add(
-          new AttributeNameValueModel()
-              .withName("foo")
-              .withType(AttributeNameValueModel.Type.STRING)
-              .withValue("bar"));
-      attributes.add(
-          new AttributeNameValueModel()
-              .withName("color")
-              .withType(AttributeNameValueModel.Type.STRING)
-              .withValue("blue"));
-      return model;
-    };
+    return provider ->
+        provider.addModelCustomizer(
+            model -> {
+              ResourceModel resource = model.getResource();
+              if (resource == null) {
+                resource = new ResourceModel();
+                model.withResource(resource);
+              }
+              List<AttributeNameValueModel> attributes = resource.getAttributes();
+              if (attributes == null) {
+                attributes = new ArrayList<>();
+                resource.withAttributes(attributes);
+              }
+              attributes.add(
+                  new AttributeNameValueModel()
+                      .withName("foo")
+                      .withType(AttributeNameValueModel.Type.STRING)
+                      .withValue("bar"));
+              attributes.add(
+                  new AttributeNameValueModel()
+                      .withName("color")
+                      .withType(AttributeNameValueModel.Type.STRING)
+                      .withValue("blue"));
+              return model;
+            });
   }
 }