diff --git a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/SenderUtil.java b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/SenderUtil.java index 8b464f7b8c6..3c9ebaa51d7 100644 --- a/exporters/common/src/main/java/io/opentelemetry/exporter/internal/SenderUtil.java +++ b/exporters/common/src/main/java/io/opentelemetry/exporter/internal/SenderUtil.java @@ -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"; @@ -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()) { @@ -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()) { 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 deleted file mode 100644 index 100d456b598..00000000000 --- a/exporters/common/src/testHttpSenderProvider/java/io/opentelemetry/exporter/internal/http/HttpExporterTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.exporter.internal.http; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import io.github.netmikey.logunit.api.LogCapturer; -import io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSender; -import io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSender; -import io.opentelemetry.internal.testing.slf4j.SuppressLogger; -import io.opentelemetry.sdk.common.internal.StandardComponentId; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; -import org.junitpioneer.jupiter.SetSystemProperty; - -class HttpExporterTest { - - @RegisterExtension - LogCapturer logCapturer = - LogCapturer.create().captureForLogger(HttpExporterBuilder.class.getName()); - - @Test - @SuppressLogger(HttpExporterBuilder.class) - void build_multipleSendersNoConfiguration() { - Assertions.assertThatCode( - () -> - new HttpExporterBuilder( - StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, - "http://localhost") - .build()) - .doesNotThrowAnyException(); - - logCapturer.assertContains( - "Multiple HttpSenderProvider found. Please include only one, " - + "or specify preference setting io.opentelemetry.sdk.common.export.HttpSenderProvider " - + "to the FQCN of the preferred provider."); - } - - @Test - @SetSystemProperty( - key = "io.opentelemetry.exporter.internal.http.HttpSenderProvider", - value = "io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderProvider") - void build_configureUsingOldSpi() { - assertThat( - new HttpExporterBuilder( - StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost") - .build()) - .extracting("httpSender") - .isInstanceOf(JdkHttpSender.class); - - assertThat(logCapturer.getEvents()).isEmpty(); - } - - @Test - @SetSystemProperty( - key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", - value = "io.opentelemetry.exporter.sender.jdk.internal.JdkHttpSenderProvider") - void build_multipleSendersWithJdk() { - assertThat( - new HttpExporterBuilder( - StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost") - .build()) - .extracting("httpSender") - .isInstanceOf(JdkHttpSender.class); - - assertThat(logCapturer.getEvents()).isEmpty(); - } - - @Test - @SetSystemProperty( - key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", - value = "io.opentelemetry.exporter.sender.okhttp.internal.OkHttpHttpSenderProvider") - void build_multipleSendersWithOkHttp() { - assertThat( - new HttpExporterBuilder( - StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, "http://localhost") - .build()) - .extracting("httpSender") - .isInstanceOf(OkHttpHttpSender.class); - - assertThat(logCapturer.getEvents()).isEmpty(); - } - - @Test - @SetSystemProperty(key = "io.opentelemetry.sdk.common.export.HttpSenderProvider", value = "foo") - void build_multipleSendersNoMatch() { - assertThatThrownBy( - () -> - new HttpExporterBuilder( - StandardComponentId.ExporterType.OTLP_HTTP_SPAN_EXPORTER, - "http://localhost") - .build()) - .isInstanceOf(IllegalStateException.class) - .hasMessage( - "No HttpSenderProvider matched configured io.opentelemetry.sdk.common.export.HttpSenderProvider: foo"); - - assertThat(logCapturer.getEvents()).isEmpty(); - } -} diff --git a/exporters/common/src/testSenderProvider/java/io/opentelemetry/exporter/internal/grpc/SenderUtilTest.java b/exporters/common/src/testSenderProvider/java/io/opentelemetry/exporter/internal/grpc/SenderUtilTest.java index 54ede0265b6..79ab11faef4 100644 --- a/exporters/common/src/testSenderProvider/java/io/opentelemetry/exporter/internal/grpc/SenderUtilTest.java +++ b/exporters/common/src/testSenderProvider/java/io/opentelemetry/exporter/internal/grpc/SenderUtilTest.java @@ -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", @@ -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",