diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt index 8a9b0d5c223..b40c86e962c 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt @@ -1,109 +1,2 @@ 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) - +++ 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) - +++ 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(+) java.lang.String getStatusDescription() - +++ NEW ANNOTATION: javax.annotation.Nullable -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.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, java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown() -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.grpc.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 ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.URI getEndpoint() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.concurrent.ExecutorService getExecutorService() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getFullMethodName() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.function.Supplier>> getHeadersSupplier() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.RetryPolicy getRetryPolicy() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.SSLContext getSslContext() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ 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) - +++ 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) - +++ 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 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) - +++ 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) - +++ 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, java.util.function.Consumer) - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown() -+++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.exporter.http.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 ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getContentType() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.URI getEndpoint() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.concurrent.ExecutorService getExecutorService() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.function.Supplier>> getHeadersSupplier() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.ProxyOptions getProxyOptions() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.RetryPolicy getRetryPolicy() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.SSLContext getSslContext() - +++ NEW ANNOTATION: javax.annotation.Nullable - +++ 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) - +++ 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) - +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. - +++ NEW SUPERCLASS: java.lang.Object - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) int getContentLength() - +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void writeMessage(java.io.OutputStream) - +++ NEW EXCEPTION: java.io.IOException +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt index 146046d4f98..dfe13332084 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-sdk-common.txt @@ -1,2 +1,109 @@ Comparing source compatibility of opentelemetry-sdk-common-1.59.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.58.0.jar -No changes. \ No newline at end of file ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.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.sdk.common.export.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.sdk.common.export.GrpcStatusCode getStatusCode() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getStatusDescription() + +++ NEW ANNOTATION: javax.annotation.Nullable ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.GrpcSender (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.sdk.common.export.MessageWriter, java.util.function.Consumer, java.util.function.Consumer) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown() ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.GrpcSenderConfig (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.Compressor getCompressor() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.URI getEndpoint() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.concurrent.ExecutorService getExecutorService() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getFullMethodName() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.function.Supplier>> getHeadersSupplier() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.RetryPolicy getRetryPolicy() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.SSLContext getSslContext() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ 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.sdk.common.export.GrpcSenderProvider (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.GrpcSender createSender(io.opentelemetry.sdk.common.export.GrpcSenderConfig) ++++ NEW ENUM: PUBLIC(+) FINAL(+) io.opentelemetry.sdk.common.export.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.sdk.common.export.GrpcStatusCode RESOURCE_EXHAUSTED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode ALREADY_EXISTS + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode UNIMPLEMENTED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode FAILED_PRECONDITION + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode NOT_FOUND + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode DEADLINE_EXCEEDED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode OUT_OF_RANGE + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode UNAUTHENTICATED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode CANCELLED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode DATA_LOSS + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode INTERNAL + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode UNAVAILABLE + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode UNKNOWN + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode ABORTED + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode OK + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode INVALID_ARGUMENT + +++ NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.opentelemetry.sdk.common.export.GrpcStatusCode PERMISSION_DENIED + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.common.export.GrpcStatusCode fromValue(int) + +++ NEW METHOD: PUBLIC(+) int getValue() + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.common.export.GrpcStatusCode valueOf(java.lang.String) + +++ NEW METHOD: PUBLIC(+) STATIC(+) io.opentelemetry.sdk.common.export.GrpcStatusCode[] values() ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.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.sdk.common.export.HttpSender (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.sdk.common.export.MessageWriter, java.util.function.Consumer, java.util.function.Consumer) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.CompletableResultCode shutdown() ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.HttpSenderConfig (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.Compressor getCompressor() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.time.Duration getConnectTimeout() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getContentType() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.URI getEndpoint() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.concurrent.ExecutorService getExecutorService() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.function.Supplier>> getHeadersSupplier() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.ProxyOptions getProxyOptions() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.RetryPolicy getRetryPolicy() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) javax.net.ssl.SSLContext getSslContext() + +++ NEW ANNOTATION: javax.annotation.Nullable + +++ 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.sdk.common.export.HttpSenderProvider (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.HttpSender createSender(io.opentelemetry.sdk.common.export.HttpSenderConfig) ++++ NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.opentelemetry.sdk.common.export.MessageWriter (not serializable) + +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. + +++ NEW SUPERCLASS: java.lang.Object + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) int getContentLength() + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void writeMessage(java.io.OutputStream) + +++ NEW EXCEPTION: java.io.IOException diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java index 63dfc184345..a6ad9caffd6 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java +++ b/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.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.HttpResponse; import javax.annotation.Nullable; /** diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java index 015992994c3..eab9e30cab2 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/RetryUtil.java +++ b/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.sdk.common.export.GrpcStatusCode; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/CompressorUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/CompressorUtil.java index dbfcb3321d1..c5ee9f518b9 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/CompressorUtil.java +++ b/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.sdk.common.export.Compressor; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/GzipCompressor.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/GzipCompressor.java index cc843b315b5..d9bad95232c 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/compression/GzipCompressor.java +++ b/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.sdk.common.export.Compressor; import java.io.IOException; import java.io.OutputStream; import java.util.zip.GZIPOutputStream; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ExtendedGrpcSenderConfig.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ExtendedGrpcSenderConfig.java index a08c0f9ffe6..a689f56152b 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ExtendedGrpcSenderConfig.java +++ b/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.sdk.common.export.GrpcSenderConfig; import javax.annotation.Nullable; /** diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java index e0c03cbe34c..6798434090b 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporter.java @@ -6,14 +6,14 @@ 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.internal.FailedExportException; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.internal.metrics.ExporterInstrumentation; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import io.opentelemetry.sdk.internal.StandardComponentId; import io.opentelemetry.sdk.internal.ThrottlingLogger; import java.net.URI; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java index 82fe634a8d8..bb102df37f6 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilder.java @@ -10,13 +10,13 @@ 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.internal.ExporterBuilderUtil; import io.opentelemetry.exporter.internal.TlsConfigHelper; import io.opentelemetry.exporter.internal.compression.CompressorUtil; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcSenderProvider; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.ComponentId; import io.opentelemetry.sdk.internal.StandardComponentId; @@ -51,7 +51,8 @@ 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.sdk.common.export.GrpcSenderProvider"; private final StandardComponentId.ExporterType exporterType; private final String fullMethodName; @@ -294,8 +295,9 @@ public String toString() { *

If multiple are available and.. * *

    - *
  • {@code io.opentelemetry.exporter.grpc.GrpcSenderProvider} is empty, use the first found. - *
  • {@code io.opentelemetry.exporter.grpc.GrpcSenderProvider} is set, use the matching + *
  • {@code io.opentelemetry.sdk.common.export.GrpcSenderProvider} is empty, use the first + * found. + *
  • {@code io.opentelemetry.sdk.common.export.GrpcSenderProvider} is set, use the matching * provider. If none match, throw {@link IllegalStateException}. *
*/ diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcResponse.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcResponse.java index afac9d93f89..1fe4c1c62f6 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcResponse.java +++ b/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.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import javax.annotation.Nullable; /** diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcSenderConfig.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcSenderConfig.java index 6a7e8a2577c..6903488564b 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/ImmutableGrpcSenderConfig.java +++ b/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.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.RetryPolicy; import java.net.URI; import java.time.Duration; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/MarshalerInputStream.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/MarshalerInputStream.java index c2d752412bf..ea9e98ba0b3 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/grpc/MarshalerInputStream.java +++ b/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.sdk.common.export.MessageWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java index 44a9f08db02..ba1a0637ea2 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporter.java @@ -6,15 +6,15 @@ package io.opentelemetry.exporter.internal.http; import io.opentelemetry.api.metrics.MeterProvider; -import io.opentelemetry.exporter.http.HttpResponse; -import io.opentelemetry.exporter.http.HttpSender; import io.opentelemetry.exporter.internal.FailedExportException; import io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.internal.metrics.ExporterInstrumentation; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.HttpResponse; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.internal.StandardComponentId; import io.opentelemetry.sdk.internal.ThrottlingLogger; import java.io.IOException; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java index c2e8e82d7a7..4203bb1be3e 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilder.java @@ -9,13 +9,13 @@ 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.http.HttpSender; -import io.opentelemetry.exporter.http.HttpSenderProvider; import io.opentelemetry.exporter.internal.ExporterBuilderUtil; import io.opentelemetry.exporter.internal.TlsConfigHelper; import io.opentelemetry.exporter.internal.compression.CompressorUtil; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.HttpSenderProvider; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.ComponentId; @@ -51,7 +51,8 @@ public final class HttpExporterBuilder { private static final Logger LOGGER = Logger.getLogger(HttpExporterBuilder.class.getName()); private static final String OLD_SPI_PROPERTY = "io.opentelemetry.exporter.internal.http.HttpSenderProvider"; - private static final String SPI_PROPERTY = "io.opentelemetry.exporter.http.HttpSenderProvider"; + private static final String SPI_PROPERTY = + "io.opentelemetry.sdk.common.export.HttpSenderProvider"; private StandardComponentId.ExporterType exporterType; @@ -309,8 +310,9 @@ public String toString() { *

If multiple are available and.. * *

    - *
  • {@code io.opentelemetry.exporter.http.HttpSenderProvider} is empty, use the first found. - *
  • {@code io.opentelemetry.exporter.http.HttpSenderProvider} is set, use the matching + *
  • {@code io.opentelemetry.sdk.common.export.HttpSenderProvider} is empty, use the first + * found. + *
  • {@code io.opentelemetry.sdk.common.export.HttpSenderProvider} is set, use the matching * provider. If none match, throw {@link IllegalStateException}. *
*/ diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/ImmutableHttpSenderConfig.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/ImmutableHttpSenderConfig.java index 85d8e341016..24e5a9bb1bc 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/ImmutableHttpSenderConfig.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/http/ImmutableHttpSenderConfig.java @@ -6,8 +6,8 @@ package io.opentelemetry.exporter.internal.http; import com.google.auto.value.AutoValue; -import io.opentelemetry.exporter.compressor.Compressor; -import io.opentelemetry.exporter.http.HttpSenderConfig; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.HttpSenderConfig; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; import java.net.URI; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Marshaler.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Marshaler.java index 21ed3695bc2..d8ea5a9e5f4 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Marshaler.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/Marshaler.java @@ -6,7 +6,7 @@ package io.opentelemetry.exporter.internal.marshal; import com.fasterxml.jackson.core.JsonGenerator; -import io.opentelemetry.exporter.marshal.MessageWriter; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.IOException; import java.io.OutputStream; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java index c09a8b60cd0..c614a8697f0 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterBuilderTest.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.compression.GzipCompressor; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.internal.StandardComponentId; import java.net.URI; import java.net.URL; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java index 396411295f0..54a7bc103cd 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java @@ -5,19 +5,19 @@ package io.opentelemetry.exporter.internal.grpc; -import static io.opentelemetry.exporter.grpc.GrpcStatusCode.UNAVAILABLE; +import static io.opentelemetry.sdk.common.export.GrpcStatusCode.UNAVAILABLE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.exporter.grpc.GrpcResponse; -import io.opentelemetry.exporter.grpc.GrpcSender; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import io.opentelemetry.sdk.internal.ComponentId; import io.opentelemetry.sdk.internal.SemConvAttributes; import io.opentelemetry.sdk.internal.StandardComponentId; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java index 1dfa4d333bf..ef768999ac4 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterBuilderTest.java @@ -9,8 +9,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.compression.GzipCompressor; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.internal.StandardComponentId; import java.net.URL; import java.net.URLClassLoader; diff --git a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java index 493b52bbb79..13cdba0fe75 100644 --- a/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java +++ b/exporters/common/src/test/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java @@ -11,11 +11,11 @@ import static org.mockito.Mockito.doAnswer; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.exporter.http.HttpResponse; -import io.opentelemetry.exporter.http.HttpSender; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.HttpResponse; +import io.opentelemetry.sdk.common.export.HttpSender; import io.opentelemetry.sdk.internal.ComponentId; import io.opentelemetry.sdk.internal.SemConvAttributes; import io.opentelemetry.sdk.internal.StandardComponentId; diff --git a/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java b/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java index 219ac2a7fbd..1a61cce145c 100644 --- a/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java +++ b/exporters/common/src/testGrpcSenderProvider/java/io/opentelemetry/exporter/internal/grpc/GrpcExporterTest.java @@ -44,7 +44,7 @@ void build_multipleSendersNoConfiguration() { logCapturer.assertContains( "Multiple GrpcSenderProvider found. Please include only one, " - + "or specify preference setting io.opentelemetry.exporter.grpc.GrpcSenderProvider " + + "or specify preference setting io.opentelemetry.sdk.common.export.GrpcSenderProvider " + "to the FQCN of the preferred provider."); } @@ -71,7 +71,7 @@ void build_configureUsingOldSpi() throws URISyntaxException { @Test @SetSystemProperty( - key = "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + key = "io.opentelemetry.sdk.common.export.GrpcSenderProvider", value = "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider") void build_multipleSendersWithUpstream() throws URISyntaxException { @@ -91,7 +91,7 @@ void build_multipleSendersWithUpstream() throws URISyntaxException { @Test @SetSystemProperty( - key = "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + key = "io.opentelemetry.sdk.common.export.GrpcSenderProvider", value = "io.opentelemetry.exporter.sender.okhttp.internal.OkHttpGrpcSenderProvider") void build_multipleSendersWithOkHttp() throws URISyntaxException { assertThat( @@ -109,7 +109,7 @@ void build_multipleSendersWithOkHttp() throws URISyntaxException { } @Test - @SetSystemProperty(key = "io.opentelemetry.exporter.grpc.GrpcSenderProvider", value = "foo") + @SetSystemProperty(key = "io.opentelemetry.sdk.common.export.GrpcSenderProvider", value = "foo") void build_multipleSendersNoMatch() { assertThatThrownBy( () -> @@ -122,7 +122,7 @@ void build_multipleSendersNoMatch() { .build()) .isInstanceOf(IllegalStateException.class) .hasMessage( - "No GrpcSenderProvider matched configured io.opentelemetry.exporter.grpc.GrpcSenderProvider: foo"); + "No GrpcSenderProvider matched configured io.opentelemetry.sdk.common.export.GrpcSenderProvider: foo"); assertThat(logCapturer.getEvents()).isEmpty(); } diff --git a/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java b/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java index 1ec772b0079..50a103e7d88 100644 --- a/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java +++ b/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java @@ -37,7 +37,7 @@ void build_multipleSendersNoConfiguration() { logCapturer.assertContains( "Multiple HttpSenderProvider found. Please include only one, " - + "or specify preference setting io.opentelemetry.exporter.http.HttpSenderProvider " + + "or specify preference setting io.opentelemetry.sdk.common.export.HttpSenderProvider " + "to the FQCN of the preferred provider."); } @@ -58,7 +58,7 @@ void build_configureUsingOldSpi() { @Test @SetSystemProperty( - key = "io.opentelemetry.exporter.http.HttpSenderProvider", + key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", value = "io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderProvider") void build_multipleSendersWithJdk() { assertThat( @@ -73,7 +73,7 @@ void build_multipleSendersWithJdk() { @Test @SetSystemProperty( - key = "io.opentelemetry.exporter.http.HttpSenderProvider", + key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", value = "io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSenderProvider") void build_multipleSendersWithOkHttp() { assertThat( @@ -87,7 +87,7 @@ void build_multipleSendersWithOkHttp() { } @Test - @SetSystemProperty(key = "io.opentelemetry.exporter.http.HttpSenderProvider", value = "foo") + @SetSystemProperty(key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", value = "foo") void build_multipleSendersNoMatch() { assertThatThrownBy( () -> @@ -97,7 +97,7 @@ void build_multipleSendersNoMatch() { .build()) .isInstanceOf(IllegalStateException.class) .hasMessage( - "No HttpSenderProvider matched configured io.opentelemetry.exporter.http.HttpSenderProvider: foo"); + "No HttpSenderProvider matched configured io.opentelemetry.sdk.common.export.HttpSenderProvider: foo"); assertThat(logCapturer.getEvents()).isEmpty(); } diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index 856157fa133..78616d46933 100644 --- a/exporters/otlp/all/build.gradle.kts +++ b/exporters/otlp/all/build.gradle.kts @@ -94,7 +94,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + "io.opentelemetry.sdk.common.export.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -114,7 +114,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + "io.opentelemetry.sdk.common.export.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -134,7 +134,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + "io.opentelemetry.sdk.common.export.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -152,7 +152,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.http.HttpSenderProvider", + "io.opentelemetry.sdk.common.export.HttpSenderProvider", "io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderProvider" ) enabled = !testJavaVersion.equals("8") diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java index f52be85f4eb..5965c1503b0 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogRecordExporterBuilder.java @@ -11,10 +11,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java index f0a46f92c49..c92652fb308 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterBuilder.java @@ -11,10 +11,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java index 48f817f6041..c74b9c82f7c 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/http/trace/OtlpHttpSpanExporterBuilder.java @@ -11,10 +11,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java index 45a00f21216..2bf271f5a1d 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogRecordExporterBuilder.java @@ -12,10 +12,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.StandardComponentId; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java index cb75adab4a6..22262c2bd92 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterBuilder.java @@ -12,10 +12,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.StandardComponentId; diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java index 36403212102..07c4e2cf2d9 100644 --- a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java +++ b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/trace/OtlpGrpcSpanExporterBuilder.java @@ -12,10 +12,10 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.MemoryMode; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.StandardComponentId; diff --git a/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java b/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java index 4af82618a33..f9de52d9de7 100644 --- a/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java +++ b/exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfilesExporterBuilder.java @@ -11,9 +11,9 @@ import io.grpc.ManagedChannel; import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; +import io.opentelemetry.sdk.common.export.Compressor; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.StandardComponentId; import java.net.URI; diff --git a/exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfileExporterTest.java b/exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfileExporterTest.java index 02049157d39..2ac958b47ab 100644 --- a/exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfileExporterTest.java +++ b/exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/OtlpGrpcProfileExporterTest.java @@ -7,7 +7,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.grpc.GrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.otlp.testing.internal.AbstractGrpcTelemetryExporterTest; @@ -16,6 +15,7 @@ import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpGrpcSender; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.proto.profiles.v1development.ResourceProfiles; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import java.io.Closeable; import java.util.Collections; import java.util.List; diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java index 4d7a48207cd..d255361832e 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java @@ -31,8 +31,6 @@ import io.grpc.DecompressorRegistry; import io.grpc.ManagedChannel; import io.grpc.stub.StreamObserver; -import io.opentelemetry.exporter.grpc.GrpcResponse; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.FailedExportException; import io.opentelemetry.exporter.internal.TlsUtil; import io.opentelemetry.exporter.internal.grpc.GrpcExporter; @@ -52,6 +50,8 @@ import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; +import io.opentelemetry.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.SemConvAttributes; import io.opentelemetry.sdk.metrics.SdkMeterProvider; @@ -929,7 +929,7 @@ void customServiceClassLoader() { assertThat(classLoaderSpy.getResourcesNames) .isEqualTo( Collections.singletonList( - "META-INF/services/io.opentelemetry.exporter.grpc.GrpcSenderProvider")); + "META-INF/services/io.opentelemetry.sdk.common.export.GrpcSenderProvider")); } } diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java index 2e23599ee69..fe82cd58c86 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java @@ -572,7 +572,8 @@ void error() { .satisfies( response -> { assertThat(response) - .extracting(io.opentelemetry.exporter.http.HttpResponse::getStatusCode) + .extracting( + io.opentelemetry.sdk.common.export.HttpResponse::getStatusCode) .isEqualTo(statusCode); assertThatCode(response::getResponseBody).doesNotThrowAnyException(); @@ -877,7 +878,7 @@ void customServiceClassLoader() { assertThat(classLoaderSpy.getResourcesNames) .isEqualTo( Collections.singletonList( - "META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider")); + "META-INF/services/io.opentelemetry.sdk.common.export.HttpSenderProvider")); } } diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/compressor/Base64Compressor.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/compressor/Base64Compressor.java index 444ead59f43..c4807c1aa08 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/compressor/Base64Compressor.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/compressor/Base64Compressor.java @@ -5,7 +5,7 @@ package io.opentelemetry.exporter.otlp.testing.internal.compressor; -import io.opentelemetry.exporter.compressor.Compressor; +import io.opentelemetry.sdk.common.export.Compressor; import java.io.OutputStream; import java.util.Base64; diff --git a/exporters/otlp/testing-internal/src/main/resources/META-INF/services/io.opentelemetry.exporter.compressor.Compressor b/exporters/otlp/testing-internal/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.Compressor similarity index 100% rename from exporters/otlp/testing-internal/src/main/resources/META-INF/services/io.opentelemetry.exporter.compressor.Compressor rename to exporters/otlp/testing-internal/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.Compressor diff --git a/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSender.java b/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSender.java index 4c1a5731aed..a6f2270a541 100644 --- a/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSender.java +++ b/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSender.java @@ -21,13 +21,13 @@ import io.grpc.StatusRuntimeException; import io.grpc.stub.ClientCalls; import io.grpc.stub.MetadataUtils; -import io.opentelemetry.exporter.grpc.GrpcResponse; -import io.opentelemetry.exporter.grpc.GrpcSender; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.grpc.ImmutableGrpcResponse; import io.opentelemetry.exporter.internal.grpc.MarshalerInputStream; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -86,7 +86,7 @@ public byte[] parse(InputStream stream) { public UpstreamGrpcSender( ManagedChannel channel, String fullMethodName, - @Nullable io.opentelemetry.exporter.compressor.Compressor compressor, + @Nullable io.opentelemetry.sdk.common.export.Compressor compressor, boolean shutdownChannel, Duration timeout, Supplier>> headersSupplier, diff --git a/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSenderProvider.java b/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSenderProvider.java index e014653b286..5f5af48ca5a 100644 --- a/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSenderProvider.java +++ b/exporters/sender/grpc-managed-channel/src/main/java/io/opentelemetry/exporter/sender/grpc/managedchannel/internal/UpstreamGrpcSenderProvider.java @@ -7,10 +7,10 @@ import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; -import io.opentelemetry.exporter.grpc.GrpcSender; -import io.opentelemetry.exporter.grpc.GrpcSenderConfig; -import io.opentelemetry.exporter.grpc.GrpcSenderProvider; import io.opentelemetry.exporter.internal.grpc.ExtendedGrpcSenderConfig; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcSenderConfig; +import io.opentelemetry.sdk.common.export.GrpcSenderProvider; import java.net.URI; /** diff --git a/exporters/sender/grpc-managed-channel/src/main/resources/META-INF/services/io.opentelemetry.exporter.grpc.GrpcSenderProvider b/exporters/sender/grpc-managed-channel/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.GrpcSenderProvider similarity index 100% rename from exporters/sender/grpc-managed-channel/src/main/resources/META-INF/services/io.opentelemetry.exporter.grpc.GrpcSenderProvider rename to exporters/sender/grpc-managed-channel/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.GrpcSenderProvider diff --git a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java index ad477f4bd21..c87fb8147ed 100644 --- a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java +++ b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSender.java @@ -7,10 +7,10 @@ import static java.util.stream.Collectors.joining; -import io.opentelemetry.exporter.compressor.Compressor; -import io.opentelemetry.exporter.http.HttpSender; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; import io.opentelemetry.sdk.internal.DaemonThreadFactory; @@ -152,7 +152,7 @@ private static HttpClient configureClient( @Override public void send( MessageWriter messageWriter, - Consumer onResponse, + Consumer onResponse, Consumer onError) { CompletableFuture> unused = CompletableFuture.supplyAsync( @@ -319,9 +319,9 @@ private byte[] buf() { } } - private static io.opentelemetry.exporter.http.HttpResponse toHttpResponse( + private static io.opentelemetry.sdk.common.export.HttpResponse toHttpResponse( HttpResponse response) { - return new io.opentelemetry.exporter.http.HttpResponse() { + return new io.opentelemetry.sdk.common.export.HttpResponse() { @Override public int getStatusCode() { return response.statusCode(); diff --git a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderProvider.java b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderProvider.java index 4da0eabd1d9..0ece6a9978d 100644 --- a/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderProvider.java +++ b/exporters/sender/jdk/src/main/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderProvider.java @@ -5,9 +5,9 @@ package io.opentelemetry.exporter.sender.jdk.internal; -import io.opentelemetry.exporter.http.HttpSender; -import io.opentelemetry.exporter.http.HttpSenderConfig; -import io.opentelemetry.exporter.http.HttpSenderProvider; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.HttpSenderConfig; +import io.opentelemetry.sdk.common.export.HttpSenderProvider; /** * {@link HttpSender} SPI implementation for {@link JdkHttpSender}. diff --git a/exporters/sender/jdk/src/main/resources/META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider b/exporters/sender/jdk/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.HttpSenderProvider similarity index 100% rename from exporters/sender/jdk/src/main/resources/META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider rename to exporters/sender/jdk/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.HttpSenderProvider diff --git a/exporters/sender/jdk/src/test/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderTest.java b/exporters/sender/jdk/src/test/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderTest.java index 5851c3ee179..c5bddc79fb1 100644 --- a/exporters/sender/jdk/src/test/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderTest.java +++ b/exporters/sender/jdk/src/test/java/io/opentelemetry/exporter/sender/jdk/internal/JdkHttpSenderTest.java @@ -14,8 +14,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.common.export.RetryPolicy; import java.io.IOException; import java.io.OutputStream; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/GrpcRequestBody.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/GrpcRequestBody.java index b9b0e8923c9..1dc673cf3af 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/GrpcRequestBody.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/GrpcRequestBody.java @@ -5,9 +5,9 @@ package io.opentelemetry.exporter.sender.okhttp.internal; -import io.opentelemetry.exporter.compressor.Compressor; import io.opentelemetry.exporter.internal.marshal.Marshaler; -import io.opentelemetry.exporter.marshal.MessageWriter; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.IOException; import javax.annotation.Nullable; import okhttp3.MediaType; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java index 38d903b7b04..cbd76aaacae 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java @@ -24,13 +24,13 @@ package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.api.internal.InstrumentationUtil; -import io.opentelemetry.exporter.compressor.Compressor; -import io.opentelemetry.exporter.grpc.GrpcResponse; -import io.opentelemetry.exporter.grpc.GrpcSender; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.GrpcResponse; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; +import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.common.export.RetryPolicy; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderProvider.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderProvider.java index f2370c63615..09bb6eefe4f 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderProvider.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderProvider.java @@ -5,9 +5,9 @@ package io.opentelemetry.exporter.sender.okhttp.internal; -import io.opentelemetry.exporter.grpc.GrpcSender; -import io.opentelemetry.exporter.grpc.GrpcSenderConfig; -import io.opentelemetry.exporter.grpc.GrpcSenderProvider; +import io.opentelemetry.sdk.common.export.GrpcSender; +import io.opentelemetry.sdk.common.export.GrpcSenderConfig; +import io.opentelemetry.sdk.common.export.GrpcSenderProvider; /** * {@link GrpcSender} SPI implementation for {@link OkHttpGrpcSender}. diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java index 5da3f83a760..7e7c8b96379 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java @@ -6,12 +6,12 @@ package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.api.internal.InstrumentationUtil; -import io.opentelemetry.exporter.compressor.Compressor; -import io.opentelemetry.exporter.http.HttpResponse; -import io.opentelemetry.exporter.http.HttpSender; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.Compressor; +import io.opentelemetry.sdk.common.export.HttpResponse; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.MessageWriter; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; import java.io.IOException; diff --git a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java index c2a166239b1..0fabe6e3bdb 100644 --- a/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java @@ -5,9 +5,9 @@ package io.opentelemetry.exporter.sender.okhttp.internal; -import io.opentelemetry.exporter.http.HttpSender; -import io.opentelemetry.exporter.http.HttpSenderConfig; -import io.opentelemetry.exporter.http.HttpSenderProvider; +import io.opentelemetry.sdk.common.export.HttpSender; +import io.opentelemetry.sdk.common.export.HttpSenderConfig; +import io.opentelemetry.sdk.common.export.HttpSenderProvider; /** * {@link HttpSender} SPI implementation for {@link OkHttpHttpSender}. diff --git a/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.grpc.GrpcSenderProvider b/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.GrpcSenderProvider similarity index 100% rename from exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.grpc.GrpcSenderProvider rename to exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.GrpcSenderProvider diff --git a/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider b/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.HttpSenderProvider similarity index 100% rename from exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider rename to exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.sdk.common.export.HttpSenderProvider diff --git a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java index 1df99638f1e..691d554b9d6 100644 --- a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderTest.java @@ -8,10 +8,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.IOException; import java.io.OutputStream; import java.net.ServerSocket; diff --git a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSuppressionTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSuppressionTest.java index 78e323c1c73..705f96b601d 100644 --- a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSuppressionTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSuppressionTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.exporter.sender.okhttp.internal; -import io.opentelemetry.exporter.marshal.MessageWriter; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.OutputStream; import java.time.Duration; import java.util.Collections; diff --git a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSuppressionTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSuppressionTest.java index f25a5a44d64..95699b5aa51 100644 --- a/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSuppressionTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSuppressionTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.exporter.sender.okhttp.internal; -import io.opentelemetry.exporter.marshal.MessageWriter; +import io.opentelemetry.sdk.common.export.MessageWriter; import java.io.IOException; import java.io.OutputStream; import java.net.URI; diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/OkHttpGrpcService.java b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/OkHttpGrpcService.java index db98920c8d6..263c33375f8 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/OkHttpGrpcService.java +++ b/sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/OkHttpGrpcService.java @@ -5,9 +5,9 @@ package io.opentelemetry.sdk.extension.trace.jaeger.sampler; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; import io.opentelemetry.exporter.sender.okhttp.internal.GrpcRequestBody; import io.opentelemetry.sdk.common.CompletableResultCode; +import io.opentelemetry.sdk.common.export.GrpcStatusCode; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/Compressor.java similarity index 94% rename from exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/Compressor.java index 0141dbfdcfa..b7e2faae2a7 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/Compressor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.compressor; +package io.opentelemetry.sdk.common.export; import java.io.IOException; import java.io.OutputStream; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcResponse.java similarity index 86% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcResponse.java index 1fe48b67875..fcf776e6376 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcResponse.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.grpc; +package io.opentelemetry.sdk.common.export; -import io.opentelemetry.exporter.marshal.MessageWriter; import java.util.function.Consumer; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSender.java similarity index 93% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSender.java index 335ea02ae99..3b7c4b98030 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSender.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.grpc; +package io.opentelemetry.sdk.common.export; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; import java.util.function.Consumer; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderConfig.java similarity index 92% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderConfig.java index ea30d2e1be9..7a73bfc0948 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderConfig.java @@ -3,11 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.grpc; +package io.opentelemetry.sdk.common.export; -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; import java.time.Duration; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderProvider.java similarity index 89% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderProvider.java index 697f78773d7..29ed81ab00a 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcSenderProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.grpc; +package io.opentelemetry.sdk.common.export; /** * A service provider interface (SPI) for providing {@link GrpcSender}s backed by different client diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcStatusCode.java similarity index 96% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcStatusCode.java index ea300396de0..918224f0e02 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/GrpcStatusCode.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.grpc; +package io.opentelemetry.sdk.common.export; /** * gRPC status codes. See official grpc.io diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpResponse.java similarity index 84% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpResponse.java index a256cc59ccb..36d6145d121 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpResponse.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http; +package io.opentelemetry.sdk.common.export; -import io.opentelemetry.exporter.marshal.MessageWriter; import java.util.function.Consumer; import javax.annotation.concurrent.Immutable; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSender.java similarity index 89% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSender.java index 37900b9ad68..7f56cb235cc 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSender.java @@ -3,9 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http; +package io.opentelemetry.sdk.common.export; -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 { diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderConfig.java similarity index 90% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderConfig.java index 75b8649a173..28110db1c49 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderConfig.java @@ -3,12 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http; +package io.opentelemetry.sdk.common.export; -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; import java.net.URI; import java.time.Duration; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderProvider.java similarity index 89% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderProvider.java index 05006e46e84..c8c2e1ab28b 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/HttpSenderProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http; +package io.opentelemetry.sdk.common.export; /** * A service provider interface (SPI) for providing {@link HttpSender}s backed by different HTTP diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/MessageWriter.java similarity index 91% rename from exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java rename to sdk/common/src/main/java/io/opentelemetry/sdk/common/export/MessageWriter.java index 9f08568a2a7..fe32a8b9714 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java +++ b/sdk/common/src/main/java/io/opentelemetry/sdk/common/export/MessageWriter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.marshal; +package io.opentelemetry.sdk.common.export; import java.io.IOException; import java.io.OutputStream;