Skip to content

Remote deprecated io.opentelemetry.exporter.internal.(http|grpc).(Http|Grpc)SenderProvider #8392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jack-berg merged 2 commits into from
May 12, 2026
+0 −169
Merged

Remote deprecated io.opentelemetry.exporter.internal.(http|grpc).(Http|Grpc)SenderProvider #8392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d17947d
Remote deprecated io.opentelemetry.exporter.internal.(http|grpc).(Htt…
jack-berg May 11, 2026
c1a502b
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions exporters/common/src/main/java/io/opentelemetry/exporter/internal/SenderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@ public final class SenderUtil {

private static final Logger LOGGER = Logger.getLogger(SenderUtil.class.getName());

private static final String OLD_GRPC_SPI_PROPERTY =
"io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider";
private static final String GRPC_SPI_PROPERTY =
"io.opentelemetry.sdk.common.export.GrpcSenderProvider";
private static final String OLD_HTTP_SPI_PROPERTY =
"io.opentelemetry.exporter.internal.http.HttpSenderProvider";
private static final String HTTP_SPI_PROPERTY =
"io.opentelemetry.sdk.common.export.HttpSenderProvider";

Expand Down Expand Up @@ -71,20 +67,6 @@ public static GrpcSenderProvider resolveGrpcSenderProvider(ComponentLoader compo

// If we've reached here, there are multiple GrpcSenderProviders
String configuredSender = ConfigUtil.getString(GRPC_SPI_PROPERTY, "");
// TODO: remove support for reading OLD_SPI_PROPERTY after 1.61.0
if (configuredSender.isEmpty()) {
configuredSender = ConfigUtil.getString(OLD_GRPC_SPI_PROPERTY, "");
if (!configuredSender.isEmpty()) {
LOGGER.log(
Level.WARNING,
OLD_GRPC_SPI_PROPERTY
+ " was used to set GrpcSenderProvider. Please use "
+ GRPC_SPI_PROPERTY
+ " instead. "
+ OLD_GRPC_SPI_PROPERTY
+ " will be removed after 1.61.0");
}
}

// Multiple providers but none configured, use first we find and log a warning
if (configuredSender.isEmpty()) {
Expand Down Expand Up @@ -143,20 +125,6 @@ public static HttpSenderProvider resolveHttpSenderProvider(ComponentLoader compo

// If we've reached here, there are multiple HttpSenderProviders
String configuredSender = ConfigUtil.getString(HTTP_SPI_PROPERTY, "");
// TODO: remove support for reading OLD_SPI_PROPERTY after 1.61.0
if (configuredSender.isEmpty()) {
configuredSender = ConfigUtil.getString(OLD_HTTP_SPI_PROPERTY, "");
if (!configuredSender.isEmpty()) {
LOGGER.log(
Level.WARNING,
OLD_HTTP_SPI_PROPERTY
+ " was used to set HttpSenderProvider. Please use "
+ HTTP_SPI_PROPERTY
+ " instead. "
+ OLD_HTTP_SPI_PROPERTY
+ " will be removed after 1.61.0");
}
}

// Multiple providers but none configured, use first we find and log a warning
if (configuredSender.isEmpty()) {
Expand Down
104 changes: 0 additions & 104 deletions ...testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...n/src/testSenderProvider/java/io/opentelemetry/exporter/internal/grpc/SenderUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,6 @@ void resolveGrpcSenderProvider_multipleSendersNoConfiguration() {
+ "to the FQCN of the preferred provider.");
}

// TODO: delete test after support for old spi is removed
@Test
@SetSystemProperty(
key = "io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider",
value =
"io.opentelemetry.exporter.sender.grpc.managedchannel.internal.UpstreamGrpcSenderProvider")
@SuppressLogger(SenderUtil.class)
void resolveGrpcSenderProvider_configureUsingOldSpi() {
assertThat(SenderUtil.resolveGrpcSenderProvider(componentLoader))
.isInstanceOf(UpstreamGrpcSenderProvider.class);

logCapturer.assertContains(
"io.opentelemetry.exporter.internal.grpc.GrpcSenderProvider "
+ "was used to set GrpcSenderProvider. Please use io.opentelemetry.sdk.common.export.GrpcSenderProvider "
+ "instead.");
}

@Test
@SetSystemProperty(
key = "io.opentelemetry.sdk.common.export.GrpcSenderProvider",
Expand Down Expand Up @@ -105,22 +88,6 @@ void build_multipleSendersNoConfiguration() {
+ "to the FQCN of the preferred provider.");
}

// TODO: delete test after support for old spi is removed
@Test
@SetSystemProperty(
key = "io.opentelemetry.exporter.internal.http.HttpSenderProvider",
value = "io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderProvider")
@SuppressLogger(SenderUtil.class)
void build_configureUsingOldSpi() {
assertThat(SenderUtil.resolveHttpSenderProvider(componentLoader))
.isInstanceOf(JdkHttpSenderProvider.class);

logCapturer.assertContains(
"io.opentelemetry.exporter.internal.http.HttpSenderProvider "
+ "was used to set HttpSenderProvider. Please use io.opentelemetry.sdk.common.export.HttpSenderProvider "
+ "instead.");
}

@Test
@SetSystemProperty(
key = "io.opentelemetry.sdk.common.export.HttpSenderProvider",
Expand Down
Loading