Skip to content

Commit

Permalink
Rename artifact to opentelemetry-exporter-sender-okhttp (#5582)
Browse files Browse the repository at this point in the history
  • Loading branch information
jack-berg authored Jun 30, 2023
1 parent f0f78cc commit 06d2656
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public HttpExporter<T> build() {
}
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ void build_NoHttpSenderProvider() {
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");
}
}

This file was deleted.

2 changes: 1 addition & 1 deletion exporters/otlp/all/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ subprojects {
val proj = this
plugins.withId("java") {
configure<BasePluginExtension> {
archivesName.set("opentelemetry-exporter-http-sender-${proj.name}")
archivesName.set("opentelemetry-exporter-sender-${proj.name}")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSenderProvider
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 06d2656

Please sign in to comment.