fix rebase

Author: zeitlinger

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/TestExportersUtil.java

@@ -5,18 +5,18 @@
 
 package io.opentelemetry.javaagent.testing.exporter;
 
-import io.opentelemetry.javaagent.testing.provider.TestLogRecordExporterComponentProvider;
-import io.opentelemetry.javaagent.testing.provider.TestMetricExporterComponentProvider;
-import io.opentelemetry.javaagent.testing.provider.TestSpanExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.AgentTestLogRecordExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.AgentTestMetricExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.AgentTestSpanExporterComponentProvider;
 
-class TestExportersUtil {
+public class TestExportersUtil {
   private TestExportersUtil() {}
 
-  static void initTestExporters() {
-    TestSpanExporterComponentProvider.setSpanExporter(AgentTestingExporterFactory.spanExporter);
-    TestMetricExporterComponentProvider.setMetricExporter(
+  public static void initTestExporters() {
+    AgentTestSpanExporterComponentProvider.setSpanExporter(AgentTestingExporterFactory.spanExporter);
+    AgentTestMetricExporterComponentProvider.setMetricExporter(
         AgentTestingExporterFactory.metricExporter);
-    TestLogRecordExporterComponentProvider.setLogRecordExporter(
+    AgentTestLogRecordExporterComponentProvider.setLogRecordExporter(
         AgentTestingExporterFactory.logExporter);
   }
 }

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestExporterCustomizerProvider.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.testing.provider;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.javaagent.testing.exporter.AgentTestingExporterFactory;
+import io.opentelemetry.javaagent.testing.exporter.TestExportersUtil;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizer;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ConsoleExporterModel;
@@ -32,7 +32,7 @@ public class AgentTestExporterCustomizerProvider
     implements DeclarativeConfigurationCustomizerProvider {
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
-    AgentTestingExporterFactory.init();
+    TestExportersUtil.initTestExporters();
 
     customizer.addModelCustomizer(
         model -> {