Merge pull request #44500 from thecooldrop

* pr/44500:
  Polish "Remove support for URLConnectionSender"
  Remove support for URLConnectionSender

Closes gh-44500

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")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java

@@ -32,7 +32,6 @@ import zipkin2.reporter.HttpEndpointSuppliers;
 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 @@ import org.springframework.context.annotation.Import;
 class ZipkinConfigurations {
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ HttpClientSenderConfiguration.class, UrlConnectionSenderConfiguration.class })
+	@Import({ HttpClientSenderConfiguration.class })
 	static class SenderConfiguration {
 
 	}
@@ -82,31 +81,6 @@ class ZipkinConfigurations {
 
 	}
 
-	@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 {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/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.actuate.autoconfigure.tracing.MicrometerTracingA
 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 @@ class ZipkinAutoConfigurationIntegrationTests {
 
 	<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));
 	}
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ class ZipkinAutoConfigurationTests {
 	@Test
 	void shouldWorkWithoutSenders() {
 		this.contextRunner
-			.withClassLoader(new FilteredClassLoader("zipkin2.reporter.urlconnection", "org.springframework.web.client",
+			.withClassLoader(new FilteredClassLoader("org.springframework.web.client",
 					"org.springframework.web.reactive.function.client"))
 			.run((context) -> assertThat(context).hasNotFailed());
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsSenderConfigurationTests.java

@@ -21,10 +21,9 @@ 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.HttpClientSenderConfiguration;
 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;
@@ -40,7 +39,6 @@ import static org.mockito.Mockito.mock;
  * @author Moritz Halbritter
  * @author Wick Dynex
  */
-@SuppressWarnings({ "deprecation", "removal" })
 class ZipkinConfigurationsSenderConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -51,19 +49,14 @@ class ZipkinConfigurationsSenderConfigurationTests {
 		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)
+	void shouldNotProvideHttpClientSenderIfHttpClientIsNotAvailable() {
+		this.contextRunner.withUserConfiguration(HttpClientSenderConfiguration.class)
 			.withClassLoader(new FilteredClassLoader(HttpClient.class))
-			.run((context) -> {
-				assertThat(context).doesNotHaveBean(ZipkinHttpClientSender.class);
-				assertThat(context).hasSingleBean(BytesMessageSender.class);
-				assertThat(context).hasSingleBean(URLConnectionSender.class);
-			});
+			.run((context) -> assertThat(context).doesNotHaveBean(ZipkinHttpClientSender.class));
 	}
 
 	@Test
@@ -77,16 +70,15 @@ class ZipkinConfigurationsSenderConfigurationTests {
 	@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")
+				ZipkinHttpClientSender httpClientSender = context.getBean(ZipkinHttpClientSender.class);
+				assertThat(httpClientSender).extracting("endpointSupplier")
 					.isInstanceOf(CustomHttpEndpointSupplier.class);
 			});
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static final class CustomConfiguration {
+	static class CustomConfiguration {
 
 		@Bean
 		BytesMessageSender customSender() {
@@ -96,7 +88,7 @@ class ZipkinConfigurationsSenderConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	private static final class CustomHttpEndpointSupplierFactoryConfiguration {
+	static class CustomHttpEndpointSupplierFactoryConfiguration {
 
 		@Bean
 		HttpEndpointSupplier.Factory httpEndpointSupplier() {
@@ -105,7 +97,7 @@ class ZipkinConfigurationsSenderConfigurationTests {
 
 	}
 
-	private static final class CustomHttpEndpointSupplierFactory implements HttpEndpointSupplier.Factory {
+	static class CustomHttpEndpointSupplierFactory implements HttpEndpointSupplier.Factory {
 
 		@Override
 		public HttpEndpointSupplier create(String endpoint) {
@@ -114,7 +106,13 @@ class ZipkinConfigurationsSenderConfigurationTests {
 
 	}
 
-	private record CustomHttpEndpointSupplier(String endpoint) implements HttpEndpointSupplier {
+	static class CustomHttpEndpointSupplier implements HttpEndpointSupplier {
+
+		private final String endpoint;
+
+		CustomHttpEndpointSupplier(String endpoint) {
+			this.endpoint = endpoint;
+		}
 
 		@Override
 		public String get() {
@@ -124,6 +122,7 @@ class ZipkinConfigurationsSenderConfigurationTests {
 		@Override
 		public void close() {
 		}
+
 	}
 
 }