Rename and move standard exporter types

exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java

@@ -52,10 +52,7 @@ public GrpcExporter(
     this.grpcSender = grpcSender;
     this.exporterMetrics =
         new ExporterInstrumentation(
-            internalTelemetryVersion,
-            meterProviderSupplier,
-            componentId,
-            endpoint);
+            internalTelemetryVersion, meterProviderSupplier, componentId, endpoint);
   }
 
   public CompletableResultCode export(T exportRequest, int numItems) {

exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.net.URI;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -50,7 +51,7 @@ public class GrpcExporterBuilder<T extends Marshaler> {
 
   private static final Logger LOGGER = Logger.getLogger(GrpcExporterBuilder.class.getName());
 
-  private final ComponentId.StandardExporterType exporterType;
+  private final StandardComponentId.ExporterType exporterType;
   private final String grpcEndpointPath;
   private final Supplier<BiFunction<Channel, String, MarshalerServiceStub<T, ?, ?>>>
       grpcStubFactory;
@@ -64,8 +65,7 @@ public class GrpcExporterBuilder<T extends Marshaler> {
   private TlsConfigHelper tlsConfigHelper = new TlsConfigHelper();
   @Nullable private RetryPolicy retryPolicy = RetryPolicy.getDefault();
   private Supplier<MeterProvider> meterProviderSupplier = GlobalOpenTelemetry::getMeterProvider;
-  private InternalTelemetryVersion internalTelemetryVersion =
-      InternalTelemetryVersion.LEGACY;
+  private InternalTelemetryVersion internalTelemetryVersion = InternalTelemetryVersion.LEGACY;
 
   private ClassLoader serviceClassLoader = GrpcExporterBuilder.class.getClassLoader();
   @Nullable private ExecutorService executorService;
@@ -74,7 +74,7 @@ public class GrpcExporterBuilder<T extends Marshaler> {
   @Nullable private Object grpcChannel;
 
   public GrpcExporterBuilder(
-      ComponentId.StandardExporterType exporterType,
+      StandardComponentId.ExporterType exporterType,
       long defaultTimeoutSecs,
       URI defaultEndpoint,
       Supplier<BiFunction<Channel, String, MarshalerServiceStub<T, ?, ?>>> grpcStubFactory,

exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java

@@ -49,10 +49,7 @@ public HttpExporter(
     this.httpSender = httpSender;
     this.exporterMetrics =
         new ExporterInstrumentation(
-            internalTelemetryVersion,
-            meterProviderSupplier,
-            componentId,
-            endpoint);
+            internalTelemetryVersion, meterProviderSupplier, componentId, endpoint);
   }
 
   public CompletableResultCode export(T exportRequest, int numItems) {

exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.sdk.common.export.ProxyOptions;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,7 +48,7 @@ public final class HttpExporterBuilder<T extends Marshaler> {
 
   private static final Logger LOGGER = Logger.getLogger(HttpExporterBuilder.class.getName());
 
-  private ComponentId.StandardExporterType exporterType;
+  private StandardComponentId.ExporterType exporterType;
 
   private String endpoint;
 
@@ -62,13 +63,12 @@ public final class HttpExporterBuilder<T extends Marshaler> {
   private TlsConfigHelper tlsConfigHelper = new TlsConfigHelper();
   @Nullable private RetryPolicy retryPolicy = RetryPolicy.getDefault();
   private Supplier<MeterProvider> meterProviderSupplier = GlobalOpenTelemetry::getMeterProvider;
-  private InternalTelemetryVersion internalTelemetryVersion =
-      InternalTelemetryVersion.LEGACY;
+  private InternalTelemetryVersion internalTelemetryVersion = InternalTelemetryVersion.LEGACY;
   private ClassLoader serviceClassLoader = HttpExporterBuilder.class.getClassLoader();
   @Nullable private ExecutorService executorService;
 
   public HttpExporterBuilder(
-      ComponentId.StandardExporterType exporterType, String defaultEndpoint) {
+      StandardComponentId.ExporterType exporterType, String defaultEndpoint) {
     this.exporterType = exporterType;
 
     endpoint = defaultEndpoint;
@@ -159,15 +159,15 @@ public HttpExporterBuilder<T> exportAsJson() {
     return this;
   }
 
-  private static ComponentId.StandardExporterType mapToJsonTypeIfPossible(
-      ComponentId.StandardExporterType componentType) {
+  private static StandardComponentId.ExporterType mapToJsonTypeIfPossible(
+      StandardComponentId.ExporterType componentType) {
     switch (componentType) {
       case OTLP_HTTP_SPAN_EXPORTER:
-        return ComponentId.StandardExporterType.OTLP_HTTP_JSON_SPAN_EXPORTER;
+        return StandardComponentId.ExporterType.OTLP_HTTP_JSON_SPAN_EXPORTER;
       case OTLP_HTTP_LOG_EXPORTER:
-        return ComponentId.StandardExporterType.OTLP_HTTP_JSON_LOG_EXPORTER;
+        return StandardComponentId.ExporterType.OTLP_HTTP_JSON_LOG_EXPORTER;
       case OTLP_HTTP_METRIC_EXPORTER:
-        return ComponentId.StandardExporterType.OTLP_HTTP_JSON_METRIC_EXPORTER;
+        return StandardComponentId.ExporterType.OTLP_HTTP_JSON_METRIC_EXPORTER;
       default:
         return componentType;
     }

exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/LegacyExporterMetrics.java

@@ -13,8 +13,8 @@
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.sdk.internal.ComponentId;
 import io.opentelemetry.sdk.internal.Signal;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
@@ -45,7 +45,7 @@ public class LegacyExporterMetrics implements ExporterMetrics {
 
   LegacyExporterMetrics(
       Supplier<MeterProvider> meterProviderSupplier,
-      ComponentId.StandardExporterType exporterType) {
+      StandardComponentId.ExporterType exporterType) {
     this.meterProviderSupplier = meterProviderSupplier;
     this.exporterName = getExporterName(exporterType);
     this.transportName = getTransportName(exporterType);
@@ -55,7 +55,7 @@ public class LegacyExporterMetrics implements ExporterMetrics {
     this.failedAttrs = this.seenAttrs.toBuilder().put(ATTRIBUTE_KEY_SUCCESS, false).build();
   }
 
-  public static boolean isSupportedType(ComponentId.StandardExporterType exporterType) {
+  public static boolean isSupportedType(StandardComponentId.ExporterType exporterType) {
     switch (exporterType) {
       case OTLP_GRPC_SPAN_EXPORTER:
       case OTLP_HTTP_SPAN_EXPORTER:
@@ -85,7 +85,7 @@ private static String getTypeString(Signal signal) {
     throw new IllegalArgumentException("Unhandled signal type: " + signal);
   }
 
-  private static String getExporterName(ComponentId.StandardExporterType exporterType) {
+  private static String getExporterName(StandardComponentId.ExporterType exporterType) {
     switch (exporterType) {
       case OTLP_GRPC_SPAN_EXPORTER:
       case OTLP_HTTP_SPAN_EXPORTER:
@@ -104,7 +104,7 @@ private static String getExporterName(ComponentId.StandardExporterType exporterT
     throw new IllegalArgumentException("Not a supported exporter type: " + exporterType);
   }
 
-  private static String getTransportName(ComponentId.StandardExporterType exporterType) {
+  private static String getTransportName(StandardComponentId.ExporterType exporterType) {
     switch (exporterType) {
       case OTLP_GRPC_SPAN_EXPORTER:
       case OTLP_GRPC_LOG_EXPORTER:

exporters/common/src/main/java/io/opentelemetry/exporter/internal/metrics/SemConvExporterMetrics.java

@@ -83,7 +83,7 @@ private LongUpDownCounter inflight() {
       inflight =
           meter()
               .upDownCounterBuilder(signal.getExporterMetricNamespace() + ".inflight")
-              .setUnit( unit)
+              .setUnit(unit)
               .setDescription(
                   "The number of "
                       + unit

exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java

@@ -9,7 +9,7 @@
 
 import io.opentelemetry.exporter.internal.compression.GzipCompressor;
 import io.opentelemetry.exporter.internal.marshal.Marshaler;
-import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.net.URI;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22,7 +22,7 @@ class GrpcExporterBuilderTest {
   void setUp() {
     builder =
         new GrpcExporterBuilder<>(
-            ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+            StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
             0,
             URI.create("http://localhost:4317"),
             null,

exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java

@@ -34,7 +34,7 @@ void build_NoGrpcSenderProvider() {
     assertThatThrownBy(
             () ->
                 new GrpcExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
                         10,
                         new URI("http://localhost"),
                         null,
@@ -49,7 +49,7 @@ void build_NoGrpcSenderProvider() {
   @ParameterizedTest
   @EnumSource
   @SuppressWarnings("unchecked")
-  void testInternalTelemetry(ComponentId.StandardExporterType exporterType) {
+  void testInternalTelemetry(StandardComponentId.ExporterType exporterType) {
     String signalMetricPrefix;
     String expectedUnit;
     switch (exporterType.signal()) {

exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java

@@ -33,7 +33,7 @@ void build_NoHttpSenderProvider() {
     assertThatThrownBy(
             () ->
                 new HttpExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER,
                         "http://localhost")
                     .build())
         .isInstanceOf(IllegalStateException.class)
@@ -44,7 +44,7 @@ void build_NoHttpSenderProvider() {
 
   @ParameterizedTest
   @EnumSource
-  void testInternalTelemetry(ComponentId.StandardExporterType exporterType) {
+  void testInternalTelemetry(StandardComponentId.ExporterType exporterType) {
     String signalMetricPrefix;
     String expectedUnit;
     switch (exporterType.signal()) {

exporters/common/src/test/java/io/opentelemetry/exporter/internal/metrics/ExporterInstrumentationTest.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
@@ -64,7 +65,7 @@ public AggregationTemporality getAggregationTemporality(
         new ExporterInstrumentation(
             schemaVersion,
             meterProviderSupplier,
-            ComponentId.generateLazy(ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER),
+            ComponentId.generateLazy(StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER),
             "http://testing:1234");
     verifyNoInteractions(meterProviderSupplier); // Ensure lazy
 
@@ -88,7 +89,7 @@ void noopMeterProvider(InternalTelemetryVersion schemaVersion) {
         new ExporterInstrumentation(
             schemaVersion,
             meterProviderSupplier,
-            ComponentId.generateLazy(ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER),
+            ComponentId.generateLazy(StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER),
             "http://testing:1234");
     verifyNoInteractions(meterProviderSupplier); // Ensure lazy
 

exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java

@@ -20,7 +20,7 @@
 import io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSender;
 import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpGrpcSender;
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
-import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.net.URI;
 import java.net.URISyntaxException;
 import javax.annotation.Nullable;
@@ -40,7 +40,7 @@ void build_multipleSendersNoConfiguration() {
     assertThatCode(
             () ->
                 new GrpcExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
                         10,
                         new URI("http://localhost"),
                         () -> DummyServiceFutureStub::newFutureStub,
@@ -63,7 +63,7 @@ void build_multipleSendersNoConfiguration() {
   void build_multipleSendersWithUpstream() throws URISyntaxException {
     assertThat(
             new GrpcExporterBuilder<>(
-                    ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+                    StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
                     10,
                     new URI("http://localhost"),
                     () -> DummyServiceFutureStub::newFutureStub,
@@ -83,7 +83,7 @@ void build_multipleSendersWithUpstream() throws URISyntaxException {
   void build_multipleSendersWithOkHttp() throws URISyntaxException {
     assertThat(
             new GrpcExporterBuilder<>(
-                    ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+                    StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
                     10,
                     new URI("http://localhost"),
                     () -> DummyServiceFutureStub::newFutureStub,
@@ -104,7 +104,7 @@ void build_multipleSendersNoMatch() {
     assertThatThrownBy(
             () ->
                 new GrpcExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER,
                         10,
                         new URI("http://localhost"),
                         () -> DummyServiceFutureStub::newFutureStub,

exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java

@@ -12,7 +12,7 @@
 import io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSender;
 import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSender;
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
-import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,7 +30,7 @@ void build_multipleSendersNoConfiguration() {
     Assertions.assertThatCode(
             () ->
                 new HttpExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER,
                         "http://localhost")
                     .build())
         .doesNotThrowAnyException();
@@ -48,7 +48,7 @@ void build_multipleSendersNoConfiguration() {
   void build_multipleSendersWithJdk() {
     assertThat(
             new HttpExporterBuilder<>(
-                    ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost")
+                    StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost")
                 .build())
         .extracting("httpSender")
         .isInstanceOf(JdkHttpSender.class);
@@ -63,7 +63,7 @@ void build_multipleSendersWithJdk() {
   void build_multipleSendersWithOkHttp() {
     assertThat(
             new HttpExporterBuilder<>(
-                    ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost")
+                    StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost")
                 .build())
         .extracting("httpSender")
         .isInstanceOf(OkHttpHttpSender.class);
@@ -79,7 +79,7 @@ void build_multipleSendersNoMatch() {
     assertThatThrownBy(
             () ->
                 new HttpExporterBuilder<>(
-                        ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER,
+                        StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER,
                         "http://localhost")
                     .build())
         .isInstanceOf(IllegalStateException.class)

exporters/otlp/all/src/jmh/java/io/opentelemetry/exporter/otlp/trace/OltpExporterBenchmark.java

@@ -25,6 +25,7 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.internal.ComponentId;
+import io.opentelemetry.sdk.internal.StandardComponentId;
 import java.net.URI;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
@@ -91,7 +92,7 @@ public void setUp() {
                 Collections::emptyMap,
                 null),
             InternalTelemetryVersion.LATEST,
-            ComponentId.generateLazy(ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER),
+            ComponentId.generateLazy(StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER),
             MeterProvider::noop,
             "http://localhost");
 
@@ -110,13 +111,13 @@ public void setUp() {
                 null,
                 null),
             InternalTelemetryVersion.LATEST,
-            ComponentId.generateLazy(ComponentId.StandardExporterType.OTLP_GRPC_SPAN_EXPORTER),
+            ComponentId.generateLazy(StandardComponentId.ExporterType.OTLP_GRPC_SPAN_EXPORTER),
             MeterProvider::noop,
             "http://localhost");
 
     httpExporter =
         new HttpExporterBuilder<TraceRequestMarshaler>(
-                ComponentId.StandardExporterType.OTLP_HTTP_SPAN_EXPORTER,
+                StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER,
                 "http://localhost:" + server.activeLocalPort() + "/v1/traces")
             .build();
   }