Merge pull request #146 from navikt/dev/felles-moduler-hendelsefilter

Benytte felles moduler

Author: naviktthomas

apps/bekreftelse-hendelsefilter/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     // Project
     implementation(project(":lib:hoplite-config"))
     implementation(project(":lib:error-handling"))
+    implementation(project(":lib:metrics"))
     implementation(project(":lib:kafka-streams"))
     implementation(project(":domain:bekreftelsesmelding-avro-schema"))
     implementation(project(":domain:bekreftelse-paavegneav-avro-schema"))

apps/bekreftelse-hendelsefilter/src/main/kotlin/no/nav/paw/bekreftelse/Application.kt

@@ -4,12 +4,13 @@ import io.ktor.server.application.Application
 import io.ktor.server.engine.addShutdownHook
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.netty.Netty
+import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics
 import no.nav.paw.bekreftelse.context.ApplicationContext
-import no.nav.paw.bekreftelse.plugins.configureKafka
-import no.nav.paw.bekreftelse.plugins.configureMetrics
 import no.nav.paw.bekreftelse.plugins.configureRouting
 import no.nav.paw.bekreftelse.utils.buildApplicationLogger
 import no.nav.paw.config.env.appNameOrDefaultForLocal
+import no.nav.paw.kafka.plugin.installKafkaStreamsPlugins
+import no.nav.paw.metrics.plugin.installMetricsPlugin
 
 fun main() {
     val logger = buildApplicationLogger
@@ -34,7 +35,14 @@ fun main() {
 }
 
 fun Application.module(applicationContext: ApplicationContext) {
-    configureMetrics(applicationContext)
-    configureKafka(applicationContext)
-    configureRouting(applicationContext)
+    with(applicationContext) {
+        installMetricsPlugin(
+            meterRegistry = prometheusMeterRegistry,
+            additionalMeterBinders = kafkaStreamsList.map { KafkaStreamsMetrics(it) }
+        )
+        installKafkaStreamsPlugins(
+            kafkaStreamsList = kafkaStreamsList
+        )
+        configureRouting(applicationContext)
+    }
 }

apps/bekreftelse-hendelsefilter/src/main/kotlin/no/nav/paw/bekreftelse/plugins/Kafka.kt

@@ -4,8 +4,8 @@ package no.nav.paw.bekreftelse.plugins
 import io.ktor.server.application.Application
 import io.ktor.server.routing.routing
 import no.nav.paw.bekreftelse.context.ApplicationContext
-import no.nav.paw.bekreftelse.routes.metricsRoutes
 import no.nav.paw.health.route.healthRoutes
+import no.nav.paw.metrics.route.metricsRoutes
 
 fun Application.configureRouting(applicationContext: ApplicationContext) {
     routing {