Merge branch '1.13.x'

micrometer-metrics · Jun 25, 2024 · c7f1a83 · c7f1a83
2 parents 0ae7841 + 095e420
commit c7f1a83
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ executors:
   machine-executor:
     working_directory: ~/micrometer
     machine:
-      image: ubuntu-2204:2024.01.2
+      image: ubuntu-2204:2024.05.1
 
 commands:
   gradlew-build:

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -165,7 +165,7 @@ jsr107 = { module = "org.jsr107.ri:cache-ri-impl", version.ref = "jsr107" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
 junitBom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junitJupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
-junitLoggingExtention = "com.innoq:junit5-logging-extension:0.2.0"
+junitLoggingExtension = "com.innoq:junit5-logging-extension:0.2.0"
 junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
 kafkaClients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafka" }
 kafkaStreams = { module = "org.apache.kafka:kafka-streams", version.ref = "kafka" }

diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -158,7 +158,7 @@ dependencies {
     }
     // Needed for LogbackMetrics tests
     testImplementation libs.slf4jApi
-    testImplementation(libs.junitLoggingExtention)
+    testImplementation(libs.junitLoggingExtension)
 
     testImplementation libs.mockitoCore5
 

diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterRegistryLoggingTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterRegistryLoggingTest.java
@@ -50,8 +50,9 @@ void meterRegistrationBeforeMeterFilterConfig(LoggingEvents logEvents) {
 
     @Test
     void meterRegistrationBeforeMeterFilterConfigWithDebugLogging(LoggingEvents logEvents) {
-        Level priorLevel = ((Logger) LoggerFactory.getLogger(SimpleMeterRegistry.class)).getLevel();
-        ((Logger) LoggerFactory.getLogger(SimpleMeterRegistry.class)).setLevel(Level.DEBUG);
+        Logger logger = (Logger) LoggerFactory.getLogger(SimpleMeterRegistry.class);
+        Level priorLevel = logger.getLevel();
+        logger.setLevel(Level.DEBUG);
         try {
             registerMetricsAndConfigure();
 
@@ -65,7 +66,7 @@ void meterRegistrationBeforeMeterFilterConfigWithDebugLogging(LoggingEvents logE
                                 + "\tat io.micrometer.core.instrument.MeterRegistryLoggingTest.meterRegistrationBeforeMeterFilterConfigWithDebugLogging\\(MeterRegistryLoggingTest.java:\\d+\\)");
         }
         finally {
-            ((Logger) LoggerFactory.getLogger(SimpleMeterRegistry.class)).setLevel(priorLevel);
+            logger.setLevel(priorLevel);
         }
     }