test coverage

Author: zeitlinger

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig;
+
+import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.resources.Resource;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+class AutoConfiguredOpenTelemetrySdkAccess {
+
+  private AutoConfiguredOpenTelemetrySdkAccess() {}
+
+  static AutoConfiguredOpenTelemetrySdk create(
+      OpenTelemetrySdk sdk, Resource resource, SdkConfigProvider provider) {
+    return createWithFactory(
+        () -> {
+          Method method =
+              Class.forName(AutoConfiguredOpenTelemetrySdk.class.getName())
+                  .getDeclaredMethod(
+                      "create",
+                      OpenTelemetrySdk.class,
+                      Resource.class,
+                      ConfigProperties.class,
+                      Object.class);
+          method.setAccessible(true);
+          return (AutoConfiguredOpenTelemetrySdk)
+              method.invoke(null, sdk, resource, null, provider);
+        });
+  }
+
+  // Visible for testing
+  interface Factory {
+    AutoConfiguredOpenTelemetrySdk create()
+        throws ClassNotFoundException,
+            NoSuchMethodException,
+            IllegalAccessException,
+            InvocationTargetException;
+  }
+
+  // Visible for testing
+  static AutoConfiguredOpenTelemetrySdk createWithFactory(Factory factory) {
+    try {
+      return factory.create();
+    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
+      throw new ConfigurationException(
+          "Error configuring from file. Is opentelemetry-sdk-extension-incubator on the classpath?",
+          e);
+    } catch (InvocationTargetException e) {
+      Throwable cause = e.getCause();
+      if (cause instanceof DeclarativeConfigException) {
+        throw toConfigurationException((DeclarativeConfigException) cause);
+      }
+      throw new ConfigurationException("Unexpected error configuring from file", e);
+    }
+  }
+
+  private static ConfigurationException toConfigurationException(
+      DeclarativeConfigException exception) {
+    String message = Objects.requireNonNull(exception.getMessage());
+    return new ConfigurationException(message, exception);
+  }
+}

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

@@ -14,18 +14,13 @@
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 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;
-import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -137,39 +132,10 @@ private static OpenTelemetrySdk create(
   public static AutoConfiguredOpenTelemetrySdk createAutoConfiguredSdk(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
     DeclarativeConfigContext context = DeclarativeConfigContext.create(componentLoader);
-
     OpenTelemetrySdk sdk = create(configurationModel, context);
     SdkConfigProvider provider = SdkConfigProvider.create(configurationModel, componentLoader);
 
-    try {
-      Method method =
-          Class.forName(AutoConfiguredOpenTelemetrySdk.class.getName())
-              .getDeclaredMethod(
-                  "create",
-                  OpenTelemetrySdk.class,
-                  Resource.class,
-                  ConfigProperties.class,
-                  Object.class);
-      method.setAccessible(true);
-      return (AutoConfiguredOpenTelemetrySdk)
-          method.invoke(null, sdk, context.getResource(), null, provider);
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-      throw new ConfigurationException(
-          "Error configuring from file. Is opentelemetry-sdk-extension-incubator on the classpath?",
-          e);
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
-      if (cause instanceof DeclarativeConfigException) {
-        throw toConfigurationException((DeclarativeConfigException) cause);
-      }
-      throw new ConfigurationException("Unexpected error configuring from file", e);
-    }
-  }
-
-  private static ConfigurationException toConfigurationException(
-      DeclarativeConfigException exception) {
-    String message = Objects.requireNonNull(exception.getMessage());
-    return new ConfigurationException(message, exception);
+    return AutoConfiguredOpenTelemetrySdkAccess.create(sdk, context.getResource(), provider);
   }
 
   /**

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.extension.incubator.fileconfig;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import java.lang.reflect.InvocationTargetException;
+import org.junit.jupiter.api.Test;
+
+class AutoConfiguredOpenTelemetrySdkAccessTest {
+
+  @Test
+  void classNotFoundException() {
+    assertThatCode(
+            () ->
+                AutoConfiguredOpenTelemetrySdkAccess.createWithFactory(
+                    () -> {
+                      Class.forName("foo");
+                      return null;
+                    }))
+        .isInstanceOf(ConfigurationException.class)
+        .hasMessage(
+            "Error configuring from file. Is opentelemetry-sdk-extension-incubator on the classpath?");
+  }
+
+  @Test
+  void invocationTargetException() {
+    assertThatCode(
+            () ->
+                AutoConfiguredOpenTelemetrySdkAccess.createWithFactory(
+                    () -> {
+                      throw new InvocationTargetException(new RuntimeException("test exception"));
+                    }))
+        .isInstanceOf(ConfigurationException.class)
+        .hasMessage("Unexpected error configuring from file")
+        .hasRootCauseMessage("test exception");
+  }
+}