Skip to content

Commit 4dabf16

Browse files
committed
Polish "Remove default value for OtlpMetricsProperties.url"
See gh-44493
1 parent 75f72b6 commit 4dabf16

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ dependencies {
174174
testImplementation("org.springframework.restdocs:spring-restdocs-webtestclient")
175175
testImplementation("org.springframework.security:spring-security-test")
176176
testImplementation("org.yaml:snakeyaml")
177-
testImplementation("uk.org.webcompere:system-stubs-jupiter:2.1.7")
178177

179178
testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
180179
testRuntimeOnly("jakarta.transaction:jakarta.transaction-api")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
import io.micrometer.registry.otlp.HistogramFlavor;
2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
26-
import uk.org.webcompere.systemstubs.SystemStubs;
2726

2827
import org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsExportAutoConfiguration.PropertiesOtlpMetricsConnectionDetails;
2928
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryProperties;
3029
import org.springframework.mock.env.MockEnvironment;
3130

3231
import static org.assertj.core.api.Assertions.assertThat;
32+
import static org.mockito.BDDMockito.given;
33+
import static org.mockito.Mockito.spy;
3334

3435
/**
3536
* Tests for {@link OtlpMetricsPropertiesConfigAdapter}.
@@ -57,19 +58,16 @@ void setUp() {
5758

5859
@Test
5960
void whenPropertiesUrlIsNotSetAdapterUrlReturnsDefault() {
61+
assertThat(this.properties.getUrl()).isNull();
6062
assertThat(createAdapter().url()).isEqualTo("http://localhost:4318/v1/metrics");
6163
}
6264

6365
@Test
64-
void whenPropertiesUrlIsNotSetAndOtelExporterOtlpEndpointIsSetAdapterUrlUsesIt() throws Exception {
65-
SystemStubs.withEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT", "https://my-endpoint")
66-
.execute(() -> assertThat(createAdapter().url()).isEqualTo("https://my-endpoint/v1/metrics"));
67-
}
68-
69-
@Test
70-
void whenPropertiesUrlIsNotSetAndOtelExporterOtlpMetricsEndpointIsSetAdapterUrlUsesIt() throws Exception {
71-
SystemStubs.withEnvironmentVariable("OTEL_EXPORTER_OTLP_METRICS_ENDPOINT", "https://my-endpoint")
72-
.execute(() -> assertThat(createAdapter().url()).isEqualTo("https://my-endpoint/v1/metrics"));
66+
void whenPropertiesUrlIsNotSetThanUseOtlpConfigUrlAsFallback() {
67+
assertThat(this.properties.getUrl()).isNull();
68+
OtlpMetricsPropertiesConfigAdapter adapter = spy(createAdapter());
69+
given(adapter.get("management.otlp.metrics.export.url")).willReturn("https://my-endpoint/v1/metrics");
70+
assertThat(adapter.url()).isEqualTo("https://my-endpoint/v1/metrics");
7371
}
7472

7573
@Test

0 commit comments

Comments
 (0)