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

Updated sc-build

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-02-25 16:16:10 +01:00
parent cc75be4c55
commit 83f888ad24
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -29,7 +29,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.3.BUILD-SNAPSHOT</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -252,7 +252,7 @@
<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>2.1.3.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-build.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-gateway.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-stream.version>Fishtown.BUILD-SNAPSHOT</spring-cloud-stream.version>

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

@@ -107,7 +107,8 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(pattern).isNotEmpty();
@@ -129,7 +130,8 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(pattern).isNotEmpty();
@@ -151,7 +153,8 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(pattern).isNotEmpty();
@@ -173,7 +176,8 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(pattern).isNotEmpty();
@@ -195,19 +199,22 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsDifferentPort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternDifferentPort).isNotEmpty();
then(patternDifferentPort.get().pattern()).isEqualTo("/(info|info/.*|health|health/.*)");
then(patternDifferentPort.get().pattern())
.isEqualTo("/(info|info/.*|health|health/.*)");
Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternSamePort).isNotEmpty();
then(patternSamePort.get().pattern())
.isEqualTo("foo/(info|info/.*|health|health/.*)");
.isEqualTo("foo/(info|info/.*|health|health/.*)");
}
@Test
@@ -225,17 +232,19 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsDifferentPort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternDifferentPort).isNotEmpty();
then(patternDifferentPort.get().pattern())
.isEqualTo("/mgt/(info|info/.*|health|health/.*)");
Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternSamePort).isNotEmpty();
then(patternSamePort.get().pattern())
.isEqualTo("foo/mgt/(info|info/.*|health|health/.*)");
@@ -256,18 +265,22 @@ public class SkipPatternProviderConfigTest {
};
Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsDifferentPort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternDifferentPort).isNotEmpty();
then(patternDifferentPort.get().pattern()).isEqualTo("/actuator/(info|info/.*|health|health/.*)");
then(patternDifferentPort.get().pattern())
.isEqualTo("/actuator/(info|info/.*|health|health/.*)");
Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
.skipPatternForActuatorEndpointsSamePort(properties,
webEndpointProperties, endpointsSupplier)
.skipPattern();
then(patternSamePort).isNotEmpty();
then(patternSamePort.get().pattern()).isEqualTo("/foo/actuator/(info|info/.*|health|health/.*)");
then(patternSamePort.get().pattern())
.isEqualTo("/foo/actuator/(info|info/.*|health|health/.*)");
}
@Test