call auto configure listener with declarative config

Author: zeitlinger

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java

@@ -451,19 +451,16 @@ private AutoConfiguredOpenTelemetrySdk buildImpl() {
                 ? this.config
                 : DefaultConfigProperties.create(Collections.emptyMap(), componentLoader),
             componentLoader);
-    SpiHelper spiHelper = SpiHelper.create(componentLoader);
     if (fromFileConfiguration != null) {
-      OpenTelemetrySdk openTelemetrySdk = fromFileConfiguration.getOpenTelemetrySdk();
-      maybeRegisterShutdownHook(openTelemetrySdk);
-      callAutoConfigureListeners(spiHelper, openTelemetrySdk);
-
+      maybeRegisterShutdownHook(fromFileConfiguration.getOpenTelemetrySdk());
       Object configProvider = fromFileConfiguration.getConfigProvider();
       if (setResultAsGlobal && INCUBATOR_AVAILABLE && configProvider != null) {
         IncubatingUtil.setGlobalConfigProvider(configProvider);
       }
       return fromFileConfiguration;
     }
 
+    SpiHelper spiHelper = SpiHelper.create(componentLoader);
     if (!customized) {
       customized = true;
       mergeSdkTracerProviderConfigurer();

sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationSpiTest.java

@@ -44,5 +44,7 @@ void configFromSpi() {
 
     assertThat(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk().toString())
         .isEqualTo(expectedSdk.toString());
+
+    assertThat(TestResourceDetector.initialized).isTrue();
   }
 }

sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java

@@ -17,6 +17,9 @@ public OpenTelemetryConfigurationModel getConfigurationModel() {
     String yaml =
         "file_format: \"1.0-rc.1\"\n"
             + "resource:\n"
+            + "  detection/development:\n"
+            + "    detectors:\n"
+            + "      - test:\n"
             + "  attributes:\n"
             + "    - name: service.name\n"
             + "      value: test\n"

sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestResourceDetector.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.resources.Resource;
+
+public class TestResourceDetector implements ComponentProvider<Resource>, AutoConfigureListener {
+
+  @SuppressWarnings("NonFinalStaticField")
+  static boolean initialized = false;
+
+  @Override
+  public void afterAutoConfigure(OpenTelemetrySdk sdk) {
+    initialized = true;
+  }
+
+  @Override
+  public Class<Resource> getType() {
+    return Resource.class;
+  }
+
+  @Override
+  public String getName() {
+    return "test";
+  }
+
+  @Override
+  public Resource create(DeclarativeConfigProperties config) {
+    return Resource.empty();
+  }
+}

sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

@@ -0,0 +1 @@
+io.opentelemetry.sdk.autoconfigure.TestResourceDetector

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

@@ -14,6 +14,7 @@
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
@@ -24,6 +25,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
@@ -120,10 +122,13 @@ public static OpenTelemetrySdk create(
       provider.customize(builder);
     }
 
-    return createAndMaybeCleanup(
-        OpenTelemetryConfigurationFactory.getInstance(),
-        spiHelper,
-        builder.customizeModel(configurationModel));
+    OpenTelemetrySdk sdk =
+        createAndMaybeCleanup(
+            OpenTelemetryConfigurationFactory.getInstance(),
+            spiHelper,
+            builder.customizeModel(configurationModel));
+    callAutoConfigureListeners(spiHelper, sdk);
+    return sdk;
   }
 
   /**
@@ -402,4 +407,16 @@ private StringBuilder envVarSubstitution(
       return newVal;
     }
   }
+
+  private static void callAutoConfigureListeners(
+      SpiHelper spiHelper, OpenTelemetrySdk openTelemetrySdk) {
+    for (AutoConfigureListener listener : spiHelper.getListeners()) {
+      try {
+        listener.afterAutoConfigure(openTelemetrySdk);
+      } catch (Throwable throwable) {
+        logger.log(
+            Level.WARNING, "Error invoking listener " + listener.getClass().getName(), throwable);
+      }
+    }
+  }
 }