Metrics/Koin: Prevent race condition

Signed-off-by: Till Kottmann <me@deletescape.ch>
dogbin · Nov 28, 2019 · 0965d21 · 0965d21
1 parent 5ab8597
commit 0965d21
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/app/src/dog/del/app/Application.kt b/app/src/dog/del/app/Application.kt
@@ -73,6 +73,30 @@ fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 fun Application.module(testing: Boolean = false) {
     val appConfig = AppConfig(environment.config)
 
+    install(PrometheusFeature) {
+        disableMetricsEndpoint()
+    }
+    DefaultExports.initialize()
+    DogbinCollectors.register()
+
+    val metrics = DogbinMetrics()
+
+    val metricsPhase = PipelinePhase("metrics")
+    insertPhaseBefore(ApplicationCallPipeline.Monitoring, metricsPhase)
+    intercept(metricsPhase) {
+        metrics.activeRequests.inc()
+        val timer = metrics.requestDuration.startTimer()
+        try {
+            proceed()
+        } catch (e: Exception) {
+            metrics.exceptions.labels((e::class.qualifiedName ?: e::class.jvmName)).inc()
+            throw e
+        } finally {
+            timer.setDuration()
+            metrics.activeRequests.dec()
+        }
+    }
+
     install(Koin) {
         // TODO: split into multiple modules
         val appModule = org.koin.dsl.module {
@@ -95,7 +119,7 @@ fun Application.module(testing: Boolean = false) {
             single { MarkdownRenderer() }
             single { Iframely() }
             single { PasswordEstimator.init() }
-            single { DogbinMetrics() }
+            single { metrics }
         }
         modules(
             appModule
@@ -166,29 +190,6 @@ fun Application.module(testing: Boolean = false) {
         header("X-Api-Key")
     }
 
-    install(PrometheusFeature) {
-        disableMetricsEndpoint()
-    }
-    DefaultExports.initialize()
-    DogbinCollectors.register()
-
-    val metricsPhase = PipelinePhase("metrics")
-    insertPhaseBefore(ApplicationCallPipeline.Monitoring, metricsPhase)
-    intercept(metricsPhase) {
-        val metrics = get<DogbinMetrics>()
-        metrics.activeRequests.inc()
-        val timer = metrics.requestDuration.startTimer()
-        try {
-            proceed()
-        } catch (e: Exception) {
-            metrics.exceptions.labels((e::class.qualifiedName ?: e::class.jvmName)).inc()
-            throw e
-        } finally {
-            timer.setDuration()
-            metrics.activeRequests.dec()
-        }
-    }
-
     install(Sessions) {
         cookie<WebSession>("doggie_session", XdSessionStorage()) {
             transform(SessionTransportTransformerMessageAuthentication(appConfig.keys.session))