root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.1.x' 

Closes gh-38610
This commit is contained in:
Moritz Halbritter 2023-11-30 09:03:27 +01:00
parent 8de81cb06e 203cd542c0
commit 6cb9af11e8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java
View File

@ -30,6 +30,7 @@ import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
import io.micrometer.core.instrument.simple.SimpleConfig; import io.micrometer.core.instrument.simple.SimpleConfig;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -99,6 +100,11 @@ class MetricsIntegrationTests {
@Autowired @Autowired
private MeterRegistry registry; private MeterRegistry registry;
@BeforeEach
void setUp() {
this.registry.clear();
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
void restTemplateIsInstrumented() { void restTemplateIsInstrumented() {