From a5d8893baaad7ec5d8cb02f60b6c56c9eb67279c Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 15 Jun 2019 23:16:08 +0800 Subject: [PATCH 1/8] Updates to latest Brave (#1373) --- benchmarks/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- .../sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java | 2 +- .../cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 48213fc30..367001457 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -34,7 +34,7 @@ 1.8 1.8 2.1.3.RELEASE - 5.4.3 + 5.6.5 diff --git a/pom.xml b/pom.xml index 9f80d2eda..8bc37d111 100644 --- a/pom.xml +++ b/pom.xml @@ -265,7 +265,7 @@ 2.1.1.BUILD-SNAPSHOT 2.1.1.BUILD-SNAPSHOT - 5.6.1 + 5.6.5 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 5e574e145..7f5e8f0ed 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -31,7 +31,7 @@ spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies - 0.33.10 + 0.33.13 3.0.1 diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index e90434e45..7b476f7c9 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -73,7 +73,7 @@ io.zipkin.zipkin2 zipkin - 2.12.0 + 2.14.2 diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index e4eace65f..fad01add6 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -80,7 +80,7 @@ io.zipkin.reporter2 - zipkin-sender-kafka11 + zipkin-sender-kafka diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java index 1fb894d6f..f4b500360 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.kafka.common.serialization.ByteArraySerializer; import zipkin2.reporter.Sender; -import zipkin2.reporter.kafka11.KafkaSender; +import zipkin2.reporter.kafka.KafkaSender; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java index 22b1076a9..2d290a316 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java @@ -37,7 +37,7 @@ import zipkin2.reporter.AsyncReporter; import zipkin2.reporter.Reporter; import zipkin2.reporter.Sender; import zipkin2.reporter.amqp.RabbitMQSender; -import zipkin2.reporter.kafka11.KafkaSender; +import zipkin2.reporter.kafka.KafkaSender; import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; From 023f1e5fda82857c0e58ab86bc6b6b86f9825c21 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 20 Jun 2019 14:49:44 -0400 Subject: [PATCH 2/8] Bumps spring cloud build to 2.1.6.BUILD-SNAPSHOT --- pom.xml | 12 ++++++------ .../client/feign/issues/issue362/Issue362Tests.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8bc37d111..d1c3b11fa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.4.BUILD-SNAPSHOT + 2.1.6.BUILD-SNAPSHOT @@ -258,12 +258,12 @@ 1.8 1.8 1.8 - 2.1.4.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 2.1.6.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT Fishtown.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT 5.6.5 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java index 3ac508e8c..ee49aa591 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java @@ -208,8 +208,8 @@ class CustomConfig { public Exception decode(String methodKey, Response response) { this.feignComponentAsserter.executedComponents.put(ErrorDecoder.class, true); if (response.status() == 409) { - return new RetryableException("Article not Ready", Request.HttpMethod.GET, - new Date()); + return new RetryableException(response.status(), "Article not Ready", + Request.HttpMethod.GET, new Date()); } else { return super.decode(methodKey, response); From cc0b3341a5697f7866e95a1cc10b03770771d3dc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 21:25:35 +0000 Subject: [PATCH 3/8] Update SNAPSHOT to 2.1.2.RELEASE --- README.adoc | 8 ++++++-- benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 17 ++++++++--------- spring-cloud-sleuth-core/pom.xml | 2 +- .../web/TraceWebAutoConfiguration.java | 8 +++----- .../web/SkipPatternProviderConfigTest.java | 3 ++- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 19 files changed, 36 insertions(+), 34 deletions(-) diff --git a/README.adoc b/README.adoc index 096658952..3a556fc81 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,8 @@ -// Do not edit this file (e.g. go instead to src/main/asciidoc) +//// +DO NOT EDIT THIS FILE. IT WAS GENERATED. +Manual changes to this file will be lost when it is generated again. +Edit the files in the src/main/asciidoc/ directory instead. +//// :jdkversion: 1.8 :github-tag: master @@ -715,7 +719,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://compose.docker.io/[Docker Compose] to run the middeware servers +https://docs.docker.com/compose/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 367001457..90aa581da 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.3.RELEASE + 2.1.6.RELEASE 5.6.5 diff --git a/docs/pom.xml b/docs/pom.xml index 0c8de5bad..f334735fa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index d1c3b11fa..9db25fe78 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.6.BUILD-SNAPSHOT + 2.1.6.RELEASE @@ -258,13 +258,12 @@ 1.8 1.8 1.8 - 2.1.6.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - Fishtown.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - + 2.1.6.RELEASE + 2.1.2.RELEASE + 2.1.2.RELEASE + Fishtown.SR3 + 2.1.2.RELEASE + 2.1.2.RELEASE 5.6.5 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index deb9b763c..5859c8444 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 248f428bb..737afeccb 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -122,8 +122,7 @@ public class TraceWebAutoConfiguration { String basePath = webEndpointProperties.getBasePath(); String pattern = endpoints.stream().map(PathMappedEndpoint::getRootPath) .map(path -> path + "|" + path + "/.*") - .collect(Collectors.joining("|", - getPathPrefix(contextPath, basePath), + .collect(Collectors.joining("|", getPathPrefix(contextPath, basePath), getPathSuffix(contextPath, basePath))); if (StringUtils.hasText(pattern)) { return Optional.of(Pattern.compile(pattern)); @@ -149,9 +148,8 @@ public class TraceWebAutoConfiguration { private static String getPathSuffix(String contextPath, String actuatorBasePath) { String result = ")"; - if (StringUtils.hasText(contextPath) || - (StringUtils.hasText(actuatorBasePath) - && !"/".equals(actuatorBasePath))) { + if (StringUtils.hasText(contextPath) || (StringUtils.hasText(actuatorBasePath) + && !"/".equals(actuatorBasePath))) { result += ")?"; } return result; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java index 0ec2a0eb1..05744e668 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java @@ -181,7 +181,8 @@ public class SkipPatternProviderConfigTest { .skipPattern(); then(pattern).isNotEmpty(); - then(pattern.get().pattern()).isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); + then(pattern.get().pattern()) + .isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); } @Test diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 7f5e8f0ed..a06f40b1b 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -22,11 +22,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.3.BUILD-SNAPSHOT + 2.1.6.RELEASE spring-cloud-sleuth-dependencies - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 7b476f7c9..145e044ce 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml index 83d5c6c21..595c3c22d 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index bbe022ce6..9ccd4746f 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index d5f669fda..f06a3f837 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index ae625b8d6..429d1afe4 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index eac7b92b0..7ff469319 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index a0616670b..458bfbbc1 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index 0f022e596..28281d8d1 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index fad01add6..c86b69f37 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index d437c6cd8..b627b7115 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index a2791401f..41d03ea38 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. spring-cloud-starter-zipkin From 0a4e7b5d7bc39ee1329c849767bb6426b32dde8b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 21:26:50 +0000 Subject: [PATCH 4/8] Going back to snapshots --- README.adoc | 8 ++------ benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 17 +++++++++-------- spring-cloud-sleuth-core/pom.xml | 2 +- .../web/TraceWebAutoConfiguration.java | 8 +++++--- .../web/SkipPatternProviderConfigTest.java | 3 +-- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 19 files changed, 34 insertions(+), 36 deletions(-) diff --git a/README.adoc b/README.adoc index 3a556fc81..096658952 100644 --- a/README.adoc +++ b/README.adoc @@ -1,8 +1,4 @@ -//// -DO NOT EDIT THIS FILE. IT WAS GENERATED. -Manual changes to this file will be lost when it is generated again. -Edit the files in the src/main/asciidoc/ directory instead. -//// +// Do not edit this file (e.g. go instead to src/main/asciidoc) :jdkversion: 1.8 :github-tag: master @@ -719,7 +715,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://docs.docker.com/compose/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 90aa581da..367001457 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.6.RELEASE + 2.1.3.RELEASE 5.6.5 diff --git a/docs/pom.xml b/docs/pom.xml index f334735fa..0c8de5bad 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 9db25fe78..d1c3b11fa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.6.RELEASE + 2.1.6.BUILD-SNAPSHOT @@ -258,12 +258,13 @@ 1.8 1.8 1.8 - 2.1.6.RELEASE - 2.1.2.RELEASE - 2.1.2.RELEASE - Fishtown.SR3 - 2.1.2.RELEASE - 2.1.2.RELEASE + 2.1.6.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + Fishtown.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + 2.1.2.BUILD-SNAPSHOT + 5.6.5 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 5859c8444..deb9b763c 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 737afeccb..248f428bb 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -122,7 +122,8 @@ public class TraceWebAutoConfiguration { String basePath = webEndpointProperties.getBasePath(); String pattern = endpoints.stream().map(PathMappedEndpoint::getRootPath) .map(path -> path + "|" + path + "/.*") - .collect(Collectors.joining("|", getPathPrefix(contextPath, basePath), + .collect(Collectors.joining("|", + getPathPrefix(contextPath, basePath), getPathSuffix(contextPath, basePath))); if (StringUtils.hasText(pattern)) { return Optional.of(Pattern.compile(pattern)); @@ -148,8 +149,9 @@ public class TraceWebAutoConfiguration { private static String getPathSuffix(String contextPath, String actuatorBasePath) { String result = ")"; - if (StringUtils.hasText(contextPath) || (StringUtils.hasText(actuatorBasePath) - && !"/".equals(actuatorBasePath))) { + if (StringUtils.hasText(contextPath) || + (StringUtils.hasText(actuatorBasePath) + && !"/".equals(actuatorBasePath))) { result += ")?"; } return result; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java index 05744e668..0ec2a0eb1 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java @@ -181,8 +181,7 @@ public class SkipPatternProviderConfigTest { .skipPattern(); then(pattern).isNotEmpty(); - then(pattern.get().pattern()) - .isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); + then(pattern.get().pattern()).isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); } @Test diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index a06f40b1b..7f5e8f0ed 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -22,11 +22,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.6.RELEASE + 2.1.3.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 145e044ce..7b476f7c9 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml index 595c3c22d..83d5c6c21 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index 9ccd4746f..bbe022ce6 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index f06a3f837..d5f669fda 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index 429d1afe4..ae625b8d6 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index 7ff469319..eac7b92b0 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index 458bfbbc1..a0616670b 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index 28281d8d1..0f022e596 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index c86b69f37..fad01add6 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index b627b7115..d437c6cd8 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 41d03ea38..a2791401f 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 74c2b0b6182ba7271cf6900080e7470ed86559f4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 21:26:50 +0000 Subject: [PATCH 5/8] Bumping versions to 2.1.3.BUILD-SNAPSHOT after release --- benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 367001457..7f406e2ae 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.3.RELEASE + 2.1.6.RELEASE 5.6.5 diff --git a/docs/pom.xml b/docs/pom.xml index 0c8de5bad..1871e484f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index d1c3b11fa..bf311cbc9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index deb9b763c..b0d30634b 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 7f5e8f0ed..e49e6eb61 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -26,7 +26,7 @@ spring-cloud-sleuth-dependencies - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 7b476f7c9..48942b445 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml index 83d5c6c21..faac49150 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index bbe022ce6..2f4b46eaf 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index d5f669fda..e2fc0d1a8 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index ae625b8d6..a6222a7bf 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index eac7b92b0..4cd881f3c 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index a0616670b..1d63b0d39 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index 0f022e596..fb3b284ef 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index fad01add6..86882dacc 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index d437c6cd8..2adb26483 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index a2791401f..19aed93db 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From f5c3e431a3ca1126e82a5c6f3929e49938888fd3 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jun 2019 12:50:55 -0400 Subject: [PATCH 6/8] Bumps spring cloud build to 2.1.7.BUILD-SNAPSHOT Bumps spring cloud deps --- pom.xml | 12 ++++++------ spring-cloud-sleuth-dependencies/pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index bf311cbc9..c3eed2484 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.6.BUILD-SNAPSHOT + 2.1.7.BUILD-SNAPSHOT @@ -258,12 +258,12 @@ 1.8 1.8 1.8 - 2.1.6.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT + 2.1.7.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT Fishtown.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT 5.6.5 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index e49e6eb61..a256f5864 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -22,7 +22,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.3.BUILD-SNAPSHOT + 2.1.7.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies From 7d38e7f6168fcefe315e006bd873e45093438c7d Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 2 Jul 2019 09:24:54 +0800 Subject: [PATCH 7/8] Updates to latest brave --- benchmarks/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 7f406e2ae..a8f48c92c 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -34,7 +34,7 @@ 1.8 1.8 2.1.6.RELEASE - 5.6.5 + 5.6.6 diff --git a/pom.xml b/pom.xml index c3eed2484..fda1cfac9 100644 --- a/pom.xml +++ b/pom.xml @@ -265,7 +265,7 @@ 2.1.3.BUILD-SNAPSHOT 2.1.3.BUILD-SNAPSHOT - 5.6.5 + 5.6.6 2.1.2.RELEASE From c6f03191e81531c1d937c6632f9066923d5b4718 Mon Sep 17 00:00:00 2001 From: liaochuntao Date: Tue, 2 Jul 2019 14:51:49 +0800 Subject: [PATCH 8/8] Invalid property name resolution fix fixes gh-1376 --- .../web/TraceWebAutoConfiguration.java | 8 +- .../web/SkipPatternProviderConfigTest.java | 3 +- ...ZipkinRestTemplateSenderConfiguration.java | 4 +- ...inRestTemplateSenderConfigurationTest.java | 97 +++++++++++++++++++ 4 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 248f428bb..737afeccb 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -122,8 +122,7 @@ public class TraceWebAutoConfiguration { String basePath = webEndpointProperties.getBasePath(); String pattern = endpoints.stream().map(PathMappedEndpoint::getRootPath) .map(path -> path + "|" + path + "/.*") - .collect(Collectors.joining("|", - getPathPrefix(contextPath, basePath), + .collect(Collectors.joining("|", getPathPrefix(contextPath, basePath), getPathSuffix(contextPath, basePath))); if (StringUtils.hasText(pattern)) { return Optional.of(Pattern.compile(pattern)); @@ -149,9 +148,8 @@ public class TraceWebAutoConfiguration { private static String getPathSuffix(String contextPath, String actuatorBasePath) { String result = ")"; - if (StringUtils.hasText(contextPath) || - (StringUtils.hasText(actuatorBasePath) - && !"/".equals(actuatorBasePath))) { + if (StringUtils.hasText(contextPath) || (StringUtils.hasText(actuatorBasePath) + && !"/".equals(actuatorBasePath))) { result += ")?"; } return result; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java index 0ec2a0eb1..05744e668 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java @@ -181,7 +181,8 @@ public class SkipPatternProviderConfigTest { .skipPattern(); then(pattern).isNotEmpty(); - then(pattern.get().pattern()).isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); + then(pattern.get().pattern()) + .isEqualTo("foo(/|/(info|info/.*|health|health/.*))?"); } @Test diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java index 146f2b0b3..1af0a7d0f 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java @@ -91,7 +91,7 @@ class ZipkinRestTemplateSenderConfiguration { static class DiscoveryClientZipkinUrlExtractorConfiguration { @Configuration - @ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "true", matchIfMissing = true) static class ZipkinClientLoadBalancedConfiguration { @Autowired(required = false) @@ -108,7 +108,7 @@ class ZipkinRestTemplateSenderConfiguration { } @Configuration - @ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false") + @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "false") static class ZipkinClientNoOpConfiguration { @Bean diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java new file mode 100644 index 000000000..2f35ef366 --- /dev/null +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfigurationTest.java @@ -0,0 +1,97 @@ +/* + * Copyright 2013-2019 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.sender; + +import org.junit.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +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.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.sleuth.zipkin2.ZipkinLoadBalancer; +import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author liaochuntao + */ +public class ZipkinRestTemplateSenderConfigurationTest { + + @Test + public void disableZipkinDiscoveryClient() { + ConfigurableApplicationContext ctxt = new SpringApplication( + ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class, + ZipkinProperties.class) + .run("--spring.zipkin.discovery-client-enabled=false"); + assertThat(ctxt.getBean(ZipkinLoadBalancer.class)) + .isInstanceOf(NoOpZipkinLoadBalancer.class); + ctxt.close(); + } + + @Test + public void enableZipkinDiscoveryClient() { + ConfigurableApplicationContext ctxt = new SpringApplication( + ZipkinRestTemplateSenderConfigurationTest.MyDiscoveryClientZipkinUrlExtractorConfiguration.class, + ZipkinProperties.class) + .run("--spring.zipkin.discovery-client-enabled=true"); + assertThat(ctxt.getBean(ZipkinLoadBalancer.class)) + .isInstanceOf(LoadBalancerClientZipkinLoadBalancer.class); + ctxt.close(); + } + + @Configuration + @ConditionalOnClass(LoadBalancerClient.class) + static class MyDiscoveryClientZipkinUrlExtractorConfiguration { + + @Configuration + @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "true", matchIfMissing = true) + static class ZipkinClientLoadBalancedConfiguration { + + @Autowired(required = false) + LoadBalancerClient client; + + @Bean + @ConditionalOnMissingBean + ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer( + ZipkinProperties zipkinProperties) { + return new LoadBalancerClientZipkinLoadBalancer(this.client, + zipkinProperties); + } + + } + + @Configuration + @ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled", havingValue = "false") + static class ZipkinClientNoOpConfiguration { + + @Bean + @ConditionalOnMissingBean + ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) { + return new NoOpZipkinLoadBalancer(zipkinProperties); + } + + } + + } + +}