Skip to content

Commit 79ff11c

Browse files
committed
Rename and relocate ExemplarsAutoConfiguration
Rename `ExemplarsAutoConfiguration` and relocate it to a diffent package to make it clear that it is for Prometheus.
1 parent a53141f commit 79ff11c

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.tracing.exemplars;
17+
package org.springframework.boot.actuate.autoconfigure.tracing.prometheus;
1818

1919
import io.micrometer.tracing.Span;
2020
import io.micrometer.tracing.Tracer;
@@ -44,7 +44,7 @@
4444
@ConditionalOnBean(Tracer.class)
4545
@ConditionalOnClass({ Tracer.class, SpanContextSupplier.class })
4646
@ConditionalOnEnabledTracing
47-
public class ExemplarsAutoConfiguration {
47+
public class PrometheusExemplarsAutoConfiguration {
4848

4949
@Bean
5050
@ConditionalOnMissingBean
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Auto-configuration for Prometheus Exemplars with Micrometer Tracing.
1919
*/
20-
package org.springframework.boot.actuate.autoconfigure.tracing.exemplars;
20+
package org.springframework.boot.actuate.autoconfigure.tracing.prometheus;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributor
9999
org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration
100100
org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration
101101
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryAutoConfiguration
102-
org.springframework.boot.actuate.autoconfigure.tracing.exemplars.ExemplarsAutoConfiguration
102+
org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExemplarsAutoConfiguration
103103
org.springframework.boot.actuate.autoconfigure.tracing.wavefront.WavefrontTracingAutoConfiguration
104104
org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration
105105
org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.tracing.exemplars;
17+
package org.springframework.boot.actuate.autoconfigure.tracing.prometheus;
1818

1919
import io.micrometer.observation.Observation;
2020
import io.micrometer.observation.ObservationRegistry;
@@ -38,18 +38,19 @@
3838
import static org.mockito.Mockito.mock;
3939

4040
/**
41-
* Tests for {@link ExemplarsAutoConfiguration}.
41+
* Tests for {@link PrometheusExemplarsAutoConfiguration}.
4242
*
4343
* * @author Jonatan Ivanov
4444
*/
45-
class ExemplarsAutoConfigurationTests {
45+
class PrometheusExemplarsAutoConfigurationTests {
4646

4747
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
4848
.withPropertyValues("management.tracing.sampling.probability=1.0",
4949
"management.metrics.distribution.percentiles-histogram.all=true")
50-
.with(MetricsRun.limitedTo(PrometheusMetricsExportAutoConfiguration.class)).withConfiguration(
51-
AutoConfigurations.of(ExemplarsAutoConfiguration.class, ObservationAutoConfiguration.class,
52-
BraveAutoConfiguration.class, MicrometerTracingAutoConfiguration.class));
50+
.with(MetricsRun.limitedTo(PrometheusMetricsExportAutoConfiguration.class))
51+
.withConfiguration(AutoConfigurations.of(PrometheusExemplarsAutoConfiguration.class,
52+
ObservationAutoConfiguration.class, BraveAutoConfiguration.class,
53+
MicrometerTracingAutoConfiguration.class));
5354

5455
@Test
5556
void shouldNotSupplyBeansIfTracingIsDisabled() {

0 commit comments

Comments
 (0)