diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java index 96f22119a8..82d7ea2717 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java @@ -50,12 +50,12 @@ import org.springframework.core.task.VirtualThreadTaskExecutor; @ConditionalOnBean(Clock.class) @ConditionalOnClass(OtlpMeterRegistry.class) @ConditionalOnEnabledMetricsExport("otlp") -@EnableConfigurationProperties({ OtlpProperties.class, OpenTelemetryProperties.class }) +@EnableConfigurationProperties({ OtlpMetricsProperties.class, OpenTelemetryProperties.class }) public class OtlpMetricsExportAutoConfiguration { - private final OtlpProperties properties; + private final OtlpMetricsProperties properties; - OtlpMetricsExportAutoConfiguration(OtlpProperties properties) { + OtlpMetricsExportAutoConfiguration(OtlpMetricsProperties properties) { this.properties = properties; } @@ -69,7 +69,7 @@ public class OtlpMetricsExportAutoConfiguration { @ConditionalOnMissingBean OtlpConfig otlpConfig(OpenTelemetryProperties openTelemetryProperties, OtlpMetricsConnectionDetails connectionDetails, Environment environment) { - return new OtlpPropertiesConfigAdapter(this.properties, openTelemetryProperties, connectionDetails, + return new OtlpMetricsPropertiesConfigAdapter(this.properties, openTelemetryProperties, connectionDetails, environment); } @@ -89,13 +89,13 @@ public class OtlpMetricsExportAutoConfiguration { } /** - * Adapts {@link OtlpProperties} to {@link OtlpMetricsConnectionDetails}. + * Adapts {@link OtlpMetricsProperties} to {@link OtlpMetricsConnectionDetails}. */ static class PropertiesOtlpMetricsConnectionDetails implements OtlpMetricsConnectionDetails { - private final OtlpProperties properties; + private final OtlpMetricsProperties properties; - PropertiesOtlpMetricsConnectionDetails(OtlpProperties properties) { + PropertiesOtlpMetricsConnectionDetails(OtlpMetricsProperties properties) { this.properties = properties; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java similarity index 97% rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpProperties.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java index 5ad71476c6..17e5fe771a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java @@ -35,10 +35,10 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper * @since 3.0.0 */ @ConfigurationProperties(prefix = "management.otlp.metrics.export") -public class OtlpProperties extends StepRegistryProperties { +public class OtlpMetricsProperties extends StepRegistryProperties { /** - * URI of the OLTP server. + * URI of the OTLP server. */ private String url = "http://localhost:4318/v1/metrics"; diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapter.java similarity index 76% rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapter.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapter.java index 0f6d5947eb..b6268dee51 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapter.java @@ -32,13 +32,14 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; /** - * Adapter to convert {@link OtlpProperties} to an {@link OtlpConfig}. + * Adapter to convert {@link OtlpMetricsProperties} to an {@link OtlpConfig}. * * @author Eddú Meléndez * @author Jonatan Ivanov * @author Moritz Halbritter */ -class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter implements OtlpConfig { +class OtlpMetricsPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter + implements OtlpConfig { /** * Default value for application name if {@code spring.application.name} is not set. @@ -51,8 +52,9 @@ class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter resourceAttributes() { Map resourceAttributes = this.openTelemetryProperties.getResourceAttributes(); Map result = new HashMap<>((!CollectionUtils.isEmpty(resourceAttributes)) ? resourceAttributes - : get(OtlpProperties::getResourceAttributes, OtlpConfig.super::resourceAttributes)); + : get(OtlpMetricsProperties::getResourceAttributes, OtlpConfig.super::resourceAttributes)); result.computeIfAbsent("service.name", (key) -> getApplicationName()); result.computeIfAbsent("service.group", (key) -> getApplicationGroup()); return Collections.unmodifiableMap(result); @@ -96,27 +98,27 @@ class OtlpPropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter headers() { - return get(OtlpProperties::getHeaders, OtlpConfig.super::headers); + return get(OtlpMetricsProperties::getHeaders, OtlpConfig.super::headers); } @Override public HistogramFlavor histogramFlavor() { - return get(OtlpProperties::getHistogramFlavor, OtlpConfig.super::histogramFlavor); + return get(OtlpMetricsProperties::getHistogramFlavor, OtlpConfig.super::histogramFlavor); } @Override public int maxScale() { - return get(OtlpProperties::getMaxScale, OtlpConfig.super::maxScale); + return get(OtlpMetricsProperties::getMaxScale, OtlpConfig.super::maxScale); } @Override public int maxBucketCount() { - return get(OtlpProperties::getMaxBucketCount, OtlpConfig.super::maxBucketCount); + return get(OtlpMetricsProperties::getMaxBucketCount, OtlpConfig.super::maxBucketCount); } @Override public TimeUnit baseTimeUnit() { - return get(OtlpProperties::getBaseTimeUnit, OtlpConfig.super::baseTimeUnit); + return get(OtlpMetricsProperties::getBaseTimeUnit, OtlpConfig.super::baseTimeUnit); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java similarity index 94% rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapterTests.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java index 78c97b35c0..ba3276ac92 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesConfigAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesConfigAdapterTests.java @@ -33,14 +33,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; /** - * Tests for {@link OtlpPropertiesConfigAdapter}. + * Tests for {@link OtlpMetricsPropertiesConfigAdapter}. * * @author Eddú Meléndez * @author Moritz Halbritter */ -class OtlpPropertiesConfigAdapterTests { +class OtlpMetricsPropertiesConfigAdapterTests { - private OtlpProperties properties; + private OtlpMetricsProperties properties; private OpenTelemetryProperties openTelemetryProperties; @@ -50,7 +50,7 @@ class OtlpPropertiesConfigAdapterTests { @BeforeEach void setUp() { - this.properties = new OtlpProperties(); + this.properties = new OtlpMetricsProperties(); this.openTelemetryProperties = new OpenTelemetryProperties(); this.environment = new MockEnvironment(); this.connectionDetails = new PropertiesOtlpMetricsConnectionDetails(this.properties); @@ -199,9 +199,9 @@ class OtlpPropertiesConfigAdapterTests { assertThat(createAdapter().resourceAttributes()).doesNotContainKey("service.group"); } - private OtlpPropertiesConfigAdapter createAdapter() { - return new OtlpPropertiesConfigAdapter(this.properties, this.openTelemetryProperties, this.connectionDetails, - this.environment); + private OtlpMetricsPropertiesConfigAdapter createAdapter() { + return new OtlpMetricsPropertiesConfigAdapter(this.properties, this.openTelemetryProperties, + this.connectionDetails, this.environment); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesTests.java similarity index 89% rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesTests.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesTests.java index 1ecf8fb7c4..36f2f85af6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpPropertiesTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsPropertiesTests.java @@ -24,15 +24,15 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties. import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link OtlpProperties}. + * Tests for {@link OtlpMetricsProperties}. * * @author Eddú Meléndez */ -class OtlpPropertiesTests extends StepRegistryPropertiesTests { +class OtlpMetricsPropertiesTests extends StepRegistryPropertiesTests { @Test void defaultValuesAreConsistent() { - OtlpProperties properties = new OtlpProperties(); + OtlpMetricsProperties properties = new OtlpMetricsProperties(); OtlpConfig config = OtlpConfig.DEFAULT; assertStepRegistryDefaultValues(properties, config); assertThat(properties.getUrl()).isEqualTo(config.url());