avoid reflection

Author: zeitlinger

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

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
-import static io.opentelemetry.javaagent.tooling.config.ErrorBuffer.setErrorMessage;
+import static io.opentelemetry.javaagent.tooling.config.ErrorBuffer.addErrorMessage;
 import static java.util.Collections.emptyMap;
 
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
@@ -58,7 +58,7 @@ static Map<String, String> loadConfigFile() {
     // Configuration properties file is optional
     File configurationFile = new File(configurationFilePath);
     if (!configurationFile.exists()) {
-      setErrorMessage("Configuration file \"" + configurationFilePath + "\" not found.");
+      addErrorMessage("Configuration file \"" + configurationFilePath + "\" not found.");
       return emptyMap();
     }
 
@@ -67,9 +67,9 @@ static Map<String, String> loadConfigFile() {
         new InputStreamReader(new FileInputStream(configurationFile), StandardCharsets.UTF_8)) {
       properties.load(reader);
     } catch (FileNotFoundException fnf) {
-      setErrorMessage("Configuration file \"" + configurationFilePath + "\" not found.");
+      addErrorMessage("Configuration file \"" + configurationFilePath + "\" not found.");
     } catch (IOException ioe) {
-      setErrorMessage(
+      addErrorMessage(
           "Configuration file \""
               + configurationFilePath
               + "\" cannot be accessed or correctly parsed.");

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

@@ -11,7 +11,7 @@
 import io.opentelemetry.javaagent.extension.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.SdkAutoConfigureAccess;
+import io.opentelemetry.sdk.autoconfigure.SdkAutoconfigureAccess;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -80,7 +80,7 @@ private static OpenTelemetryConfigurationModel loadConfigurationModel(String con
     try (FileInputStream fis = new FileInputStream(configurationFile)) {
       return DeclarativeConfiguration.parse(fis);
     } catch (IOException e) {
-      ErrorBuffer.setErrorMessage(
+      ErrorBuffer.addErrorMessage(
           "Error reading configuration file: " + configurationFile + ". " + e.getMessage());
       return null;
     }
@@ -97,7 +97,7 @@ public AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(ClassLoader extens
 
     setForceFlush(sdk);
 
-    return SdkAutoConfigureAccess.create(
+    return SdkAutoconfigureAccess.create(
         sdk, Resource.getDefault(), this.declarativeConfigProperties, this.configProvider);
   }
 

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

@@ -7,8 +7,9 @@
 
 import static java.util.logging.Level.SEVERE;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 
 /**
  * This class is used to buffer error messages that occur during early initialization of the agent.
@@ -19,19 +20,15 @@ public final class ErrorBuffer {
   // this class is used early, and must not use logging in most of its methods
   // in case any file loading/parsing error occurs, we save the error message and log it later, when
   // the logging subsystem is initialized
-  @Nullable private static String errorMessage;
+  private static final List<String> errorMessages = new ArrayList<>();
 
-  static void setErrorMessage(String errorMessage) {
-    if (ErrorBuffer.errorMessage == null) {
-      ErrorBuffer.errorMessage = errorMessage;
-    } else {
-      ErrorBuffer.errorMessage += "\n" + errorMessage;
-    }
+  static void addErrorMessage(String errorMessage) {
+    errorMessages.add(errorMessage);
   }
 
   public static void logErrorIfAny() {
-    if (errorMessage != null) {
-      Logger.getLogger(ConfigurationPropertiesSupplier.class.getName()).log(SEVERE, errorMessage);
+    for (String message : errorMessages) {
+      Logger.getLogger(ConfigurationPropertiesSupplier.class.getName()).log(SEVERE, message);
     }
   }
 }

javaagent-tooling/src/main/java/io/opentelemetry/sdk/autoconfigure/SdkAutoConfigureAccess.java

@@ -6,11 +6,19 @@
 package io.opentelemetry.sdk.autoconfigure;
 
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.resources.Resource;
 
 public final class SdkAutoconfigureAccess {
+  private SdkAutoconfigureAccess() {}
+
   public static Attributes getResourceAttributes(AutoConfiguredOpenTelemetrySdk sdk) {
     return sdk.getResource().getAttributes();
   }
 
-  private SdkAutoconfigureAccess() {}
+  public static AutoConfiguredOpenTelemetrySdk create(
+      OpenTelemetrySdk sdk, Resource resource, ConfigProperties config, Object configProvider) {
+    return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, config, configProvider);
+  }
 }