KTOR-6178 MicrometerMetricsConfig default registry leaks coroutine (#…

…3721) (cherry picked from commit b2bf9cf)
ktorio · Aug 30, 2023 · 3c7e8c0 · 3c7e8c0
1 parent e56b8bd
commit 3c7e8c0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/...-server-metrics-micrometer/jvm/src/io/ktor/server/metrics/micrometer/MicrometerMetrics.kt b/...-server-metrics-micrometer/jvm/src/io/ktor/server/metrics/micrometer/MicrometerMetrics.kt
@@ -49,6 +49,10 @@ public class MicrometerMetricsConfig {
      * @see [MicrometerMetrics]
      */
     public var registry: MeterRegistry = LoggingMeterRegistry()
+        set(value) {
+            field.close()
+            field = value
+        }
 
     /**
      * Specifies if requests for non-existent routes should

diff --git a/...r-metrics-micrometer/jvm/test/io/ktor/server/metrics/micrometer/MicrometerMetricsTests.kt b/...r-metrics-micrometer/jvm/test/io/ktor/server/metrics/micrometer/MicrometerMetricsTests.kt
@@ -18,6 +18,7 @@ import io.micrometer.core.instrument.binder.*
 import io.micrometer.core.instrument.binder.jvm.*
 import io.micrometer.core.instrument.binder.system.*
 import io.micrometer.core.instrument.distribution.*
+import io.micrometer.core.instrument.logging.*
 import io.micrometer.core.instrument.simple.*
 import kotlin.reflect.*
 import kotlin.test.*
@@ -399,6 +400,27 @@ class MicrometerMetricsTests {
         assertEquals("OK", response.bodyAsText())
     }
 
+    @Test
+    fun `test closes previous registry`(): Unit = testApplication {
+        var closed = false
+        val metrics = object : LoggingMeterRegistry() {
+            override fun close() {
+                super.close()
+                closed = true
+            }
+        }
+
+        application {
+            install(MicrometerMetrics) {
+                registry = metrics
+                registry = LoggingMeterRegistry()
+            }
+        }
+
+        startApplication()
+        assertTrue(closed)
+    }
+
     private fun TestApplicationEngine.metersAreRegistered(
         meterBinder: KClass<out MeterBinder>,
         vararg meterNames: String