Skip to content

Commit

Permalink
Adapt the deleted tests to apply to ZipkinHttpClientSender instead of…
Browse files Browse the repository at this point in the history
… the originally applied to UrlConnectionSender

Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
  • Loading branch information
thecooldrop committed Mar 5, 2025
1 parent 326a88a commit 5ccb11d
Showing 1 changed file with 43 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@

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 org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.HttpClientSenderConfiguration;
import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConfigurations.SenderConfiguration;
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;
Expand All @@ -39,7 +42,7 @@
class ZipkinConfigurationsSenderConfigurationTests {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(DefaultEncodingConfiguration.class, SenderConfiguration.class));
.withConfiguration(AutoConfigurations.of(DefaultEncodingConfiguration.class, SenderConfiguration.class));

@Test
void shouldSupplyDefaultHttpClientSenderBean() {
Expand All @@ -49,6 +52,15 @@ void shouldSupplyDefaultHttpClientSenderBean() {
});
}

@Test
void shouldNotProvideHttpClientSenderIfHttpClientIsNotAvailable() {
this.contextRunner.withUserConfiguration(HttpClientSenderConfiguration.class)
.withClassLoader(new FilteredClassLoader(HttpClient.class))
.run((context) -> {
assertThat(context).doesNotHaveBean(ZipkinHttpClientSender.class);
});
}

@Test
void shouldBackOffOnCustomBeans() {
this.contextRunner.withUserConfiguration(CustomConfiguration.class).run((context) -> {
Expand All @@ -57,6 +69,16 @@ void shouldBackOffOnCustomBeans() {
});
}

@Test
void shouldUseCustomHttpEndpointSupplierFactory() {
this.contextRunner.withUserConfiguration(CustomHttpEndpointSupplierFactoryConfiguration.class)
.run((context) -> {
ZipkinHttpClientSender httpClientSender = context.getBean(ZipkinHttpClientSender.class);
assertThat(httpClientSender).extracting("endpointSupplier")
.isInstanceOf(CustomHttpEndpointSupplier.class);
});
}

@Configuration(proxyBeanMethods = false)
private static final class CustomConfiguration {

Expand All @@ -67,6 +89,25 @@ 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
Expand Down

0 comments on commit 5ccb11d

Please sign in to comment.