diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt index 8a9b0d5c223..6ae389d3911 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-common.txt +++ b/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, java.util.function.Consumer) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.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) ++++ 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, java.util.function.Consumer) + +++ NEW METHOD: PUBLIC(+) ABSTRACT(+) void send(io.opentelemetry.exporter.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) ++++ 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() diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java b/exporters/common/src/main/java/io/opentelemetry/exporter/Compressor.java similarity index 94% rename from exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/Compressor.java index 0141dbfdcfa..e22bcc61f25 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/compressor/Compressor.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java b/exporters/common/src/main/java/io/opentelemetry/exporter/GrpcResponse.java similarity index 86% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/GrpcResponse.java index 1fe48b67875..900ee09934d 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcResponse.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java b/exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSender.java similarity index 93% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSender.java index 335ea02ae99..24b4b9f1653 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSender.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java b/exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderConfig.java similarity index 94% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderConfig.java index ea30d2e1be9..81c45429721 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderConfig.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java b/exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderProvider.java similarity index 90% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/GrpcSenderProvider.java index 697f78773d7..f18b239f3e0 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcSenderProvider.java +++ b/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 diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java b/exporters/common/src/main/java/io/opentelemetry/exporter/GrpcStatusCode.java similarity index 96% rename from exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/GrpcStatusCode.java index ea300396de0..b7ef6fe1f90 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/grpc/GrpcStatusCode.java +++ b/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 official grpc.io diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java b/exporters/common/src/main/java/io/opentelemetry/exporter/HttpResponse.java similarity index 84% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/HttpResponse.java index a256cc59ccb..1e99415db6a 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpResponse.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java b/exporters/common/src/main/java/io/opentelemetry/exporter/HttpSender.java similarity index 89% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/HttpSender.java index 37900b9ad68..3b2948ab16e 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSender.java +++ b/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 { diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java b/exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderConfig.java similarity index 94% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderConfig.java index 75b8649a173..8476730c6fc 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderConfig.java +++ b/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; diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java b/exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderProvider.java similarity index 90% rename from exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/HttpSenderProvider.java index 05006e46e84..cb61abfa51f 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/http/HttpSenderProvider.java +++ b/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 diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java b/exporters/common/src/main/java/io/opentelemetry/exporter/MessageWriter.java similarity index 91% rename from exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java rename to exporters/common/src/main/java/io/opentelemetry/exporter/MessageWriter.java index 9f08568a2a7..1b8920ce043 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/marshal/MessageWriter.java +++ b/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; 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..ed635e63568 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.exporter.GrpcResponse; +import io.opentelemetry.exporter.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..60e005ad758 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.exporter.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..fad1b29a26a 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.exporter.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..4390828b4a8 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.exporter.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..039bcd12c61 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.exporter.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..2379ceddbdf 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,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; 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..e48792a68e5 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,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() { *

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 - * provider. If none match, throw {@link IllegalStateException}. + *
  • {@code io.opentelemetry.exporter.GrpcSenderProvider} is empty, use the first found. + *
  • {@code io.opentelemetry.exporter.GrpcSenderProvider} is set, use the matching provider. + * If none match, throw {@link IllegalStateException}. *
*/ private GrpcSenderProvider resolveGrpcSenderProvider() { 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..839a18cc07c 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.exporter.GrpcResponse; +import io.opentelemetry.exporter.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..be097f21ce5 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.exporter.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..2a90d3d661c 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.exporter.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..f0cda5b9e53 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,13 +6,13 @@ 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.HttpResponse; +import io.opentelemetry.exporter.HttpSender; +import io.opentelemetry.exporter.MessageWriter; 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.internal.StandardComponentId; 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..d3a26a1414e 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,9 +9,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.http.HttpSender; -import io.opentelemetry.exporter.http.HttpSenderProvider; +import io.opentelemetry.exporter.Compressor; +import io.opentelemetry.exporter.HttpSender; +import io.opentelemetry.exporter.HttpSenderProvider; import io.opentelemetry.exporter.internal.ExporterBuilderUtil; import io.opentelemetry.exporter.internal.TlsConfigHelper; import io.opentelemetry.exporter.internal.compression.CompressorUtil; @@ -51,7 +51,7 @@ 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.exporter.HttpSenderProvider"; private StandardComponentId.ExporterType exporterType; @@ -309,9 +309,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 - * provider. If none match, throw {@link IllegalStateException}. + *
  • {@code io.opentelemetry.exporter.HttpSenderProvider} is empty, use the first found. + *
  • {@code io.opentelemetry.exporter.HttpSenderProvider} is set, use the matching provider. + * If none match, throw {@link IllegalStateException}. *
*/ private HttpSenderProvider resolveHttpSenderProvider() { 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..351d5be8cd7 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.exporter.Compressor; +import io.opentelemetry.exporter.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..3f4555ccaf7 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.exporter.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..283617a81fc 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,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; +import io.opentelemetry.exporter.Compressor; import io.opentelemetry.exporter.internal.compression.GzipCompressor; import io.opentelemetry.sdk.internal.StandardComponentId; import java.net.URI; 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..b41fc04758b 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,16 +5,16 @@ package io.opentelemetry.exporter.internal.grpc; -import static io.opentelemetry.exporter.grpc.GrpcStatusCode.UNAVAILABLE; +import static io.opentelemetry.exporter.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.GrpcResponse; +import io.opentelemetry.exporter.GrpcSender; +import io.opentelemetry.exporter.GrpcStatusCode; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..7efc50b8f6c 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,7 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.common.ComponentLoader; -import io.opentelemetry.exporter.compressor.Compressor; +import io.opentelemetry.exporter.Compressor; import io.opentelemetry.exporter.internal.compression.GzipCompressor; import io.opentelemetry.sdk.internal.StandardComponentId; import java.net.URL; 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..408af4745ed 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,8 +11,8 @@ 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.HttpResponse; +import io.opentelemetry.exporter.HttpSender; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..54a9c699750 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.exporter.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.exporter.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.exporter.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.exporter.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.exporter.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..fc215450d24 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.exporter.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.exporter.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.exporter.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.exporter.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.exporter.HttpSenderProvider: foo"); assertThat(logCapturer.getEvents()).isEmpty(); } diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index 856157fa133..effeecda357 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.exporter.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -114,7 +114,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + "io.opentelemetry.exporter.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -134,7 +134,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.grpc.GrpcSenderProvider", + "io.opentelemetry.exporter.GrpcSenderProvider", "io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider" ) } @@ -152,7 +152,7 @@ testing { all { testTask { systemProperty( - "io.opentelemetry.exporter.http.HttpSenderProvider", + "io.opentelemetry.exporter.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..a384afd733d 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,7 +11,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..5d83f766543 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,7 +11,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..4db3958297a 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,7 +11,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.http.HttpExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..a687ca66f01 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,7 +12,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..922d1078269 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,7 +12,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..aa2f8f36997 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,7 +12,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.InternalTelemetryVersion; 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..ac96182b7d2 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,7 +11,7 @@ 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.Compressor; import io.opentelemetry.exporter.internal.grpc.GrpcExporterBuilder; import io.opentelemetry.exporter.otlp.internal.OtlpUserAgent; import io.opentelemetry.sdk.common.export.RetryPolicy; 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..e42f0006809 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,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; +import io.opentelemetry.exporter.GrpcStatusCode; import io.opentelemetry.exporter.internal.grpc.GrpcExporter; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.otlp.testing.internal.AbstractGrpcTelemetryExporterTest; 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..5e68d8e4128 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,8 @@ 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.GrpcResponse; +import io.opentelemetry.exporter.GrpcStatusCode; import io.opentelemetry.exporter.internal.FailedExportException; import io.opentelemetry.exporter.internal.TlsUtil; import io.opentelemetry.exporter.internal.grpc.GrpcExporter; @@ -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.exporter.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..4793f6e64c4 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,7 @@ void error() { .satisfies( response -> { assertThat(response) - .extracting(io.opentelemetry.exporter.http.HttpResponse::getStatusCode) + .extracting(io.opentelemetry.exporter.HttpResponse::getStatusCode) .isEqualTo(statusCode); assertThatCode(response::getResponseBody).doesNotThrowAnyException(); @@ -877,7 +877,7 @@ void customServiceClassLoader() { assertThat(classLoaderSpy.getResourcesNames) .isEqualTo( Collections.singletonList( - "META-INF/services/io.opentelemetry.exporter.http.HttpSenderProvider")); + "META-INF/services/io.opentelemetry.exporter.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..9b019478d02 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.exporter.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.exporter.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.exporter.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..0eec4fe2747 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,12 +21,12 @@ 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.GrpcResponse; +import io.opentelemetry.exporter.GrpcSender; +import io.opentelemetry.exporter.GrpcStatusCode; +import io.opentelemetry.exporter.MessageWriter; 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 java.io.IOException; import java.io.InputStream; @@ -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.exporter.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..0127ed99bd3 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,9 +7,9 @@ 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.GrpcSender; +import io.opentelemetry.exporter.GrpcSenderConfig; +import io.opentelemetry.exporter.GrpcSenderProvider; import io.opentelemetry.exporter.internal.grpc.ExtendedGrpcSenderConfig; 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.exporter.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.exporter.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..6e0d7b7da5d 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,9 +7,9 @@ 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.exporter.Compressor; +import io.opentelemetry.exporter.HttpSender; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; @@ -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.exporter.HttpResponse toHttpResponse( HttpResponse response) { - return new io.opentelemetry.exporter.http.HttpResponse() { + return new io.opentelemetry.exporter.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..e9499e0396b 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.exporter.HttpSender; +import io.opentelemetry.exporter.HttpSenderConfig; +import io.opentelemetry.exporter.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.exporter.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.exporter.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..f0743389bcb 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,7 +14,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.opentelemetry.exporter.marshal.MessageWriter; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; 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/GrpcRequestBody.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/GrpcRequestBody.java index b9b0e8923c9..92c8c77a036 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.Compressor; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.exporter.internal.marshal.Marshaler; -import io.opentelemetry.exporter.marshal.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..02f25e0d7b6 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,12 +24,12 @@ 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.Compressor; +import io.opentelemetry.exporter.GrpcResponse; +import io.opentelemetry.exporter.GrpcSender; +import io.opentelemetry.exporter.GrpcStatusCode; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; 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/OkHttpGrpcSenderProvider.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSenderProvider.java index f2370c63615..fb13334de8a 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.exporter.GrpcSender; +import io.opentelemetry.exporter.GrpcSenderConfig; +import io.opentelemetry.exporter.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..cfb22a0fa82 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,11 +6,11 @@ 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.Compressor; +import io.opentelemetry.exporter.HttpResponse; +import io.opentelemetry.exporter.HttpSender; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.ProxyOptions; import io.opentelemetry.sdk.common.export.RetryPolicy; 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..8b8dbda4d73 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.exporter.HttpSender; +import io.opentelemetry.exporter.HttpSenderConfig; +import io.opentelemetry.exporter.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.exporter.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.exporter.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.exporter.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.exporter.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..f7a2a1da043 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,9 +8,9 @@ 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.GrpcStatusCode; +import io.opentelemetry.exporter.MessageWriter; import io.opentelemetry.exporter.internal.RetryUtil; -import io.opentelemetry.exporter.marshal.MessageWriter; import io.opentelemetry.sdk.common.CompletableResultCode; import java.io.IOException; import java.io.OutputStream; 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..24d99889196 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.exporter.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..a911c5c8762 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.exporter.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..3d4fdc8b712 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,7 +5,7 @@ package io.opentelemetry.sdk.extension.trace.jaeger.sampler; -import io.opentelemetry.exporter.grpc.GrpcStatusCode; +import io.opentelemetry.exporter.GrpcStatusCode; import io.opentelemetry.exporter.sender.okhttp.internal.GrpcRequestBody; import io.opentelemetry.sdk.common.CompletableResultCode; import java.io.ByteArrayInputStream;