Merge branch '3.1.x'

Closes gh-38610
spring-projects · Nov 30, 2023 · 6cb9af1 · 6cb9af1
2 parents 8de81cb + 203cd54
commit 6cb9af1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.../org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/.../org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java
@@ -30,6 +30,7 @@
 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;
@@ -99,6 +100,11 @@ class MetricsIntegrationTests {
 	@Autowired
 	private MeterRegistry registry;
 
+	@BeforeEach
+	void setUp() {
+		this.registry.clear();
+	}
+
 	@SuppressWarnings("unchecked")
 	@Test
 	void restTemplateIsInstrumented() {