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

Update SNAPSHOT to 2.1.2.RELEASE

Browse Source
This commit is contained in:
buildmaster
2019-06-20 21:25:35 +00:00
parent 023f1e5fda
commit cc0b3341a5
19 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -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;

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
View File

@@ -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