Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow custom ExemplarSampler to be used

Browse Source 
See gh-35619
This commit is contained in:
Johnny Goncalves 2023-05-24 14:32:12 +02:00 committed by Stephane Nicoll
parent 3586bfb629
commit 94b17ecd26
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java
View File

@ -90,7 +90,7 @@ public class PrometheusMetricsExportAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean(ExemplarSampler.class)
@ConditionalOnBean(SpanContextSupplier.class) @ConditionalOnBean(SpanContextSupplier.class)
public DefaultExemplarSampler exemplarSampler(SpanContextSupplier spanContextSupplier) { public DefaultExemplarSampler exemplarSampler(SpanContextSupplier spanContextSupplier) {
return new DefaultExemplarSampler(spanContextSupplier); return new DefaultExemplarSampler(spanContextSupplier);

34
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java
View File

@ -20,6 +20,8 @@ import io.micrometer.core.instrument.Clock;
import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry; import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.prometheus.client.CollectorRegistry; import io.prometheus.client.CollectorRegistry;
import io.prometheus.client.exemplars.DefaultExemplarSampler;
import io.prometheus.client.exemplars.Exemplar;
import io.prometheus.client.exemplars.ExemplarSampler; import io.prometheus.client.exemplars.ExemplarSampler;
import io.prometheus.client.exemplars.tracer.common.SpanContextSupplier; import io.prometheus.client.exemplars.tracer.common.SpanContextSupplier;
import io.prometheus.client.exporter.BasicAuthHttpConnectionFactory; import io.prometheus.client.exporter.BasicAuthHttpConnectionFactory;
@ -64,6 +66,12 @@ class PrometheusMetricsExportAutoConfigurationTests {
this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(PrometheusMeterRegistry.class)); this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(PrometheusMeterRegistry.class));
} }
@Test
void backsOfWhenExemplarSamplerIsPresent() {
this.contextRunner.withUserConfiguration(CustomExemplarSamplerConfiguration.class)
.run((context) -> assertThat(context).doesNotHaveBean(DefaultExemplarSampler.class));
}
@Test @Test
void autoConfiguresItsConfigCollectorRegistryAndMeterRegistry() { void autoConfiguresItsConfigCollectorRegistryAndMeterRegistry() {
this.contextRunner.withUserConfiguration(BaseConfiguration.class) this.contextRunner.withUserConfiguration(BaseConfiguration.class)
@ -119,7 +127,7 @@ class PrometheusMetricsExportAutoConfigurationTests {
@Test @Test
void autoConfiguresExemplarSamplerIfSpanContextSupplierIsPresent() { void autoConfiguresExemplarSamplerIfSpanContextSupplierIsPresent() {
this.contextRunner.withUserConfiguration(ExemplarsConfiguration.class) this.contextRunner.withUserConfiguration(DefaultExemplarSamplerConfiguration.class)
.run((context) -> assertThat(context).hasSingleBean(SpanContextSupplier.class) .run((context) -> assertThat(context).hasSingleBean(SpanContextSupplier.class)
.hasSingleBean(ExemplarSampler.class) .hasSingleBean(ExemplarSampler.class)
.hasSingleBean(PrometheusMeterRegistry.class)); .hasSingleBean(PrometheusMeterRegistry.class));
@ -287,7 +295,7 @@ class PrometheusMetricsExportAutoConfigurationTests {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@Import(BaseConfiguration.class) @Import(BaseConfiguration.class)
static class ExemplarsConfiguration { static class DefaultExemplarSamplerConfiguration {
@Bean @Bean
SpanContextSupplier spanContextSupplier() { SpanContextSupplier spanContextSupplier() {
@ -313,4 +321,26 @@ class PrometheusMetricsExportAutoConfigurationTests {
} }
@Configuration(proxyBeanMethods = false)
@Import(BaseConfiguration.class)
static class CustomExemplarSamplerConfiguration {
@Bean
ExemplarSampler exemplarSampler() {
return new ExemplarSampler() {
@Override
public Exemplar sample(double value, double bucketFrom, double bucketTo, Exemplar previous) {
return null;
}
@Override
public Exemplar sample(double increment, Exemplar previous) {
return null;
}
};
}
}
} }