Remove dependency on io.zipkin.reporter2:zipkin-sender-urlconnection …

…by removal of URLConnectionSender usages in codebase Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
spring-projects · Mar 2, 2025 · 8d0fb4d · 8d0fb4d
1 parent 83f678a
commit 8d0fb4d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 83 deletions.
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -58,7 +58,6 @@ dependencies {
 	optional("io.micrometer:micrometer-registry-statsd")
 	optional("io.micrometer:micrometer-registry-wavefront")
 	optional("io.zipkin.reporter2:zipkin-reporter-brave")
-	optional("io.zipkin.reporter2:zipkin-sender-urlconnection")
 	optional("io.opentelemetry:opentelemetry-exporter-zipkin")
 	optional("io.opentelemetry:opentelemetry-exporter-otlp")
 	optional("io.projectreactor.netty:reactor-netty-http")

diff --git a/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java b/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java
@@ -32,7 +32,6 @@
 import zipkin2.reporter.SpanBytesEncoder;
 import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
 import zipkin2.reporter.brave.MutableSpanBytesEncoder;
-import zipkin2.reporter.urlconnection.URLConnectionSender;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.tracing.ConditionalOnEnabledTracing;
@@ -54,7 +53,7 @@
 class ZipkinConfigurations {
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ HttpClientSenderConfiguration.class, UrlConnectionSenderConfiguration.class })
+	@Import({ HttpClientSenderConfiguration.class })
 	static class SenderConfiguration {
 
 	}
@@ -82,31 +81,6 @@ ZipkinHttpClientSender httpClientSender(ZipkinProperties properties, Encoding en
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(URLConnectionSender.class)
-	@EnableConfigurationProperties(ZipkinProperties.class)
-	static class UrlConnectionSenderConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean(BytesMessageSender.class)
-		URLConnectionSender urlConnectionSender(ZipkinProperties properties, Encoding encoding,
-				ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
-				ObjectProvider<HttpEndpointSupplier.Factory> endpointSupplierFactoryProvider) {
-			ZipkinConnectionDetails connectionDetails = connectionDetailsProvider
-				.getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
-			HttpEndpointSupplier.Factory endpointSupplierFactory = endpointSupplierFactoryProvider
-				.getIfAvailable(HttpEndpointSuppliers::constantFactory);
-			URLConnectionSender.Builder builder = URLConnectionSender.newBuilder();
-			builder.connectTimeout((int) properties.getConnectTimeout().toMillis());
-			builder.readTimeout((int) properties.getReadTimeout().toMillis());
-			builder.endpointSupplierFactory(endpointSupplierFactory);
-			builder.endpoint(connectionDetails.getSpanEndpoint());
-			builder.encoding(encoding);
-			return builder.build();
-		}
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(AsyncZipkinSpanHandler.class)
 	static class BraveConfiguration {

diff --git a/...rk/boot/actuate/autoconfigure/tracing/zipkin/ZipkinAutoConfigurationIntegrationTests.java b/...rk/boot/actuate/autoconfigure/tracing/zipkin/ZipkinAutoConfigurationIntegrationTests.java
@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.autoconfigure.tracing.zipkin;
 
 import org.junit.jupiter.api.Test;
-import zipkin2.reporter.urlconnection.URLConnectionSender;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
@@ -28,7 +27,6 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
-import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.ApplicationContextAssertProvider;
 import org.springframework.boot.test.context.runner.AbstractApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -61,12 +59,10 @@ void zipkinsUseOfWebClientDoesNotCauseACycle() {
 
 	<SELF extends AbstractApplicationContextRunner<SELF, C, A>, C extends ConfigurableApplicationContext, A extends ApplicationContextAssertProvider<C>> AbstractApplicationContextRunner<SELF, C, A> configure(
 			AbstractApplicationContextRunner<SELF, ?, ?> runner) {
-		return runner
-			.withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class,
-					ObservationAutoConfiguration.class, BraveAutoConfiguration.class, ZipkinAutoConfiguration.class,
-					HttpClientObservationsAutoConfiguration.class, MetricsAutoConfiguration.class,
-					SimpleMetricsExportAutoConfiguration.class))
-			.withClassLoader(new FilteredClassLoader(URLConnectionSender.class));
+		return runner.withConfiguration(AutoConfigurations.of(MicrometerTracingAutoConfiguration.class,
+				ObservationAutoConfiguration.class, BraveAutoConfiguration.class, ZipkinAutoConfiguration.class,
+				HttpClientObservationsAutoConfiguration.class, MetricsAutoConfiguration.class,
+				SimpleMetricsExportAutoConfiguration.class));
 	}
 
 }
diff --git a/...ot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsSenderConfigurationTests.java b/...ot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsSenderConfigurationTests.java
@@ -16,17 +16,12 @@
 
 package org.springframework.boot.actuate.autoconfigure.tracing.zipkin;
 
-import java.net.http.HttpClient;
-
 import org.junit.jupiter.api.Test;
 import zipkin2.reporter.BytesMessageSender;
 import zipkin2.reporter.HttpEndpointSupplier;
-import zipkin2.reporter.urlconnection.URLConnectionSender;
 
 import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.SenderConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.UrlConnectionSenderConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,21 +46,9 @@ void shouldSupplyDefaultHttpClientSenderBean() {
 		this.contextRunner.run((context) -> {
 			assertThat(context).hasSingleBean(BytesMessageSender.class);
 			assertThat(context).hasSingleBean(ZipkinHttpClientSender.class);
-			assertThat(context).doesNotHaveBean(URLConnectionSender.class);
 		});
 	}
 
-	@Test
-	void shouldUseUrlConnectionSenderIfHttpClientIsNotAvailable() {
-		this.contextRunner.withUserConfiguration(UrlConnectionSenderConfiguration.class)
-			.withClassLoader(new FilteredClassLoader(HttpClient.class))
-			.run((context) -> {
-				assertThat(context).doesNotHaveBean(ZipkinHttpClientSender.class);
-				assertThat(context).hasSingleBean(BytesMessageSender.class);
-				assertThat(context).hasSingleBean(URLConnectionSender.class);
-			});
-	}
-
 	@Test
 	void shouldBackOffOnCustomBeans() {
 		this.contextRunner.withUserConfiguration(CustomConfiguration.class).run((context) -> {
@@ -74,17 +57,6 @@ void shouldBackOffOnCustomBeans() {
 		});
 	}
 
-	@Test
-	void shouldUseCustomHttpEndpointSupplierFactory() {
-		this.contextRunner.withUserConfiguration(CustomHttpEndpointSupplierFactoryConfiguration.class)
-			.withClassLoader(new FilteredClassLoader(HttpClient.class))
-			.run((context) -> {
-				URLConnectionSender urlConnectionSender = context.getBean(URLConnectionSender.class);
-				assertThat(urlConnectionSender).extracting("delegate.endpointSupplier")
-					.isInstanceOf(CustomHttpEndpointSupplier.class);
-			});
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	private static final class CustomConfiguration {
 
@@ -95,25 +67,6 @@ BytesMessageSender customSender() {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	private static final class CustomHttpEndpointSupplierFactoryConfiguration {
-
-		@Bean
-		HttpEndpointSupplier.Factory httpEndpointSupplier() {
-			return new CustomHttpEndpointSupplierFactory();
-		}
-
-	}
-
-	private static final class CustomHttpEndpointSupplierFactory implements HttpEndpointSupplier.Factory {
-
-		@Override
-		public HttpEndpointSupplier create(String endpoint) {
-			return new CustomHttpEndpointSupplier(endpoint);
-		}
-
-	}
-
 	private record CustomHttpEndpointSupplier(String endpoint) implements HttpEndpointSupplier {
 
 		@Override