Skip to content

Commit d5f8008

Browse files
committed
Merge pull request #44493 from izeye
* pr/44493: Polish "Remove default value for OtlpMetricsProperties.url" Remove default value for OtlpMetricsProperties.url Closes gh-44493
2 parents ccfc1ae + 4dabf16 commit d5f8008

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class OtlpMetricsProperties extends StepRegistryProperties {
3939
/**
4040
* URI of the OTLP server.
4141
*/
42-
private String url = "http://localhost:4318/v1/metrics";
42+
private String url;
4343

4444
/**
4545
* Aggregation temporality of sums. It defines the way additive values are expressed.

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

+16
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.springframework.mock.env.MockEnvironment;
3030

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

3335
/**
3436
* Tests for {@link OtlpMetricsPropertiesConfigAdapter}.
@@ -54,6 +56,20 @@ void setUp() {
5456
this.connectionDetails = new PropertiesOtlpMetricsConnectionDetails(this.properties);
5557
}
5658

59+
@Test
60+
void whenPropertiesUrlIsNotSetAdapterUrlReturnsDefault() {
61+
assertThat(this.properties.getUrl()).isNull();
62+
assertThat(createAdapter().url()).isEqualTo("http://localhost:4318/v1/metrics");
63+
}
64+
65+
@Test
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");
71+
}
72+
5773
@Test
5874
void whenPropertiesUrlIsSetAdapterUrlReturnsIt() {
5975
this.properties.setUrl("http://another-url:4318/v1/metrics");

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

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void defaultValuesAreConsistent() {
3535
OtlpMetricsProperties properties = new OtlpMetricsProperties();
3636
OtlpConfig config = OtlpConfig.DEFAULT;
3737
assertStepRegistryDefaultValues(properties, config);
38-
assertThat(properties.getUrl()).isEqualTo(config.url());
3938
assertThat(properties.getAggregationTemporality()).isSameAs(config.aggregationTemporality());
4039
assertThat(properties.getHistogramFlavor()).isSameAs(config.histogramFlavor());
4140
assertThat(properties.getMaxScale()).isEqualTo(config.maxScale());

0 commit comments

Comments
 (0)