create sdk from previously read config model

Author: zeitlinger

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.tooling;
 
-import static io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller.installOpenTelemetrySdk;
 import static io.opentelemetry.javaagent.tooling.SafeServiceLoader.load;
 import static io.opentelemetry.javaagent.tooling.SafeServiceLoader.loadOrdered;
 import static io.opentelemetry.javaagent.tooling.Utils.getResourceName;
@@ -159,10 +158,8 @@ private static void installBytebuddyAgent(
 
     installEarlyInstrumentation(agentBuilder, inst);
 
-    // If noop OpenTelemetry is enabled, autoConfiguredSdk will be null and AgentListeners are not
-    // called
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        installOpenTelemetrySdk(extensionClassLoader);
+        earlyConfig.installOpenTelemetrySdk(extensionClassLoader);
 
     ConfigProperties sdkConfig = AgentListener.resolveConfigProperties(autoConfiguredSdk);
     AgentInstrumentationConfig.internalInitializeConfig(

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -5,14 +5,24 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
+import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
 import io.opentelemetry.javaagent.extension.DeclarativeConfigPropertiesBridge;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.common.CompletableResultCode;
 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.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.resources.Resource;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Objects;
 import javax.annotation.Nullable;
 
@@ -23,11 +33,12 @@
 public final class DeclarativeConfigEarlyInitAgentConfig implements EarlyInitAgentConfig {
   private final OpenTelemetryConfigurationModel configurationModel;
   private final ConfigProperties declarativeConfigProperties;
+  private final SdkConfigProvider configProvider;
 
   DeclarativeConfigEarlyInitAgentConfig(String configurationFile) {
     this.configurationModel = loadConfigurationModel(configurationFile);
-    this.declarativeConfigProperties =
-        new DeclarativeConfigPropertiesBridge(SdkConfigProvider.create(configurationModel));
+    configProvider = SdkConfigProvider.create(configurationModel);
+    this.declarativeConfigProperties = new DeclarativeConfigPropertiesBridge(configProvider);
   }
 
   @Override
@@ -63,4 +74,43 @@ private static OpenTelemetryConfigurationModel loadConfigurationModel(String con
       throw new DeclarativeConfigException("unable to read " + configurationFile, e);
     }
   }
+
+  @Override
+  public AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(ClassLoader extensionClassLoader) {
+    OpenTelemetrySdk sdk =
+        DeclarativeConfiguration.create(
+            this.configurationModel,
+            SpiHelper.serviceComponentLoader(
+                AutoConfiguredOpenTelemetrySdk.class.getClassLoader()));
+    Runtime.getRuntime().addShutdownHook(new Thread(sdk::close));
+    GlobalOpenTelemetry.set(sdk);
+
+    setForceFlush(sdk);
+
+    try {
+      Method method =
+          AutoConfiguredOpenTelemetrySdk.class.getDeclaredMethod(
+              "create",
+              OpenTelemetrySdk.class,
+              Resource.class,
+              ConfigProperties.class,
+              Object.class);
+      method.setAccessible(true);
+      return (AutoConfiguredOpenTelemetrySdk)
+          method.invoke(null, sdk, Resource.getDefault(), null, this.configProvider);
+    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+      throw new IllegalStateException("Error calling create on AutoConfiguredOpenTelemetrySdk", e);
+    }
+  }
+
+  static void setForceFlush(OpenTelemetrySdk sdk) {
+    OpenTelemetrySdkAccess.internalSetForceFlush(
+        (timeout, unit) -> {
+          CompletableResultCode traceResult = sdk.getSdkTracerProvider().forceFlush();
+          CompletableResultCode metricsResult = sdk.getSdkMeterProvider().forceFlush();
+          CompletableResultCode logsResult = sdk.getSdkLoggerProvider().forceFlush();
+          CompletableResultCode.ofAll(Arrays.asList(traceResult, metricsResult, logsResult))
+              .join(timeout, unit);
+        });
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/DeclarativeConfigEarlyInitAgentConfig.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import java.util.Collections;
 import javax.annotation.Nullable;
@@ -21,6 +23,14 @@ public interface EarlyInitAgentConfig {
 
   void logEarlyConfigErrorsIfAny();
 
+  /**
+   * Install the {@link OpenTelemetrySdk} using autoconfigure, and return the {@link
+   * AutoConfiguredOpenTelemetrySdk}.
+   *
+   * @return the {@link AutoConfiguredOpenTelemetrySdk}
+   */
+  AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(ClassLoader extensionClassLoader);
+
   static EarlyInitAgentConfig create() {
     String configurationFile =
         DefaultConfigProperties.create(Collections.emptyMap())

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfig.java

@@ -6,6 +6,8 @@
 package io.opentelemetry.javaagent.tooling.config;
 
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import java.util.Map;
 import javax.annotation.Nullable;
 
@@ -62,4 +64,16 @@ public int getInt(String propertyName, int defaultValue) {
   public void logEarlyConfigErrorsIfAny() {
     ConfigurationFile.logErrorIfAny();
   }
+
+  @Override
+  public AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(ClassLoader extensionClassLoader) {
+    AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
+        AutoConfiguredOpenTelemetrySdk.builder()
+            .setResultAsGlobal()
+            .setServiceClassLoader(extensionClassLoader)
+            .build();
+    OpenTelemetrySdk sdk = autoConfiguredSdk.getOpenTelemetrySdk();
+    DeclarativeConfigEarlyInitAgentConfig.setForceFlush(sdk);
+    return autoConfiguredSdk;
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/LegacyConfigFileEarlyInitAgentConfig.java

@@ -10,7 +10,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
@@ -46,7 +45,7 @@ void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IO
 
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        EarlyInitAgentConfig.create().installOpenTelemetrySdk(this.getClass().getClassLoader());
 
     // then
     assertThat(AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("custom.key"))

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy

@@ -0,0 +1,28 @@
+package io.opentelemetry.javaagent.tooling.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class DeclarativeConfigEarlyInitAgentConfigTest {
+
+  @BeforeEach
+  void setUp() {
+    GlobalOpenTelemetry.resetForTest();
+  }
+
+  @Test
+  void globalOpenTelemetry() {
+    EarlyInitAgentConfig config = EarlyInitAgentConfig.create(); // no declarative config file
+    assertTrue(config.isAgentEnabled(), "Agent should be enabled by default");
+    AutoConfiguredOpenTelemetrySdk sdk =
+        config.installOpenTelemetrySdk(
+            DeclarativeConfigEarlyInitAgentConfig.class.getClassLoader());
+    assertThat(sdk).isNotNull().isNotEqualTo(OpenTelemetry.noop());
+  }
+}

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java

@@ -8,7 +8,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.javaagent.tooling.OpenTelemetryInstaller;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import org.junit.jupiter.api.AfterEach;
@@ -29,7 +28,7 @@ void cleanUp() {
   void keepUserOtlpProtocolConfiguration() {
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        EarlyInitAgentConfig.create().installOpenTelemetrySdk(this.getClass().getClassLoader());
 
     // then
     assertThat(
@@ -41,7 +40,7 @@ void keepUserOtlpProtocolConfiguration() {
   void defaultHttpProtobufOtlpProtocolConfiguration() {
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        EarlyInitAgentConfig.create().installOpenTelemetrySdk(this.getClass().getClassLoader());
 
     // then
     assertThat(