Remove MetricsIntegrationTests as it duplicates other tests
automaticallyRegisteredBinders Many other tests that check that MeterBinder beans are defined metricsFilterRegisteredForAsyncDispatches filterRegistrationHasExpectedDispatcherTypesAndOrder in WebMvcObservationAutoConfigurationTests restTemplateIsInstrumented restTemplateCreatedWithBuilderIsInstrumented in RestTemplateObservationAutoConfigurationTests requestMappingIsInstrumented Various tests in WebMvcObservationAutoConfigurationTests
This commit is contained in:
Andy Wilkinson
committed by
Phillip Webb
Phillip Webb
parent
0fabb090b6
commit
e81b34311f
@@ -1,186 +0,0 @@
|
||||
/*
|
||||
* Copyright 2012-2025 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.boot.actuate.autoconfigure.metrics.test;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CyclicBarrier;
|
||||
|
||||
import io.micrometer.core.instrument.MeterRegistry;
|
||||
import io.micrometer.core.instrument.MockClock;
|
||||
import io.micrometer.core.instrument.binder.MeterBinder;
|
||||
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
|
||||
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
|
||||
import io.micrometer.core.instrument.simple.SimpleConfig;
|
||||
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
|
||||
import jakarta.servlet.DispatcherType;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
|
||||
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
|
||||
import org.springframework.boot.jdbc.metrics.autoconfigure.DataSourcePoolMetricsAutoConfiguration;
|
||||
import org.springframework.boot.jpa.hibernate.metrics.autoconfigure.HibernateMetricsAutoConfiguration;
|
||||
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
|
||||
import org.springframework.boot.metrics.autoconfigure.jvm.JvmMetricsAutoConfiguration;
|
||||
import org.springframework.boot.metrics.autoconfigure.logging.logback.LogbackMetricsAutoConfiguration;
|
||||
import org.springframework.boot.metrics.autoconfigure.system.SystemMetricsAutoConfiguration;
|
||||
import org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration;
|
||||
import org.springframework.boot.restclient.RestTemplateBuilder;
|
||||
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
|
||||
import org.springframework.boot.restclient.autoconfigure.observation.RestTemplateObservationAutoConfiguration;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
|
||||
import org.springframework.boot.web.server.test.client.TestRestTemplate;
|
||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||
import org.springframework.boot.webflux.observation.autoconfigure.WebFluxObservationAutoConfiguration;
|
||||
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
|
||||
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
|
||||
import org.springframework.boot.webmvc.observation.autoconfigure.WebMvcObservationAutoConfiguration;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
import org.springframework.test.web.client.MockRestServiceServer;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
import org.springframework.web.filter.ServerHttpObservationFilter;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.awaitility.Awaitility.waitAtMost;
|
||||
import static org.springframework.test.web.client.ExpectedCount.once;
|
||||
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
|
||||
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
|
||||
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
|
||||
|
||||
/**
|
||||
* Integration tests for Metrics.
|
||||
*
|
||||
* @author Jon Schneider
|
||||
*/
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = MetricsIntegrationTests.MetricsApp.class,
|
||||
properties = "management.metrics.use-global-registry=false")
|
||||
class MetricsIntegrationTests {
|
||||
|
||||
@Autowired
|
||||
private ApplicationContext context;
|
||||
|
||||
@Autowired
|
||||
private RestTemplate external;
|
||||
|
||||
@Autowired
|
||||
private TestRestTemplate loopback;
|
||||
|
||||
@Autowired
|
||||
private MeterRegistry registry;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
this.registry.clear();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Test
|
||||
void restTemplateIsInstrumented() {
|
||||
MockRestServiceServer server = MockRestServiceServer.bindTo(this.external).build();
|
||||
server.expect(once(), requestTo("/api/external"))
|
||||
.andExpect(method(HttpMethod.GET))
|
||||
.andRespond(withSuccess("{\"message\": \"hello\"}", MediaType.APPLICATION_JSON));
|
||||
assertThat(this.external.getForObject("/api/external", Map.class)).containsKey("message");
|
||||
assertThat(this.registry.get("http.client.requests").timer().count()).isOne();
|
||||
}
|
||||
|
||||
@Test
|
||||
void requestMappingIsInstrumented() {
|
||||
this.loopback.getForObject("/api/people", Set.class);
|
||||
waitAtMost(Duration.ofSeconds(5))
|
||||
.untilAsserted(() -> assertThat(this.registry.get("http.server.requests").timer().count()).isOne());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
void automaticallyRegisteredBinders() {
|
||||
assertThat(this.context.getBeansOfType(MeterBinder.class).values())
|
||||
.hasAtLeastOneElementOfType(LogbackMetrics.class)
|
||||
.hasAtLeastOneElementOfType(JvmMemoryMetrics.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
void metricsFilterRegisteredForAsyncDispatches() {
|
||||
Map<String, FilterRegistrationBean> filterRegistrations = this.context
|
||||
.getBeansOfType(FilterRegistrationBean.class);
|
||||
assertThat(filterRegistrations).containsKey("webMvcObservationFilter");
|
||||
FilterRegistrationBean registration = filterRegistrations.get("webMvcObservationFilter");
|
||||
assertThat(registration.getFilter()).isInstanceOf(ServerHttpObservationFilter.class);
|
||||
assertThat((Set<DispatcherType>) ReflectionTestUtils.getField(registration, "dispatcherTypes"))
|
||||
.containsExactlyInAnyOrder(DispatcherType.REQUEST, DispatcherType.ASYNC);
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ImportAutoConfiguration({ MetricsAutoConfiguration.class, ObservationAutoConfiguration.class,
|
||||
ObservabilityAutoConfiguration.class, JvmMetricsAutoConfiguration.class,
|
||||
LogbackMetricsAutoConfiguration.class, SystemMetricsAutoConfiguration.class,
|
||||
DataSourcePoolMetricsAutoConfiguration.class, HibernateMetricsAutoConfiguration.class,
|
||||
RestTemplateObservationAutoConfiguration.class, WebFluxObservationAutoConfiguration.class,
|
||||
WebMvcObservationAutoConfiguration.class, JacksonAutoConfiguration.class,
|
||||
HttpMessageConvertersAutoConfiguration.class, RestTemplateAutoConfiguration.class,
|
||||
WebMvcAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
|
||||
TomcatServletWebServerAutoConfiguration.class, TomcatServletWebServerAutoConfiguration.class })
|
||||
@Import(PersonController.class)
|
||||
static class MetricsApp {
|
||||
|
||||
@Primary
|
||||
@Bean
|
||||
MeterRegistry registry() {
|
||||
return new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock());
|
||||
}
|
||||
|
||||
@Bean
|
||||
RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) {
|
||||
return restTemplateBuilder.build();
|
||||
}
|
||||
|
||||
@Bean
|
||||
CyclicBarrier cyclicBarrier() {
|
||||
return new CyclicBarrier(2);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@RestController
|
||||
static class PersonController {
|
||||
|
||||
@GetMapping("/api/people")
|
||||
Set<String> personName() {
|
||||
return Collections.singleton("Jon");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user