Bruke io.prometheus:client_java

Author: geiralund

dp-inntekt-api/build.gradle.kts

@@ -39,6 +39,10 @@ dependencies {
 
     implementation("io.micrometer:micrometer-registry-prometheus:1.14.4")
 
+    implementation("io.prometheus:client_java:1.3.6")
+    implementation("io.prometheus:prometheus-metrics-core:1.3.6")
+    implementation("io.prometheus:prometheus-metrics-instrumentation-jvm:1.3.6")
+
     implementation("com.expediagroup:graphql-kotlin-client:$expediaGraphqlVersion")
     implementation("com.expediagroup:graphql-kotlin-ktor-client:$expediaGraphqlVersion")
     implementation("com.expediagroup:graphql-kotlin-client-jackson:$expediaGraphqlVersion")
@@ -61,9 +65,6 @@ dependencies {
     implementation(libs.konfig)
     implementation("org.slf4j:slf4j-api:2.0.17")
 
-    implementation("io.prometheus:simpleclient_common:0.16.0")
-    implementation("io.prometheus:simpleclient_hotspot:0.16.0")
-    implementation("io.prometheus:simpleclient_log4j2:0.16.0")
     implementation("no.bekk.bekkopen:nocommons:0.16.0")
 
     implementation("com.uchuhimo:kotlinx-bimap:1.2")

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/Application.kt

@@ -1,9 +1,7 @@
 package no.nav.dagpenger.inntekt
 
 import io.ktor.server.engine.embeddedServer
-import io.ktor.server.engine.stop
 import io.ktor.server.netty.Netty
-import io.prometheus.client.hotspot.DefaultExports
 import kotlinx.coroutines.runBlocking
 import mu.KotlinLogging
 import no.nav.dagpenger.inntekt.Config.inntektApiConfig
@@ -26,7 +24,6 @@ fun main() {
     runBlocking {
         val config = configuration.inntektApiConfig
         PostgresDataSourceBuilder.runMigration()
-        DefaultExports.initialize()
         val dataSource = PostgresDataSourceBuilder.dataSource
         val postgresInntektStore = PostgresInntektStore(dataSource)
         val pdlPersonOppslag =

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/InntektApi.kt

@@ -60,10 +60,11 @@ internal fun Application.inntektApi(
     enhetsregisterClient: EnhetsregisterClient,
     healthChecks: List<HealthCheck>,
     collectorRegistry: PrometheusRegistry = PrometheusRegistry.defaultRegistry,
+    meterRegistry: PrometheusMeterRegistry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT, collectorRegistry, Clock.SYSTEM),
 ) {
     install(DefaultHeaders)
     install(MicrometerMetrics) {
-        registry = PrometheusMeterRegistry(PrometheusConfig.DEFAULT, collectorRegistry, Clock.SYSTEM)
+        registry = meterRegistry
     }
 
     install(Authentication) {
@@ -229,7 +230,7 @@ internal fun Application.inntektApi(
                 }
             }
         }
-        naischecks(healthChecks)
+        naischecks(healthChecks, meterRegistry)
     }
 }
 

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/NaisChecks.kt

@@ -2,19 +2,18 @@ package no.nav.dagpenger.inntekt
 
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
 import io.ktor.server.response.respondText
-import io.ktor.server.response.respondTextWriter
 import io.ktor.server.routing.Routing
 import io.ktor.server.routing.get
-import io.prometheus.client.CollectorRegistry
-import io.prometheus.client.exporter.common.TextFormat
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
 import mu.KotlinLogging
 
 private val LOGGER = KotlinLogging.logger {}
-private val collectorRegistry: CollectorRegistry = CollectorRegistry.defaultRegistry
 
-fun Routing.naischecks(healthChecks: List<HealthCheck>) {
+fun Routing.naischecks(
+    healthChecks: List<HealthCheck>,
+    meterRegistry: PrometheusMeterRegistry,
+) {
     get("/isAlive") {
         val failingHealthChecks = healthChecks.filter { it.status() == HealthStatus.DOWN }
 
@@ -31,8 +30,6 @@ fun Routing.naischecks(healthChecks: List<HealthCheck>) {
     }
     get("/metrics") {
         val names = call.request.queryParameters.getAll("name[]")?.toSet() ?: setOf()
-        call.respondTextWriter(ContentType.parse(TextFormat.CONTENT_TYPE_004)) {
-            TextFormat.write004(this, collectorRegistry.filteredMetricFamilySamples(names))
-        }
+        call.respondText(meterRegistry.scrape(), ContentType.parse("text/plain; version=0.0.4; charset=utf-8"))
     }
 }

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/db/PostgresInntektStore.kt

@@ -2,7 +2,7 @@ package no.nav.dagpenger.inntekt.db
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import de.huxhorn.sulky.ulid.ULID
-import io.prometheus.client.Summary
+import io.prometheus.metrics.core.metrics.Summary
 import kotliquery.queryOf
 import kotliquery.sessionOf
 import kotliquery.using
@@ -27,7 +27,7 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
         private val ulidGenerator = ULID()
         private val LOGGER = KotlinLogging.logger {}
         private val markerInntektTimer =
-            Summary.build()
+            Summary.builder()
                 .name("marker_inntekt_brukt")
                 .help("Hvor lang tid det tar å markere en inntekt brukt (i sekunder")
                 .register()

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/inntektskomponenten/v1/InntektskomponentHttpClient.kt

@@ -19,8 +19,8 @@ import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
 import io.ktor.serialization.jackson.JacksonConverter
-import io.prometheus.client.Counter
-import io.prometheus.client.Summary
+import io.prometheus.metrics.core.metrics.Counter
+import io.prometheus.metrics.core.metrics.Summary
 import mu.KotlinLogging
 import mu.withLoggingContext
 import no.nav.dagpenger.inntekt.serder.jacksonObjectMapper
@@ -31,7 +31,7 @@ private val sikkerLogg = KotlinLogging.logger("tjenestekall")
 private val ulid = ULID()
 const val INNTEKTSKOMPONENT_CLIENT_SECONDS_METRICNAME = "inntektskomponent_client_seconds"
 private val clientLatencyStats: Summary =
-    Summary.build()
+    Summary.builder()
         .name(INNTEKTSKOMPONENT_CLIENT_SECONDS_METRICNAME)
         .quantile(0.5, 0.05) // Add 50th percentile (= median) with 5% tolerated error
         .quantile(0.9, 0.01) // Add 90th percentile with 1% tolerated error
@@ -40,13 +40,13 @@ private val clientLatencyStats: Summary =
         .register()
 const val INNTEKTSKOMPONENT_FETCH_ERROR = "inntektskomponent_fetch_error"
 private val clientFetchErrors =
-    Counter.build()
+    Counter.builder()
         .name(INNTEKTSKOMPONENT_FETCH_ERROR)
         .help("Number of times fetching form inntektskomponenten has failed")
         .register()
 const val INNTEKTSKOMPONENT_STATUS_CODES = "inntektskomponent_status_codes"
 private val inntektskomponentStatusCodesCounter =
-    Counter.build()
+    Counter.builder()
         .name(INNTEKTSKOMPONENT_STATUS_CODES)
         .help("Number of times inntektskomponenten has returned a specific status code")
         .labelNames("status_code")
@@ -99,7 +99,7 @@ internal class InntektkomponentKtorClient(
                     }
                 } catch (error: ServerResponseException) {
                     val statusKode = error.response.status.value
-                    inntektskomponentStatusCodesCounter.labels(statusKode.toString()).inc()
+                    inntektskomponentStatusCodesCounter.labelValues(statusKode.toString()).inc()
                     clientFetchErrors.inc()
                     val feilmelding =
                         kotlin.runCatching {
@@ -126,7 +126,7 @@ internal class InntektkomponentKtorClient(
                 } finally {
                     timer.observeDuration()
                 }
-            inntektskomponentStatusCodesCounter.labels(response.status.value.toString()).inc()
+            inntektskomponentStatusCodesCounter.labelValues(response.status.value.toString()).inc()
 
             return response.body()
         }

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/subsumsjonbrukt/Vaktmester.kt

@@ -1,14 +1,14 @@
 package no.nav.dagpenger.inntekt.subsumsjonbrukt
 
-import io.prometheus.client.Counter
+import io.prometheus.metrics.core.metrics.Counter
 import kotliquery.queryOf
 import kotliquery.sessionOf
 import kotliquery.using
 import javax.sql.DataSource
 
 const val INNTEKT_SLETTET = "inntekt_slettet"
 private val deleteCounter =
-    Counter.build()
+    Counter.builder()
         .name(INNTEKT_SLETTET)
         .help("Antall inntektsett slettet fra databasen")
         .register()

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/v1/UklassifisertInntektRoute.kt

@@ -3,7 +3,6 @@ package no.nav.dagpenger.inntekt.v1
 import com.auth0.jwt.exceptions.JWTDecodeException
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
 import io.ktor.server.auth.authenticate
 import io.ktor.server.auth.authentication
 import io.ktor.server.auth.jwt.JWTPrincipal
@@ -14,7 +13,7 @@ import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
 import io.ktor.server.routing.route
-import io.prometheus.client.Counter
+import io.prometheus.metrics.core.metrics.Counter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import mu.KotlinLogging
@@ -41,13 +40,13 @@ import java.time.LocalDate
 private val logger = KotlinLogging.logger {}
 const val INNTEKT_KORRIGERING = "inntekt_korrigering"
 private val inntektKorrigeringCounter =
-    Counter.build().name(INNTEKT_KORRIGERING).help("Antall ganger saksbehandler har korrigert inntekter").register()
+    Counter.builder().name(INNTEKT_KORRIGERING).help("Antall ganger saksbehandler har korrigert inntekter").register()
 const val INNTEKT_OPPFRISKING = "inntekt_oppfrisking"
 private val inntektOppfriskingCounter =
-    Counter.build().name(INNTEKT_OPPFRISKING).help("Antall ganger saksbehandler har oppdatert inntekter").register()
+    Counter.builder().name(INNTEKT_OPPFRISKING).help("Antall ganger saksbehandler har oppdatert inntekter").register()
 const val INNTEKT_OPPFRISKING_BRUKT = "inntekt_oppfrisking_brukt"
 private val inntektOppfriskingBruktCounter =
-    Counter.build().name(INNTEKT_OPPFRISKING_BRUKT).help("Antall ganger saksbehandler har brukt oppdaterte inntekter")
+    Counter.builder().name(INNTEKT_OPPFRISKING_BRUKT).help("Antall ganger saksbehandler har brukt oppdaterte inntekter")
         .register()
 
 fun Route.uklassifisertInntekt(

dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/inntektskomponenten/v1/InntektskomponentHttpClientTest.kt

@@ -11,10 +11,7 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration
 import com.github.tomakehurst.wiremock.matching.AnythingPattern
 import com.github.tomakehurst.wiremock.matching.EqualToPattern
 import io.kotest.matchers.booleans.shouldBeTrue
-import io.kotest.matchers.doubles.shouldBeGreaterThan
 import io.kotest.matchers.shouldBe
-import io.kotest.matchers.shouldNotBe
-import io.prometheus.client.CollectorRegistry
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
@@ -83,7 +80,6 @@ internal class InntektskomponentHttpClientTest {
             }
 
         assertEquals("99999999999", hentInntektListeResponse.ident.identifikator)
-        shouldBeCounted(metricName = INNTEKTSKOMPONENT_CLIENT_SECONDS_METRICNAME)
     }
 
     @Test
@@ -203,8 +199,6 @@ internal class InntektskomponentHttpClientTest {
             status = 500,
             message = "Tidsavbrudd mot inntektskomponenten.",
         )
-
-        shouldBeCounted(metricName = INNTEKTSKOMPONENT_FETCH_ERROR)
     }
 
     @Test
@@ -273,11 +267,3 @@ private inline fun <reified T : InntektskomponentenHttpClientException> Result<I
     message?.let { exception.message shouldBe message }
     detail?.let { exception.detail shouldBe detail }
 }
-
-private fun shouldBeCounted(metricName: String) {
-    CollectorRegistry.defaultRegistry.metricFamilySamples().asSequence().find { it.name == metricName }
-        ?.let { metric ->
-            metric.samples[0].value shouldNotBe null
-            metric.samples[0].value shouldBeGreaterThan 0.0
-        }
-}

dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/subsumsjonbrukt/VaktmesterTest.kt

@@ -1,9 +1,8 @@
 package no.nav.dagpenger.inntekt.subsumsjonbrukt
 
-import io.kotest.matchers.doubles.shouldBeGreaterThan
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
-import io.prometheus.client.CollectorRegistry
+import io.prometheus.metrics.model.registry.PrometheusRegistry
 import no.nav.dagpenger.inntekt.Postgres.withMigratedDb
 import no.nav.dagpenger.inntekt.db.InntektNotFoundException
 import no.nav.dagpenger.inntekt.db.Inntektparametre
@@ -122,10 +121,10 @@ internal class VaktmesterTest {
             assertThrows<InntektNotFoundException> { inntektStore.getInntekt(ubruktEldreEnn180Dager.inntektId) }
             inntektStore.getInntekt(ubruktYngreEnn180Dager.inntektId) shouldBe ubruktYngreEnn180Dager
         }
-        CollectorRegistry.defaultRegistry.metricFamilySamples().asSequence().find { it.name == "inntekt_slettet" }
+        PrometheusRegistry.defaultRegistry.scrape().find { it.metadata.name == "inntekt_slettet" }
             ?.let { metric ->
-                metric.samples[0].value shouldNotBe null
-                metric.samples[0].value shouldBeGreaterThan 0.0
+                metric.dataPoints[0].labels shouldNotBe null
+                metric.dataPoints[0].scrapeTimestampMillis shouldNotBe null
             } ?: AssertionError("Could not find metric")
     }