From 3799170c4d5535fb40cb4c357ee7c4876561cd78 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 10 Jun 2022 14:15:28 +0200 Subject: [PATCH] Disable metrics and tracing in web endpoints integration tests See gh-31308 --- ...ebEndpointsAutoConfigurationIntegrationTests.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java index ec1612f0bd7..37ac6e7c3ba 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java @@ -19,9 +19,6 @@ package org.springframework.boot.actuate.autoconfigure.integrationtest; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringBootConfiguration; -import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryAutoConfiguration; import org.springframework.boot.actuate.health.HealthEndpointWebExtension; import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -67,12 +64,14 @@ class WebEndpointsAutoConfigurationIntegrationTests { private WebApplicationContextRunner servletWebRunner() { return new WebApplicationContextRunner() - .withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class)); + .withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class)).withPropertyValues( + "management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false"); } private ReactiveWebApplicationContextRunner reactiveWebRunner() { return new ReactiveWebApplicationContextRunner() - .withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class)); + .withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class)).withPropertyValues( + "management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false"); } @EnableAutoConfiguration(exclude = { FlywayAutoConfiguration.class, LiquibaseAutoConfiguration.class, @@ -81,8 +80,7 @@ class WebEndpointsAutoConfigurationIntegrationTests { MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class, RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class, RedisAutoConfiguration.class, - RedisRepositoriesAutoConfiguration.class, MetricsAutoConfiguration.class, BraveAutoConfiguration.class, - OpenTelemetryAutoConfiguration.class }) + RedisRepositoriesAutoConfiguration.class }) @SpringBootConfiguration static class WebEndpointTestApplication {