test coverage

Author: zeitlinger

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

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.sdk.autoconfigure;
 
+import static java.util.Objects.requireNonNull;
+
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
@@ -18,7 +20,6 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Objects;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
@@ -33,28 +34,32 @@ final class IncubatingUtil {
 
   private IncubatingUtil() {}
 
+  // Visible for testing
+  interface Factory {
+    @Nullable
+    AutoConfiguredOpenTelemetrySdk create()
+        throws ClassNotFoundException,
+            NoSuchMethodException,
+            IllegalAccessException,
+            InvocationTargetException;
+  }
+
   static AutoConfiguredOpenTelemetrySdk configureFromFile(
       Logger logger, String configurationFile, ComponentLoader componentLoader) {
     logger.fine("Autoconfiguring from configuration file: " + configurationFile);
     try (FileInputStream fis = new FileInputStream(configurationFile)) {
-      Object model =
-          Class.forName(
-                  "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration")
-              .getMethod("parse", InputStream.class)
-              .invoke(null, fis);
-      return getOpenTelemetrySdk(model, componentLoader);
+      return requireNonNull(
+          createWithFactory(
+              "file",
+              () ->
+                  getOpenTelemetrySdk(
+                      Class.forName(
+                              "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration")
+                          .getMethod("parse", InputStream.class)
+                          .invoke(null, fis),
+                      componentLoader)));
     } catch (FileNotFoundException e) {
       throw new ConfigurationException("Configuration file not found", e);
-    } 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);
     } catch (IOException e) {
       // IOException (other than FileNotFoundException which is caught above) is only thrown
       // above by FileInputStream.close()
@@ -64,30 +69,22 @@ static AutoConfiguredOpenTelemetrySdk configureFromFile(
 
   @Nullable
   public static AutoConfiguredOpenTelemetrySdk configureFromSpi(ComponentLoader componentLoader) {
-    try {
-      Class<?> providerClass =
-          Class.forName(
-              "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider");
-      Method getConfigurationModel = providerClass.getMethod("getConfigurationModel");
+    return createWithFactory(
+        "SPI",
+        () -> {
+          Class<?> providerClass =
+              Class.forName(
+                  "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationProvider");
+          Method getConfigurationModel = providerClass.getMethod("getConfigurationModel");
 
-      for (Object configProvider : componentLoader.load(providerClass)) {
-        Object model = getConfigurationModel.invoke(configProvider);
-        if (model != null) {
-          return getOpenTelemetrySdk(model, componentLoader);
-        }
-      }
-      return null;
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-      throw new ConfigurationException(
-          "Error configuring from SPI. 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 SPI", e);
-    }
+          for (Object configProvider : componentLoader.load(providerClass)) {
+            Object model = getConfigurationModel.invoke(configProvider);
+            if (model != null) {
+              return getOpenTelemetrySdk(model, componentLoader);
+            }
+          }
+          return null;
+        });
   }
 
   private static AutoConfiguredOpenTelemetrySdk getOpenTelemetrySdk(
@@ -119,9 +116,29 @@ private static AutoConfiguredOpenTelemetrySdk getOpenTelemetrySdk(
     return AutoConfiguredOpenTelemetrySdk.create(sdk, Resource.getDefault(), null, configProvider);
   }
 
+  // Visible for testing
+  @Nullable
+  static AutoConfiguredOpenTelemetrySdk createWithFactory(String name, Factory factory) {
+    try {
+      return factory.create();
+    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
+      throw new ConfigurationException(
+          String.format(
+              "Error configuring from %s. Is opentelemetry-sdk-extension-incubator on the classpath?",
+              name),
+          e);
+    } catch (InvocationTargetException e) {
+      Throwable cause = e.getCause();
+      if (cause instanceof DeclarativeConfigException) {
+        throw toConfigurationException((DeclarativeConfigException) cause);
+      }
+      throw new ConfigurationException("Unexpected error configuring from " + name, e);
+    }
+  }
+
   private static ConfigurationException toConfigurationException(
       DeclarativeConfigException exception) {
-    String message = Objects.requireNonNull(exception.getMessage());
+    String message = requireNonNull(exception.getMessage());
     return new ConfigurationException(message, exception);
   }
 

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+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 IncubatingUtilTest {
+
+  @Test
+  void classNotFoundException() {
+    assertThatCode(
+            () ->
+                IncubatingUtil.createWithFactory(
+                    "test",
+                    () -> {
+                      Class.forName("foo");
+                      return null;
+                    }))
+        .isInstanceOf(ConfigurationException.class)
+        .hasMessage(
+            "Error configuring from test. Is opentelemetry-sdk-extension-incubator on the classpath?");
+  }
+
+  @Test
+  void invocationTargetException() {
+    assertThatCode(
+            () ->
+                IncubatingUtil.createWithFactory(
+                    "test",
+                    () -> {
+                      throw new InvocationTargetException(new RuntimeException("test exception"));
+                    }))
+        .isInstanceOf(ConfigurationException.class)
+        .hasMessage("Unexpected error configuring from test")
+        .hasRootCauseMessage("test exception");
+  }
+}