From 72cbb8a5d8fd2dbcdef91a4523af040d63a9e1ba Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 9 Nov 2022 21:56:49 -0800 Subject: [PATCH] Polish --- .../prometheus/PrometheusMetricsExportAutoConfiguration.java | 2 +- .../prometheus/PrometheusExemplarsAutoConfigurationTests.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java index 9b12576ced6..2277bf6b673 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java @@ -92,7 +92,7 @@ public class PrometheusMetricsExportAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnBean(SpanContextSupplier.class) - public ExemplarSampler exemplarSampler(SpanContextSupplier spanContextSupplier) { + public DefaultExemplarSampler exemplarSampler(SpanContextSupplier spanContextSupplier) { return new DefaultExemplarSampler(spanContextSupplier); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/prometheus/PrometheusExemplarsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/prometheus/PrometheusExemplarsAutoConfigurationTests.java index 7ffe8e2361b..68c3ffb5cfd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/prometheus/PrometheusExemplarsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/prometheus/PrometheusExemplarsAutoConfigurationTests.java @@ -83,7 +83,6 @@ class PrometheusExemplarsAutoConfigurationTests { assertThat(context).hasSingleBean(SpanContextSupplier.class); ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class); Observation.start("test.observation", observationRegistry).stop(); - PrometheusMeterRegistry prometheusMeterRegistry = context.getBean(PrometheusMeterRegistry.class); String openMetricsOutput = prometheusMeterRegistry.scrape(TextFormat.CONTENT_TYPE_OPENMETRICS_100); assertThat(openMetricsOutput).contains("test_observation_seconds_bucket").containsOnlyOnce("trace_id=")