Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-20 01:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use parent-based sampler by default

Browse Source 
Closes gh-33821
This commit is contained in:
Moritz Halbritter 2023-01-19 09:09:10 +01:00
parent ae79c60619
commit 31ca94833a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java
View File

@ -112,7 +112,8 @@ public class OpenTelemetryAutoConfiguration {
@Bean
@ConditionalOnMissingBean
Sampler otelSampler() {
return Sampler.traceIdRatioBased(this.tracingProperties.getSampling().getProbability());
Sampler rootSampler = Sampler.traceIdRatioBased(this.tracingProperties.getSampling().getProbability());
return Sampler.parentBased(rootSampler);
}
@Bean

9
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java
View File

@ -80,6 +80,15 @@ class OpenTelemetryAutoConfigurationTests {
});
}
@Test
void samplerIsParentBased() {
this.contextRunner.run((context) -> {
Sampler sampler = context.getBean(Sampler.class);
assertThat(sampler).isNotNull();
assertThat(sampler.getDescription()).startsWith("ParentBased{");
});
}
@ParameterizedTest
@ValueSource(strings = { "io.micrometer.tracing.otel", "io.opentelemetry.sdk", "io.opentelemetry.api" })
void shouldNotSupplyBeansIfDependencyIsMissing(String packageName) {