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

Going back to snapshots

Browse Source
This commit is contained in:
buildmaster
2021-03-17 22:12:44 +00:00
parent 551094af4a
commit dfc5674cea
41 changed files with 60 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/pom.xml
View File

@@ -22,7 +22,7 @@
<name>Benchmarks</name>
<description>Benchmarks (JMH)</description>
<groupId>org.springframework.cloud</groupId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<artifactId>benchmarks</artifactId>
<parent>
@@ -41,7 +41,7 @@
<okhttp.version>4.9.0</okhttp.version>
<microbenchmark-runner.version>0.2.0.RELEASE</microbenchmark-runner.version>
<jmh.version>1.26</jmh.version>
<spring-cloud-stream.version>3.1.2</spring-cloud-stream.version>
<spring-cloud-stream.version>3.1.1-SNAPSHOT</spring-cloud-stream.version>
</properties>
<dependencyManagement>

2
docs/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-sleuth-docs</artifactId>
<packaging>jar</packaging>

20
pom.xml
View File

@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Sleuth</name>
<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -62,14 +62,14 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<spring-cloud-build.version>3.0.2</spring-cloud-build.version>
<spring-cloud-commons.version>3.0.2</spring-cloud-commons.version>
<spring-cloud-gateway.version>3.0.2</spring-cloud-gateway.version>
<spring-cloud-circuitbreaker.version>2.0.1</spring-cloud-circuitbreaker.version>
<spring-cloud-stream.version>3.1.2</spring-cloud-stream.version>
<spring-cloud-function.version>3.1.2</spring-cloud-function.version>
<spring-cloud-netflix.version>3.0.2</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>3.0.2</spring-cloud-openfeign.version>
<spring-cloud-build.version>3.0.2-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>3.0.2-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-gateway.version>3.0.2-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-circuitbreaker.version>2.0.1-SNAPSHOT</spring-cloud-circuitbreaker.version>
<spring-cloud-stream.version>3.1.1-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-function.version>3.1.2-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-netflix.version>3.0.2-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>3.0.2-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>5.13.2</brave.version>
<opentracing.version>0.32.0</opentracing.version>
<spring-security-boot-autoconfigure.version>2.3.4.RELEASE</spring-security-boot-autoconfigure.version>

2
spring-cloud-sleuth-api/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

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

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-brave/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

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

@@ -1,224 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2013-2018 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.
-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>3.0.2</version>
<relativePath></relativePath>
</parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>3.0.2</version>
<packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>
<url>https://projects.spring.io/spring-cloud/spring-cloud-sleuth-dependencies/</url>
<organization>
<name>Pivotal Software, Inc.</name>
<url>https://www.spring.io</url>
</organization>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
<comments>Copyright 2014-2015 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.</comments>
</license>
</licenses>
<developers>
<developer>
<id>dsyer</id>
<name>Dave Syer</name>
<email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>https://www.spring.io</organizationUrl>
<roles>
<role>Project lead</role>
</roles>
</developer>
<developer>
<id>sgibb</id>
<name>Spencer Gibb</name>
<email>sgibb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization>
<organizationUrl>https://www.spring.io</organizationUrl>
<roles>
<role>Project lead</role>
</roles>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/spring-cloud/spring-cloud-sleuth.git</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-sleuth.git</developerConnection>
<url>https://github.com/spring-cloud/spring-cloud-sleuth</url>
</scm>
<distributionManagement>
<repository>
<id>repo.spring.io</id>
<name>Spring Release Repository</name>
<url>https://repo.spring.io/libs-release-local</url>
</repository>
<snapshotRepository>
<id>repo.spring.io</id>
<name>Spring Snapshot Repository</name>
<url>https://repo.spring.io/libs-snapshot-local</url>
</snapshotRepository>
<site>
<id>spring-docs</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/3.0.2/spring-cloud-sleuth-dependencies</url>
</site>
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
</distributionManagement>
<properties>
<brave.opentracing.version>0.37.4</brave.opentracing.version>
<grpc.spring.boot.version>4.2.2</grpc.spring.boot.version>
<brave.version>5.13.2</brave.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-instrumentation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-brave</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-sleuth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave-bom</artifactId>
<version>${brave.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentracing.brave</groupId>
<artifactId>brave-opentracing</artifactId>
<version>${brave.opentracing.version}</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>io.zipkin.brave</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.github.lognet</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
<version>${grpc.spring.boot.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>
<profile>
<id>spring</id>
<repositories>
<repository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</repository>
<repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
</pluginRepository>
<pluginRepository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</project>

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

@@ -22,11 +22,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>

2
spring-cloud-sleuth-instrumentation/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

1
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java
View File

@@ -114,5 +114,4 @@ public class MessageHeaderPropagatorGetter implements Propagator.Getter<MessageH
public String toString() {
return "MessageHeaderPropagatorGetter{}";
}
}

2
spring-cloud-sleuth-samples/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

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

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-starter-sleuth/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-sleuth</artifactId>

2
tests/brave/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

6
tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java
View File

@@ -63,11 +63,9 @@ public class MultipleHopsIntegrationTests
// baz is not tagged in the initial span, only downstream!
then(this.application.allSpans()).as("All downstream have country-code")
.filteredOn(span -> !span.equals(initialSpan))
// it propagates only and all the `spring.sleuth.baggage.remote-fields` in
// case insensitive way
// it propagates only and all the `spring.sleuth.baggage.remote-fields` in case insensitive way
.allMatch(span -> "FO".equals(COUNTRY_CODE.getValue(BraveAccessor.traceContext(span.context()))))
.allMatch(span -> "123"
.equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context()))))
.allMatch(span -> "123".equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context()))))
.allMatch(span -> NOT_PROPAGATED_HEADER.getValue(BraveAccessor.traceContext(span.context())) == null);
}

2
tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

16
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java
View File

@@ -48,11 +48,15 @@ public class TracingChannelInterceptorTest
this.testTracing = new BraveTestTracing() {
@Override
public Tracing.Builder tracingBuilder() {
return super.tracingBuilder().propagationFactory(BaggagePropagation
.newFactoryBuilder(B3Propagation.newFactoryBuilder().injectFormat(SINGLE).build())
.add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id")))
.add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id")))
.build());
return super.tracingBuilder()
.propagationFactory(BaggagePropagation.newFactoryBuilder(B3Propagation.newFactoryBuilder()
.injectFormat(SINGLE)
.build()
)
.add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id")))
.add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id")))
.build()
);
}
};
this.testTracing.reset();
@@ -73,7 +77,7 @@ public class TracingChannelInterceptorTest
TraceContext receiveContext = parseB3SingleFormat(
((List) ((Map) this.channel.receive().getHeaders().get(NATIVE_HEADERS)).get("b3")).get(0).toString())
.context();
.context();
assertThat(receiveContext.parentIdString()).isEqualTo("000000000000000b");
}

2
tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

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

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests-brave</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
tests/common/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-tests</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java
View File

@@ -381,8 +381,7 @@ public abstract class TracingChannelInterceptorTest implements TestTracingAwareS
Message<?> actualMessage = channel.receive();
assertThat(actualMessage.getHeaders()).isNotEmpty();
LinkedMultiValueMap<String, String> actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders()
.get(NATIVE_HEADERS);
LinkedMultiValueMap<String, String> actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders().get(NATIVE_HEADERS);
assertThat(actualNativeHeaders).isNotEmpty();
assertThat(actualNativeHeaders.get("not-propagated-header")).isNull();
assertThat(actualNativeHeaders.get("Foo-Id")).isEqualTo(singletonList("123"));

2
tests/pom.xml
View File

@@ -30,7 +30,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>3.0.2</version>
<version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>