Merge pull request #23 from kartverket/prometheus-koin-di

Ta i bruk Koin for dependency injection av PrometheusMeterRegistry
kartverket · Jul 30, 2024 · ea17814 · ea17814
2 parents 70458cd + c00b1ef
commit ea17814
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/Application.kt
@@ -33,8 +33,6 @@ import org.koin.dsl.module
 import org.koin.ktor.ext.inject
 import org.koin.ktor.plugin.KoinIsolated
 
-val appMicrometerRegistry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT)
-
 fun main(args: Array<String>) {
     embeddedServer(Netty, port = 8081, host = "0.0.0.0", module = Application::internalModule).start(wait = false)
 
@@ -64,6 +62,9 @@ val appModule = module {
     single { EgenregistreringsService(get()) }
 }
 
+val metricsModule = module {
+    single { PrometheusMeterRegistry(PrometheusConfig.DEFAULT) }
+}
 
 @OptIn(ExperimentalSerializationApi::class)
 fun Application.module() {
@@ -87,10 +88,6 @@ fun Application.module() {
         }
     }
 
-    install(MicrometerMetrics) {
-        registry = appMicrometerRegistry
-    }
-
     install(NotarizedApplication()) {
         spec = OpenApiSpec(
             jsonSchemaDialect = "https://spec.openapis.org/oas/3.1/dialect/base", info = Info(
@@ -102,7 +99,12 @@ fun Application.module() {
     }
 
     install(KoinIsolated) {
-        modules(appModule, databaseModule)
+        modules(appModule, databaseModule, metricsModule)
+    }
+
+    val meterRegistry by inject<PrometheusMeterRegistry>()
+    install(MicrometerMetrics) {
+        registry = meterRegistry
     }
 
     val dbFactory: DatabaseFactory by inject()
@@ -117,13 +119,14 @@ val internalModule = module {
 }
 
 fun Application.internalModule() {
-    install(MicrometerMetrics) {
-        registry = appMicrometerRegistry
+    install(KoinIsolated) {
+        modules(internalModule, databaseModule, metricsModule)
     }
 
-    install(KoinIsolated) {
-        modules(internalModule, databaseModule)
+    val meterRegistry by inject<PrometheusMeterRegistry>()
+    install(MicrometerMetrics) {
+        registry = meterRegistry
     }
 
     installInternalRouting()
-}
+}
diff --git a/src/main/kotlin/no/kartverket/matrikkel/bygning/routes/InternalRoutes.kt b/src/main/kotlin/no/kartverket/matrikkel/bygning/routes/InternalRoutes.kt
@@ -4,19 +4,19 @@ import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import no.kartverket.matrikkel.bygning.appMicrometerRegistry
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import no.kartverket.matrikkel.bygning.services.HealthService
 import org.koin.ktor.ext.inject
 
 fun Application.installInternalRouting() {
     routing {
         route("/metrics") {
+            val meterRegistry by inject<PrometheusMeterRegistry>()
             get {
-                call.respondText(appMicrometerRegistry.scrape())
+                call.respondText(meterRegistry.scrape())
             }
         }
 
-
         route("/healthz") {
             val healthService: HealthService by inject()
 
@@ -31,4 +31,4 @@ fun Application.installInternalRouting() {
             }
         }
     }
-}
+}