Merge branch '3.1.x'

Closes gh-38610
This commit is contained in:
Moritz Halbritter 2023-11-30 09:03:27 +01:00
commit 6cb9af11e8

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.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() {