Consolidate sender API into single package

docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt

@@ -1,26 +1,26 @@
 Comparing source compatibility of opentelemetry-exporter-common-1.59.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.58.0.jar
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.compressor.Compressor  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.Compressor  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.io.OutputStream compress(java.io.OutputStream)
 		+++  NEW EXCEPTION: java.io.IOException
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getEncoding()
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcResponse  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcResponse  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) byte[] getResponseMessage()
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcStatusCode getStatusCode()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcStatusCode getStatusCode()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getStatusDescription()
 		+++  NEW ANNOTATION: javax.annotation.Nullable
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcSender  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcSender  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.marshal.MessageWriter, java.util.function.Consumer<io.opentelemetry.exporter.grpc.GrpcResponse>, java.util.function.Consumer<java.lang.Throwable>)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.MessageWriter, java.util.function.Consumer<io.opentelemetry.exporter.GrpcResponse>, java.util.function.Consumer<java.lang.Throwable>)
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcSenderConfig  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcSenderConfig  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.compressor.Compressor getCompressor()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.Compressor getCompressor()
 		+++  NEW ANNOTATION: javax.annotation.Nullable
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.URI getEndpoint()
@@ -35,52 +35,52 @@ Comparing source compatibility of opentelemetry-exporter-common-1.59.0-SNAPSHOT.
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getTimeout()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.X509TrustManager getTrustManager()
 		+++  NEW ANNOTATION: javax.annotation.Nullable
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcSenderProvider  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcSenderProvider  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.GrpcSender createSender(io.opentelemetry.exporter.grpc.GrpcSenderConfig)
-+++  NEW ENUM: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode  (compatible)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.GrpcSender createSender(io.opentelemetry.exporter.GrpcSenderConfig)
++++  NEW ENUM: PUBLIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode  (compatible)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW INTERFACE: java.lang.constant.Constable
 	+++  NEW INTERFACE: java.lang.Comparable
 	+++  NEW INTERFACE: java.io.Serializable
 	+++  NEW SUPERCLASS: java.lang.Enum
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode RESOURCE_EXHAUSTED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode ALREADY_EXISTS
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode UNIMPLEMENTED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode FAILED_PRECONDITION
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode NOT_FOUND
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode DEADLINE_EXCEEDED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode OUT_OF_RANGE
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode UNAUTHENTICATED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode CANCELLED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode DATA_LOSS
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode INTERNAL
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode UNAVAILABLE
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode UNKNOWN
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode ABORTED
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode OK
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode INVALID_ARGUMENT
-	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.grpc.GrpcStatusCode PERMISSION_DENIED
-	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.grpc.GrpcStatusCode fromValue(int)
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode RESOURCE_EXHAUSTED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode ALREADY_EXISTS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode UNIMPLEMENTED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode FAILED_PRECONDITION
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode NOT_FOUND
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode DEADLINE_EXCEEDED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode OUT_OF_RANGE
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode UNAUTHENTICATED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode CANCELLED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode DATA_LOSS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode INTERNAL
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode UNAVAILABLE
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode UNKNOWN
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode ABORTED
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode OK
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode INVALID_ARGUMENT
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.exporter.GrpcStatusCode PERMISSION_DENIED
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.GrpcStatusCode fromValue(int)
 	+++  NEW METHOD: PUBLIC(+) int getValue()
-	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.grpc.GrpcStatusCode valueOf(java.lang.String)
-	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.grpc.GrpcStatusCode[] values()
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.HttpResponse  (not serializable)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.GrpcStatusCode valueOf(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.exporter.GrpcStatusCode[] values()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.HttpResponse  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) byte[] getResponseBody()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) int getStatusCode()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getStatusMessage()
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.HttpSender  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.HttpSender  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.marshal.MessageWriter, java.util.function.Consumer<io.opentelemetry.exporter.http.HttpResponse>, java.util.function.Consumer<java.lang.Throwable>)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.MessageWriter, java.util.function.Consumer<io.opentelemetry.exporter.HttpResponse>, java.util.function.Consumer<java.lang.Throwable>)
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown()
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.HttpSenderConfig  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.HttpSenderConfig  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.compressor.Compressor getCompressor()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.Compressor getCompressor()
 		+++  NEW ANNOTATION: javax.annotation.Nullable
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getContentType()
@@ -97,11 +97,11 @@ Comparing source compatibility of opentelemetry-exporter-common-1.59.0-SNAPSHOT.
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getTimeout()
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.X509TrustManager getTrustManager()
 		+++  NEW ANNOTATION: javax.annotation.Nullable
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.HttpSenderProvider  (not serializable)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.HttpSenderProvider  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
-	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.HttpSender createSender(io.opentelemetry.exporter.http.HttpSenderConfig)
-+++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.marshal.MessageWriter  (not serializable)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.HttpSender createSender(io.opentelemetry.exporter.HttpSenderConfig)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.MessageWriter  (not serializable)
 	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
 	+++  NEW SUPERCLASS: java.lang.Object
 	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) int getContentLength()

exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java → exporters/common/src/main/java/io/opentelemetry/exporter/Compressor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.compressor;
+package io.opentelemetry.exporter;
 
 import java.io.IOException;
 import java.io.OutputStream;

exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java → exporters/common/src/main/java/io/opentelemetry/exporter/GrpcResponse.java

@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.grpc;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import java.util.function.Consumer;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;

exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java → exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSender.java

@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.grpc;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import java.util.function.Consumer;
 

exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java → exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderConfig.java

@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.grpc;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.compressor.Compressor;
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import java.io.OutputStream;
 import java.net.URI;

exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java → exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderProvider.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.grpc;
+package io.opentelemetry.exporter;
 
 /**
  * A service provider interface (SPI) for providing {@link GrpcSender}s backed by different client

exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java → exporters/common/src/main/java/io/opentelemetry/exporter/GrpcStatusCode.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.grpc;
+package io.opentelemetry.exporter;
 
 /**
  * gRPC status codes. See <a href="https://grpc.io/docs/guides/status-codes/">official grpc.io

exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java → exporters/common/src/main/java/io/opentelemetry/exporter/HttpResponse.java

@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.http;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import java.util.function.Consumer;
 import javax.annotation.concurrent.Immutable;
 

exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java → exporters/common/src/main/java/io/opentelemetry/exporter/HttpSender.java

@@ -3,9 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.http;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import java.util.function.Consumer;
 
@@ -17,7 +16,7 @@
  * {@code opentelemetry-java} project provides built-in implementations that cover virtually all
  * cases.
  *
- * @see io.opentelemetry.exporter.http.HttpSenderProvider
+ * @see HttpSenderProvider
  */
 public interface HttpSender {
 

exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java → exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderConfig.java

@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.http;
+package io.opentelemetry.exporter;
 
-import io.opentelemetry.exporter.compressor.Compressor;
-import io.opentelemetry.exporter.marshal.MessageWriter;
 import io.opentelemetry.sdk.common.export.ProxyOptions;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import java.io.OutputStream;

exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java → exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderProvider.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.http;
+package io.opentelemetry.exporter;
 
 /**
  * A service provider interface (SPI) for providing {@link HttpSender}s backed by different HTTP

exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java → exporters/common/src/main/java/io/opentelemetry/exporter/MessageWriter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.exporter.marshal;
+package io.opentelemetry.exporter;
 
 import java.io.IOException;
 import java.io.OutputStream;

exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java

@@ -5,8 +5,8 @@
 
 package io.opentelemetry.exporter.internal;
 
-import io.opentelemetry.exporter.grpc.GrpcResponse;
-import io.opentelemetry.exporter.http.HttpResponse;
+import io.opentelemetry.exporter.GrpcResponse;
+import io.opentelemetry.exporter.HttpResponse;
 import javax.annotation.Nullable;
 
 /**

exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.exporter.internal;
 
-import io.opentelemetry.exporter.grpc.GrpcStatusCode;
+import io.opentelemetry.exporter.GrpcStatusCode;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;

exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/CompressorUtil.java

@@ -9,7 +9,7 @@
 import static java.util.stream.Collectors.joining;
 
 import io.opentelemetry.common.ComponentLoader;
-import io.opentelemetry.exporter.compressor.Compressor;
+import io.opentelemetry.exporter.Compressor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/GzipCompressor.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.exporter.internal.compression;
 
-import io.opentelemetry.exporter.compressor.Compressor;
+import io.opentelemetry.exporter.Compressor;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.zip.GZIPOutputStream;

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

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.exporter.internal.grpc;
 
-import io.opentelemetry.exporter.grpc.GrpcSenderConfig;
+import io.opentelemetry.exporter.GrpcSenderConfig;
 import javax.annotation.Nullable;
 
 /**

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

@@ -6,9 +6,9 @@
 package io.opentelemetry.exporter.internal.grpc;
 
 import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.exporter.grpc.GrpcResponse;
-import io.opentelemetry.exporter.grpc.GrpcSender;
-import io.opentelemetry.exporter.grpc.GrpcStatusCode;
+import io.opentelemetry.exporter.GrpcResponse;
+import io.opentelemetry.exporter.GrpcSender;
+import io.opentelemetry.exporter.GrpcStatusCode;
 import io.opentelemetry.exporter.internal.FailedExportException;
 import io.opentelemetry.exporter.internal.marshal.Marshaler;
 import io.opentelemetry.exporter.internal.metrics.ExporterInstrumentation;

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

@@ -10,9 +10,9 @@
 import io.opentelemetry.api.internal.ConfigUtil;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.common.ComponentLoader;
-import io.opentelemetry.exporter.compressor.Compressor;
-import io.opentelemetry.exporter.grpc.GrpcSender;
-import io.opentelemetry.exporter.grpc.GrpcSenderProvider;
+import io.opentelemetry.exporter.Compressor;
+import io.opentelemetry.exporter.GrpcSender;
+import io.opentelemetry.exporter.GrpcSenderProvider;
 import io.opentelemetry.exporter.internal.ExporterBuilderUtil;
 import io.opentelemetry.exporter.internal.TlsConfigHelper;
 import io.opentelemetry.exporter.internal.compression.CompressorUtil;
@@ -51,7 +51,7 @@ public class GrpcExporterBuilder {
   private static final Logger LOGGER = Logger.getLogger(GrpcExporterBuilder.class.getName());
   private static final String OLD_SPI_PROPERTY =
       "io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider";
-  private static final String SPI_PROPERTY = "io.opentelemetry.exporter.grpc.GrpcSenderProvider";
+  private static final String SPI_PROPERTY = "io.opentelemetry.exporter.GrpcSenderProvider";
 
   private final StandardComponentId.ExporterType exporterType;
   private final String fullMethodName;
@@ -294,9 +294,9 @@ public String toString() {
    * <p>If multiple are available and..
    *
    * <ul>
-   *   <li>{@code io.opentelemetry.exporter.grpc.GrpcSenderProvider} is empty, use the first found.
-   *   <li>{@code io.opentelemetry.exporter.grpc.GrpcSenderProvider} is set, use the matching
-   *       provider. If none match, throw {@link IllegalStateException}.
+   *   <li>{@code io.opentelemetry.exporter.GrpcSenderProvider} is empty, use the first found.
+   *   <li>{@code io.opentelemetry.exporter.GrpcSenderProvider} is set, use the matching provider.
+   *       If none match, throw {@link IllegalStateException}.
    * </ul>
    */
   private GrpcSenderProvider resolveGrpcSenderProvider() {

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

@@ -6,8 +6,8 @@
 package io.opentelemetry.exporter.internal.grpc;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.exporter.grpc.GrpcResponse;
-import io.opentelemetry.exporter.grpc.GrpcStatusCode;
+import io.opentelemetry.exporter.GrpcResponse;
+import io.opentelemetry.exporter.GrpcStatusCode;
 import javax.annotation.Nullable;
 
 /**

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

@@ -6,7 +6,7 @@
 package io.opentelemetry.exporter.internal.grpc;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.exporter.compressor.Compressor;
+import io.opentelemetry.exporter.Compressor;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import java.net.URI;
 import java.time.Duration;

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

@@ -25,7 +25,7 @@
 import com.google.common.io.ByteStreams;
 import io.grpc.Drainable;
 import io.grpc.KnownLength;
-import io.opentelemetry.exporter.marshal.MessageWriter;
+import io.opentelemetry.exporter.MessageWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;