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

Update to be compatible with Brave 5.18

Browse Source 
Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Adrian Cole
2024-01-08 16:46:58 +08:00
committed by Marcin Grzejszczak
parent 753a4c07ce
commit 8f39760f53
16 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -60,8 +60,6 @@
<spring-cloud-openfeign.version>3.1.10-SNAPSHOT</spring-cloud-openfeign.version>
<spring-cloud-task.version>2.4.6</spring-cloud-task.version>
<spring-cloud-deployer.version>2.5.1</spring-cloud-deployer.version>
<brave.version>5.13.9</brave.version>
<opentracing.version>0.32.0</opentracing.version>
<!-- Deprecated - reached EOL -->
<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>
<spring-security-oauth2.version>2.2.0.RELEASE</spring-security-oauth2.version>

1
spring-cloud-sleuth-autoconfigure/pom.xml
View File

@@ -414,6 +414,7 @@
<artifactId>zipkin</artifactId>
<optional>true</optional>
</dependency>
<!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>

6
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java
View File

@@ -334,12 +334,6 @@ class BraveBaggageConfiguration {
return delegate.decorate(context);
}
@Override
public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
Propagation<K> propagation = delegate.create(keyFactory);
return delegateWithoutB3Baggage(factoryFromSupplier, propagation);
}
private <K> Propagation<K> delegateWithoutB3Baggage(Propagation.Factory factoryFromSupplier,
Propagation<K> propagation) {
return new Propagation<K>() {

11
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/instrument/web/BraveHttpConfiguration.java
View File

@@ -77,9 +77,8 @@ public class BraveHttpConfiguration {
@Bean
@ConditionalOnMissingBean
// NOTE: stable bean name as might be used outside sleuth
HttpTracing httpTracing(Tracing tracing, @Nullable SkipPatternProvider provider,
@Nullable brave.http.HttpClientParser clientParser, @Nullable brave.http.HttpServerParser serverParser,
BeanFactory beanFactory, @Nullable List<HttpTracingCustomizer> httpTracingCustomizers) {
HttpTracing httpTracing(Tracing tracing, @Nullable SkipPatternProvider provider, BeanFactory beanFactory,
@Nullable List<HttpTracingCustomizer> httpTracingCustomizers) {
HttpTracing.Builder builder = httpTracingBuilder(tracing, provider, beanFactory);
brave.http.HttpRequestParser httpClientRequestParser = httpRequestParser(beanFactory,
HttpClientRequestParser.NAME);
@@ -98,9 +97,6 @@ public class BraveHttpConfiguration {
builder.clientResponseParser(httpClientResponseParser);
}
}
else if (clientParser != null) { // consider deprecated last
builder.clientParser(clientParser);
}
if (httpServerRequestParser != null || httpServerResponseParser != null) {
if (httpServerRequestParser != null) {
@@ -110,9 +106,6 @@ public class BraveHttpConfiguration {
builder.serverResponseParser(httpServerResponseParser);
}
}
else if (serverParser != null) { // consider deprecated last
builder.serverParser(serverParser);
}
if (httpTracingCustomizers != null) {
for (HttpTracingCustomizer customizer : httpTracingCustomizers) {

14
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveAutoConfigurationTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.sleuth.autoconfig.brave;
import java.util.List;
import java.util.Map;
import brave.Tracing;
import brave.baggage.BaggageField;
@@ -95,8 +95,7 @@ public class BraveAutoConfigurationTests {
void should_use_baggageBean() {
this.contextRunner.withUserConfiguration(WithBaggageBeans.class, Baggage.class).run((context -> {
final Baggage bean = context.getBean(Baggage.class);
BDDAssertions.then(bean.fields).containsOnly(BaggageField.create("country-code"),
BaggageField.create("x-vcap-request-id"));
BDDAssertions.then(bean.fields).containsEntry("country-code", "x-vcap-request-id");
}));
}
@@ -105,7 +104,7 @@ public class BraveAutoConfigurationTests {
this.contextRunner.withPropertyValues("spring.sleuth.baggage.local-fields=bp")
.withUserConfiguration(Baggage.class).run((context -> {
final Baggage bean = context.getBean(Baggage.class);
BDDAssertions.then(bean.fields).containsExactly(BaggageField.create("bp"));
BDDAssertions.then(bean.fields).containsKey("bp");
}));
}
@@ -114,8 +113,7 @@ public class BraveAutoConfigurationTests {
this.contextRunner.withPropertyValues("spring.sleuth.baggage.local-fields=bp")
.withUserConfiguration(WithBaggageBeans.class, Baggage.class).run((context -> {
final Baggage bean = context.getBean(Baggage.class);
BDDAssertions.then(bean.fields).containsOnly(BaggageField.create("country-code"),
BaggageField.create("x-vcap-request-id"), BaggageField.create("bp"));
BDDAssertions.then(bean.fields).containsOnlyKeys("country-code", "x-vcap-request-id", "bp");
}));
}
@@ -131,7 +129,7 @@ public class BraveAutoConfigurationTests {
@Configuration(proxyBeanMethods = false)
static class Baggage {
List<BaggageField> fields;
Map<String, String> fields;
@Autowired
Baggage(Tracing tracing) {
@@ -139,7 +137,7 @@ public class BraveAutoConfigurationTests {
// TraceContextOrSamplingFlags.EMPTY
TraceContextOrSamplingFlags emptyExtraction = tracing.propagation().extractor((c, k) -> null)
.extract(Boolean.TRUE);
fields = BaggageField.getAll(emptyExtraction);
fields = BaggageField.getAllValues(emptyExtraction);
}
}

5
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/BravePropagationTests.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import brave.internal.codec.HexCodec;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
import brave.propagation.TraceContextOrSamplingFlags;
@@ -159,8 +158,8 @@ class CustomPropagator extends Propagation.Factory implements Propagation<String
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
}

5
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.cloud.sleuth.autoconfig.brave.baggage;
import java.util.Collections;
import java.util.List;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
import brave.propagation.TraceContextOrSamplingFlags;
@@ -94,8 +93,8 @@ public class CustomPropagationFactoryTests {
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
}

18
spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/CompositePropagationFactorySupplier.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.B3Propagation;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
@@ -129,8 +128,8 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
@Override
@@ -177,8 +176,8 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return propagationFactory().create(keyFactory);
public Propagation<String> get() {
return new LazyPropagation(this);
}
@Override
@@ -191,11 +190,6 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
return propagationFactory().requires128BitTraceId();
}
@Override
public Propagation<String> get() {
return new LazyPropagation(this);
}
@Override
public TraceContext decorate(TraceContext context) {
return propagationFactory().decorate(context);
@@ -260,8 +254,8 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
}

7
spring-cloud-sleuth-brave/src/main/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagation.java
View File

@@ -31,7 +31,6 @@ import brave.baggage.BaggageField;
import brave.baggage.BaggagePropagation;
import brave.baggage.BaggagePropagationConfig;
import brave.internal.baggage.BaggageFields;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
import brave.propagation.TraceContextOrSamplingFlags;
@@ -129,8 +128,8 @@ class W3CPropagation extends Propagation.Factory implements Propagation<String>
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
@Override
@@ -321,7 +320,7 @@ class W3CBaggagePropagator {
private BaggagePropagation.FactoryBuilder factory() {
return BaggagePropagation.newFactoryBuilder(new Propagation.Factory() {
@Override
public <K> Propagation<K> create(Propagation.KeyFactory<K> keyFactory) {
public Propagation<String> get() {
return null;
}
});

12
spring-cloud-sleuth-dependencies/.flattened-pom.xml
View File

@@ -100,9 +100,10 @@
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
</distributionManagement>
<properties>
<brave.opentracing.version>0.37.4</brave.opentracing.version>
<brave.opentracing.version>1.0.1</brave.opentracing.version>
<grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
<brave.version>5.13.9</brave.version>
<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
<brave.version>5.18.0</brave.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -141,6 +142,13 @@
<artifactId>spring-cloud-sleuth-tests-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-bom</artifactId>
<version>${zipkin-reporter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-bom</artifactId>

24
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -42,8 +42,9 @@
</scm>
<properties>
<brave.version>5.13.11</brave.version>
<brave.opentracing.version>0.37.5</brave.opentracing.version>
<brave.version>5.18.1</brave.version>
<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
<brave.opentracing.version>1.0.1</brave.opentracing.version>
<grpc.spring.boot.version>4.2.3</grpc.spring.boot.version>
</properties>
<dependencyManagement>
@@ -85,6 +86,13 @@
<version>${project.version}</version>
</dependency>
<!-- BRAVE -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-bom</artifactId>
<version>${zipkin-reporter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-bom</artifactId>
@@ -92,6 +100,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Brave prior to v6 had a reporter dependency. Remove that to avoid conflicts. -->
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave</artifactId>
<version>${brave.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opentracing.brave</groupId>
<artifactId>brave-opentracing</artifactId>

1
spring-cloud-sleuth-zipkin/pom.xml
View File

@@ -96,6 +96,7 @@
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
</dependency>
<!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>

4
tests/brave/spring-cloud-sleuth-instrumentation-async-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/async/TraceAsyncIntegrationTests.java
View File

@@ -24,8 +24,8 @@ import brave.handler.SpanHandler;
import brave.propagation.CurrentTraceContext;
import brave.propagation.TraceContext;
import brave.test.IntegrationTestSpanHandler;
import org.junit.ClassRule;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ public class TraceAsyncIntegrationTests {
private static final Logger log = LoggerFactory.getLogger(TraceAsyncIntegrationTests.class);
@ClassRule
@RegisterExtension
public static IntegrationTestSpanHandler spans = new IntegrationTestSpanHandler();
TraceContext context = TraceContext.newBuilder().traceId(1).spanId(2).sampled(true).build();

5
tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/web/client/MergedFactory.java
View File

@@ -20,7 +20,6 @@ import java.util.List;
import brave.Span;
import brave.internal.collect.Lists;
import brave.internal.propagation.StringPropagationAdapter;
import brave.propagation.B3Propagation;
import brave.propagation.Propagation;
import brave.propagation.TraceContext;
@@ -52,8 +51,8 @@ public class MergedFactory extends Propagation.Factory implements Propagation<St
}
@Override
public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
return StringPropagationAdapter.create(this, keyFactory);
public Propagation<String> get() {
return this;
}
}

6
tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml
View File

@@ -82,11 +82,13 @@
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>
<artifactId>zipkin-reporter-brave</artifactId>
</dependency>
<!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
<artifactId>zipkin-reporter</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>

5
tests/common/pom.xml
View File

@@ -241,12 +241,13 @@
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>
<artifactId>zipkin-reporter-brave</artifactId>
<optional>true</optional>
</dependency>
<!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder -->
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
<artifactId>zipkin-reporter</artifactId>
<optional>true</optional>
</dependency>
<dependency>