separate test bridge for agent

Author: zeitlinger

testing/agent-exporter/build.gradle.kts

@@ -15,8 +15,8 @@ dependencies {
   compileOnly(project(":javaagent-extension-api"))
   compileOnly(project(":javaagent-bootstrap"))
   compileOnly(project(":javaagent-tooling"))
-  implementation(project(":testing-common"))
 
   implementation("io.opentelemetry:opentelemetry-exporter-otlp-common")
+  compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
 }

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

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.javaagent.testing.exporter;
 
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeLogRecordExporterComponentProvider;
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeMetricExporterComponentProvider;
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeSpanExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.TestBridgeLogRecordExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.TestBridgeMetricExporterComponentProvider;
+import io.opentelemetry.javaagent.testing.provider.TestBridgeSpanExporterComponentProvider;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 

testing/agent-exporter/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeLogRecordExporterComponentProvider.java renamed to testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeLogRecordExporterComponentProvider.java

@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.testing.provider;
+package io.opentelemetry.javaagent.testing.provider;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class TestBridgeLogRecordExporterComponentProvider
     implements ComponentProvider<LogRecordExporter> {
 
   private static final Logger logger =
-      LoggerFactory.getLogger(TestBridgeLogRecordExporterComponentProvider.class);
+      Logger.getLogger(TestBridgeLogRecordExporterComponentProvider.class.getName());
 
   private static LogRecordExporter logRecordExporter;
 
@@ -35,9 +35,8 @@ public LogRecordExporter create(DeclarativeConfigProperties config) {
   }
 
   public static void setLogRecordExporter(LogRecordExporter logRecordExporter) {
-    logger.info(
-        "Setting TestLogRecordExporterComponentProvider logRecord exporter to {}",
-        logRecordExporter.getClass().getName());
+    logger.log(
+        Level.INFO, "Setting logRecord exporter to {0}", logRecordExporter.getClass().getName());
     TestBridgeLogRecordExporterComponentProvider.logRecordExporter = logRecordExporter;
   }
 }

testing/agent-exporter/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeMetricExporterComponentProvider.java renamed to testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeMetricExporterComponentProvider.java

@@ -3,19 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.testing.provider;
+package io.opentelemetry.javaagent.testing.provider;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class TestBridgeMetricExporterComponentProvider
     implements ComponentProvider<MetricExporter> {
 
   private static final Logger logger =
-      LoggerFactory.getLogger(TestBridgeMetricExporterComponentProvider.class);
+      Logger.getLogger(TestBridgeMetricExporterComponentProvider.class.getName());
 
   private static MetricExporter metricExporter;
 
@@ -35,9 +35,8 @@ public MetricExporter create(DeclarativeConfigProperties config) {
   }
 
   public static void setMetricExporter(MetricExporter metricExporter) {
-    logger.info(
-        "Setting TestMetricExporterComponentProvider metric exporter to {}",
-        metricExporter.getClass().getName());
+    logger.log(
+        Level.INFO, "Setting logRecord exporter to {0}", metricExporter.getClass().getName());
     TestBridgeMetricExporterComponentProvider.metricExporter = metricExporter;
   }
 }

testing/agent-exporter/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestBridgeSpanExporterComponentProvider.java renamed to testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/TestBridgeSpanExporterComponentProvider.java

@@ -3,19 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.testing.provider;
+package io.opentelemetry.javaagent.testing.provider;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-// todo should be inherited from testing-common - not sure why it is not
 public class TestBridgeSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
 
   private static final Logger logger =
-      LoggerFactory.getLogger(TestBridgeSpanExporterComponentProvider.class);
+      Logger.getLogger(TestBridgeSpanExporterComponentProvider.class.getName());
 
   private static SpanExporter spanExporter;
 
@@ -35,9 +34,7 @@ public SpanExporter create(DeclarativeConfigProperties config) {
   }
 
   public static void setSpanExporter(SpanExporter spanExporter) {
-    logger.info(
-        "Setting TestSpanExporterComponentProvider span exporter to {}",
-        spanExporter.getClass().getName());
+    logger.log(Level.INFO, "Setting span exporter to {0}", spanExporter.getClass().getName());
     TestBridgeSpanExporterComponentProvider.spanExporter = spanExporter;
   }
 }

testing/agent-exporter/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

@@ -0,0 +1,4 @@
+io.opentelemetry.javaagent.testing.provider.TestBridgeSpanExporterComponentProvider
+io.opentelemetry.javaagent.testing.provider.TestBridgeMetricExporterComponentProvider
+io.opentelemetry.javaagent.testing.provider.TestBridgeLogRecordExporterComponentProvider
+