upgrade micrometer prometheus to 1.13.1

navikt · Oct 17, 2024 · 8a7d715 · 8a7d715
1 parent abe8cb9
commit 8a7d715
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ subprojects {
 
     val jvmTarget = "17"
     val kafkaVersion = "3.3.1"
-    val micrometerRegistryPrometheusVersion = "1.9.1"
+    val micrometerRegistryPrometheusVersion = "1.13.1"
     val junitJupiterVersion = "5.9.1"
     val jacksonVersion = "2.14.1"
     val logbackClassicVersion = "1.4.5"
@@ -38,7 +38,7 @@ subprojects {
 
         api("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
         api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
-
+        api("io.micrometer:micrometer-core:$micrometerRegistryPrometheusVersion")
         api("io.micrometer:micrometer-registry-prometheus:$micrometerRegistryPrometheusVersion")
 
         testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")

diff --git a/hm-rapids-and-rivers-v2-core/src/main/kotlin/no/nav/helse/rapids_rivers/Metrics.kt b/hm-rapids-and-rivers-v2-core/src/main/kotlin/no/nav/helse/rapids_rivers/Metrics.kt
@@ -1,19 +1,20 @@
 package no.nav.helse.rapids_rivers
 
-import io.prometheus.client.CollectorRegistry
-import io.prometheus.client.Counter
-import io.prometheus.client.Histogram
+import io.prometheus.metrics.core.metrics.Counter
+import io.prometheus.metrics.core.metrics.Histogram
+import io.prometheus.metrics.model.registry.PrometheusRegistry
+
 
 object Metrics {
-    private val registry = CollectorRegistry.defaultRegistry
+    private val registry = PrometheusRegistry.defaultRegistry
 
-    val onPacketHistorgram = Histogram.build()
+    val onPacketHistorgram = Histogram.builder()
         .name("on_packet_seconds")
         .help("Hvor lang det tar å lese en gjenkjent melding i sekunder")
         .labelNames("rapid", "river", "event_name")
         .register(registry)
 
-    val onMessageCounter = Counter.build()
+    val onMessageCounter = Counter.builder()
         .name("message_counter")
         .help("Hvor mange meldinger som er lest inn")
         .labelNames("rapid", "river", "validated")

diff --git a/hm-rapids-and-rivers-v2-core/src/main/kotlin/no/nav/helse/rapids_rivers/River.kt b/hm-rapids-and-rivers-v2-core/src/main/kotlin/no/nav/helse/rapids_rivers/River.kt
@@ -1,13 +1,10 @@
 package no.nav.helse.rapids_rivers
 
 import io.micrometer.core.instrument.Clock
-import io.micrometer.core.instrument.Counter
-import io.micrometer.core.instrument.MeterRegistry
-import io.micrometer.core.instrument.Timer
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry
-import io.micrometer.prometheus.PrometheusConfig
-import io.micrometer.prometheus.PrometheusMeterRegistry
-import io.prometheus.client.CollectorRegistry
+import io.micrometer.prometheusmetrics.PrometheusConfig
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
+import io.prometheus.metrics.model.registry.PrometheusRegistry
+
 import no.nav.helse.rapids_rivers.River.PacketListener.Companion.Name
 import java.util.*
 
@@ -20,7 +17,7 @@ fun interface RandomIdGenerator {
 
 class DefaultMeterRegistry {
     companion object {
-        val collectorRegistry = CollectorRegistry.defaultRegistry
+        val collectorRegistry = PrometheusRegistry.defaultRegistry
         val Default = PrometheusMeterRegistry(
             PrometheusConfig.DEFAULT,
             collectorRegistry,

diff --git a/hm-rapids-and-rivers-v2-ktor/src/main/kotlin/no/nav/helse/rapids_rivers/KtorBuilder.kt b/hm-rapids-and-rivers-v2-ktor/src/main/kotlin/no/nav/helse/rapids_rivers/KtorBuilder.kt
@@ -18,18 +18,13 @@ import io.ktor.server.response.respondText
 import io.ktor.server.response.respondTextWriter
 import io.ktor.server.routing.get
 import io.ktor.server.routing.routing
-import io.micrometer.core.instrument.Clock
 import io.micrometer.core.instrument.binder.MeterBinder
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics
 import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics
 import io.micrometer.core.instrument.binder.logging.LogbackMetrics
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics
-import io.micrometer.prometheus.PrometheusConfig
-import io.micrometer.prometheus.PrometheusMeterRegistry
-import io.prometheus.client.CollectorRegistry
-import io.prometheus.client.exporter.common.TextFormat
 import org.slf4j.Logger
 
 class KtorBuilder {
@@ -66,11 +61,7 @@ class KtorBuilder {
 
             routing {
                 get("/metrics") {
-                    val names = call.request.queryParameters.getAll("name[]")?.toSet() ?: emptySet()
-
-                    call.respondTextWriter(ContentType.parse(TextFormat.CONTENT_TYPE_004)) {
-                        TextFormat.write004(this, DefaultMeterRegistry.collectorRegistry.filteredMetricFamilySamples(names))
-                    }
+                    call.respond(DefaultMeterRegistry.Default.scrape())
                 }
             }
         }

diff --git a/hm-rapids-and-rivers-v2-ktor/src/main/kotlin/no/nav/helse/rapids_rivers/RapidApplication.kt b/hm-rapids-and-rivers-v2-ktor/src/main/kotlin/no/nav/helse/rapids_rivers/RapidApplication.kt
@@ -3,8 +3,6 @@ package no.nav.helse.rapids_rivers
 import io.ktor.server.application.Application
 import io.ktor.server.cio.CIO
 import io.ktor.server.engine.*
-import io.micrometer.core.instrument.MeterRegistry
-import io.prometheus.client.CollectorRegistry
 import kotlinx.coroutines.delay
 import org.slf4j.LoggerFactory
 import java.io.File