SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed conditions for sampling

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-11-16 16:22:26 +01:00
parent ff2e27b5a1
commit fa4832709b
3 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBraveAutoConfiguration.java
View File

@@ -37,6 +37,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.cloud.sleuth.brave.autoconfig.TraceBraveAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.lang.Nullable;
@@ -58,7 +59,7 @@ import org.springframework.web.client.RestTemplate;
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true)
@AutoConfigureBefore(TraceAutoConfiguration.class)
@AutoConfigureBefore({ TraceAutoConfiguration.class, TraceBraveAutoConfiguration.class })
@ConditionalOnClass(Tracer.class)
@AutoConfigureAfter(ZipkinAutoConfiguration.class)
public class ZipkinBraveAutoConfiguration {

3
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinOtelAutoConfiguration.java
View File

@@ -27,6 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.cloud.sleuth.otel.autoconfig.TraceOtelAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
@@ -49,7 +50,7 @@ import org.springframework.web.client.RestTemplate;
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true)
@AutoConfigureBefore(TraceAutoConfiguration.class)
@AutoConfigureBefore({ TraceAutoConfiguration.class, TraceOtelAutoConfiguration.class })
@ConditionalOnClass(Tracer.class)
@AutoConfigureAfter(ZipkinAutoConfiguration.class)
public class ZipkinOtelAutoConfiguration {

70
spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSamplerTests.java Normal file
View File

@@ -0,0 +1,70 @@
/*
* Copyright 2013-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.zipkin2;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.cloud.sleuth.brave.autoconfig.TraceBraveAutoConfiguration;
import org.springframework.cloud.sleuth.otel.autoconfig.TraceOtelAutoConfiguration;
import org.springframework.context.annotation.Configuration;
/**
* Not using {@linkplain SpringBootTest} as we need to change properties per test.
*
* @author Adrian Cole
*/
public class ZipkinSamplerTests {
@Test
void should_set_sampler_to_non_never_when_zipkin_handler_on_classpath_for_brave() {
ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
AutoConfigurations.of(BraveTestConfig.class));
contextRunner.run(context -> {
brave.sampler.Sampler sampler = context.getBean(brave.sampler.Sampler.class);
BDDAssertions.then(sampler).isNotSameAs(brave.sampler.Sampler.NEVER_SAMPLE);
});
}
@Test
void should_set_sampler_to_non_off_when_zipkin_handler_on_classpath_for_otel() {
ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
AutoConfigurations.of(OtelTestConfig.class));
contextRunner.run(context -> {
io.opentelemetry.sdk.trace.samplers.Sampler sampler = context.getBean(io.opentelemetry.sdk.trace.samplers.Sampler.class);
BDDAssertions.then(sampler).isNotSameAs(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOff());
});
}
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration(exclude = TraceBraveAutoConfiguration.class)
static class OtelTestConfig {
}
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration(exclude = TraceOtelAutoConfiguration.class)
static class BraveTestConfig {
}
}