From 06d26562f7e1f659edd1775a6642e6feffb75fd0 Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:58:10 -0500 Subject: [PATCH] Rename artifact to opentelemetry-exporter-sender-okhttp (#5582) --- ...er-okhttp.txt => opentelemetry-exporter-sender-okhttp.txt} | 0 .../exporter/internal/http/HttpExporterBuilder.java | 2 +- .../exporter/internal/http/HttpExporterTest.java | 2 +- ...io.opentelemetry.exporter.internal.http.HttpSenderProvider | 1 - exporters/otlp/all/build.gradle.kts | 2 +- exporters/{http-sender => sender}/build.gradle.kts | 2 +- exporters/{http-sender => sender}/okhttp/build.gradle.kts | 4 ++-- .../exporter/sender}/okhttp/internal/OkHttpHttpSender.java | 2 +- .../sender}/okhttp/internal/OkHttpHttpSenderProvider.java | 2 +- .../exporter/sender}/okhttp/internal/package-info.java | 2 +- ...io.opentelemetry.exporter.internal.http.HttpSenderProvider | 1 + .../sender}/okhttp/internal/AuthenticatingExporterTest.java | 2 +- .../sender}/okhttp/internal/HttpExporterBuilderTest.java | 2 +- settings.gradle.kts | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename docs/apidiffs/current_vs_latest/{opentelemetry-exporter-http-sender-okhttp.txt => opentelemetry-exporter-sender-okhttp.txt} (100%) delete mode 100644 exporters/http-sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider rename exporters/{http-sender => sender}/build.gradle.kts (74%) rename exporters/{http-sender => sender}/okhttp/build.gradle.kts (73%) rename exporters/{http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http => sender/okhttp/src/main/java/io/opentelemetry/exporter/sender}/okhttp/internal/OkHttpHttpSender.java (99%) rename exporters/{http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http => sender/okhttp/src/main/java/io/opentelemetry/exporter/sender}/okhttp/internal/OkHttpHttpSenderProvider.java (96%) rename exporters/{http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http => sender/okhttp/src/main/java/io/opentelemetry/exporter/sender}/okhttp/internal/package-info.java (78%) create mode 100644 exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider rename exporters/{http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http => sender/okhttp/src/test/java/io/opentelemetry/exporter/sender}/okhttp/internal/AuthenticatingExporterTest.java (98%) rename exporters/{http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http => sender/okhttp/src/test/java/io/opentelemetry/exporter/sender}/okhttp/internal/HttpExporterBuilderTest.java (97%) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-exporter-http-sender-okhttp.txt b/docs/apidiffs/current_vs_latest/opentelemetry-exporter-sender-okhttp.txt similarity index 100% rename from docs/apidiffs/current_vs_latest/opentelemetry-exporter-http-sender-okhttp.txt rename to docs/apidiffs/current_vs_latest/opentelemetry-exporter-sender-okhttp.txt 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 788831ab93..64d711e1b2 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 @@ -149,7 +149,7 @@ public final class HttpExporterBuilder { } if (httpSender == null) { throw new IllegalStateException( - "No HttpSenderProvider found on classpath. Please add dependency on opentelemetry-exporter-http-sender-okhttp"); + "No HttpSenderProvider found on classpath. Please add dependency on opentelemetry-exporter-sender-okhttp"); } return new HttpExporter<>(exporterName, type, httpSender, meterProviderSupplier, exportAsJson); 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 d99e58dfcf..38ef141bed 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 @@ -16,6 +16,6 @@ class HttpExporterTest { assertThatThrownBy(() -> new HttpExporterBuilder<>("name", "type", "http://localhost").build()) .isInstanceOf(IllegalStateException.class) .hasMessage( - "No HttpSenderProvider found on classpath. Please add dependency on opentelemetry-exporter-http-sender-okhttp"); + "No HttpSenderProvider found on classpath. Please add dependency on opentelemetry-exporter-sender-okhttp"); } } diff --git a/exporters/http-sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider b/exporters/http-sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider deleted file mode 100644 index 8f8054934e..0000000000 --- a/exporters/http-sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider +++ /dev/null @@ -1 +0,0 @@ -io.opentelemetry.exporter.http.okhttp.internal.OkHttpHttpSenderProvider diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index f8004a7c99..e5fa6a46ac 100644 --- a/exporters/otlp/all/build.gradle.kts +++ b/exporters/otlp/all/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { api(project(":sdk:logs")) implementation(project(":exporters:otlp:common")) - implementation(project(":exporters:http-sender:okhttp")) + implementation(project(":exporters:sender:okhttp")) implementation(project(":sdk-extensions:autoconfigure-spi")) implementation("com.squareup.okhttp3:okhttp") diff --git a/exporters/http-sender/build.gradle.kts b/exporters/sender/build.gradle.kts similarity index 74% rename from exporters/http-sender/build.gradle.kts rename to exporters/sender/build.gradle.kts index 463f46b15c..a212101567 100644 --- a/exporters/http-sender/build.gradle.kts +++ b/exporters/sender/build.gradle.kts @@ -4,7 +4,7 @@ subprojects { val proj = this plugins.withId("java") { configure { - archivesName.set("opentelemetry-exporter-http-sender-${proj.name}") + archivesName.set("opentelemetry-exporter-sender-${proj.name}") } } } diff --git a/exporters/http-sender/okhttp/build.gradle.kts b/exporters/sender/okhttp/build.gradle.kts similarity index 73% rename from exporters/http-sender/okhttp/build.gradle.kts rename to exporters/sender/okhttp/build.gradle.kts index d34a4e11d4..c8908b9e3b 100644 --- a/exporters/http-sender/okhttp/build.gradle.kts +++ b/exporters/sender/okhttp/build.gradle.kts @@ -5,8 +5,8 @@ plugins { id("otel.animalsniffer-conventions") } -description = "OpenTelemetry OkHttp HttpSender" -otelJava.moduleName.set("io.opentelemetry.exporter.http.okhttp.internal") +description = "OpenTelemetry OkHttp Senders" +otelJava.moduleName.set("io.opentelemetry.exporter.sender.okhttp.internal") dependencies { implementation(project(":exporters:common")) diff --git a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSender.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java similarity index 99% rename from exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSender.java rename to exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java index c966640306..38a681021e 100644 --- a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSender.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http.okhttp.internal; +package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.exporter.internal.auth.Authenticator; import io.opentelemetry.exporter.internal.http.HttpSender; diff --git a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSenderProvider.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java similarity index 96% rename from exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSenderProvider.java rename to exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java index 64398368e7..95df8d9967 100644 --- a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/OkHttpHttpSenderProvider.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSenderProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http.okhttp.internal; +package io.opentelemetry.exporter.sender.okhttp.internal; import io.opentelemetry.exporter.internal.auth.Authenticator; import io.opentelemetry.exporter.internal.http.HttpSender; diff --git a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/package-info.java b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/package-info.java similarity index 78% rename from exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/package-info.java rename to exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/package-info.java index 42c2d178ac..520a8f152f 100644 --- a/exporters/http-sender/okhttp/src/main/java/io/opentelemetry/exporter/http/okhttp/internal/package-info.java +++ b/exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/package-info.java @@ -5,6 +5,6 @@ /** Utilities for HTTP exporters. */ @ParametersAreNonnullByDefault -package io.opentelemetry.exporter.http.okhttp.internal; +package io.opentelemetry.exporter.sender.okhttp.internal; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider b/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider new file mode 100644 index 0000000000..5f14cc891c --- /dev/null +++ b/exporters/sender/okhttp/src/main/resources/META-INF/services/io.opentelemetry.exporter.internal.http.HttpSenderProvider @@ -0,0 +1 @@ +io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSenderProvider diff --git a/exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/AuthenticatingExporterTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/AuthenticatingExporterTest.java similarity index 98% rename from exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/AuthenticatingExporterTest.java rename to exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/AuthenticatingExporterTest.java index 0e605e476e..e553bf1252 100644 --- a/exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/AuthenticatingExporterTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/AuthenticatingExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http.okhttp.internal; +package io.opentelemetry.exporter.sender.okhttp.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/HttpExporterBuilderTest.java b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/HttpExporterBuilderTest.java similarity index 97% rename from exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/HttpExporterBuilderTest.java rename to exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/HttpExporterBuilderTest.java index 0e8bc6884c..b7b80453be 100644 --- a/exporters/http-sender/okhttp/src/test/java/io/opentelemetry/exporter/http/okhttp/internal/HttpExporterBuilderTest.java +++ b/exporters/sender/okhttp/src/test/java/io/opentelemetry/exporter/sender/okhttp/internal/HttpExporterBuilderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporter.http.okhttp.internal; +package io.opentelemetry.exporter.sender.okhttp.internal; import static org.assertj.core.api.Assertions.assertThat; diff --git a/settings.gradle.kts b/settings.gradle.kts index b7012095ce..0a6661cb90 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,7 +32,7 @@ include(":extensions:incubator") include(":extensions:kotlin") include(":extensions:trace-propagators") include(":exporters:common") -include(":exporters:http-sender:okhttp") +include(":exporters:sender:okhttp") include(":exporters:jaeger") include(":exporters:jaeger-proto") include(":exporters:jaeger-thrift")