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

Fixed the build for boot 2.5

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-04-06 11:35:54 +02:00
parent dc71088ff0
commit 00b4771a74
1 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/instrument/web/SkipPatternProviderConfigTest.java
View File

@@ -106,7 +106,9 @@ public class SkipPatternProviderConfigTest {
contextRunner
.withConfiguration(
UserConfigurations.of(ManagementContextAutoConfiguration.class, ServerPropertiesConfig.class))
.withPropertyValues("management.server.servlet.context-path=foo").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", "foo.*",
SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -118,7 +120,9 @@ public class SkipPatternProviderConfigTest {
contextRunner
.withConfiguration(
UserConfigurations.of(ManagementContextAutoConfiguration.class, ServerPropertiesConfig.class))
.withPropertyValues("management.server.servlet.context-path=${test:value}").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.server.servlet.context-path=${test:value}")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", "value.*",
SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -137,16 +141,19 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_without_context_path() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class)).run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.exposure.include=health,info").run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});
}
@Test
public void should_return_endpoints_with_context_path() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("server.servlet.context-path=foo").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo/actuator(/|/(health|health/.*|info|info/.*))?",
SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -156,7 +163,9 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_with_placeholders() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("server.servlet.context-path=${test:foo}").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"server.servlet.context-path=${test:foo}")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo/actuator(/|/(health|health/.*|info|info/.*))?",
SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -166,7 +175,9 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_without_context_path_and_base_path_set_to_root() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/(health|health/.*|info|info/.*)", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});
@@ -175,7 +186,9 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_without_context_path_and_base_path_set_to_root_with_placeholders() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=${test:/}").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=${test:/}")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/(health|health/.*|info|info/.*)", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});
@@ -184,7 +197,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_and_base_path_set_to_root() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/", "server.servlet.context-path=foo")
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/", "server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -194,7 +208,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_and_base_path_set_to_root_with_placeholder() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=${test:/}", "server.servlet.context-path=foo")
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=${test:/}", "server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -204,7 +219,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_and_base_path_set_to_root_different_port() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/", "management.server.port=0",
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/", "management.server.port=0",
"server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
@@ -217,7 +233,8 @@ public class SkipPatternProviderConfigTest {
contextRunner
.withConfiguration(
UserConfigurations.of(ServerPropertiesConfig.class, ManagementServerPropertiesConfig.class))
.withPropertyValues("management.server.base-path=/foo", "management.endpoints.web.base-path=/actuator",
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.server.base-path=/foo", "management.endpoints.web.base-path=/actuator",
"management.server.port=0")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
@@ -229,7 +246,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_and_base_path_set_to_root_different_port_with_placeholder() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/", "management.server.port=${some-port:0}",
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/", "management.server.port=${some-port:0}",
"server.servlet.context-path=${some-path:foo}")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
@@ -240,7 +258,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_actuator_context_path_only() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/mgt", "server.servlet.context-path=foo")
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/mgt", "server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo/mgt(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -250,8 +269,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_actuator_context_path_only_with_placeholder() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/${test:mgt}",
"server.servlet.context-path=${test2:foo}")
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/${test:mgt}", "server.servlet.context-path=${test2:foo}")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"foo/mgt(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
@@ -261,7 +280,9 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_actuator_default_context_path_different_port() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.server.port=0", "server.servlet.context-path=foo").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info", "management.server.port=0",
"server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});
@@ -270,7 +291,8 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_actuator_context_path_only_different_port() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.endpoints.web.base-path=/mgt", "management.server.port=0",
.withPropertyValues("management.endpoints.web.exposure.include=health,info",
"management.endpoints.web.base-path=/mgt", "management.server.port=0",
"server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
@@ -281,7 +303,9 @@ public class SkipPatternProviderConfigTest {
@Test
public void should_return_endpoints_with_context_path_different_port() {
contextRunner.withConfiguration(UserConfigurations.of(ServerPropertiesConfig.class))
.withPropertyValues("management.server.port=0", "server.servlet.context-path=foo").run(context -> {
.withPropertyValues("management.endpoints.web.exposure.include=health,info", "management.server.port=0",
"server.servlet.context-path=foo")
.run(context -> {
BDDAssertions.then(extractAllPatterns(context)).containsExactlyInAnyOrder(
"/actuator(/|/(health|health/.*|info|info/.*))?", SleuthWebProperties.DEFAULT_SKIP_PATTERN);
});