From a9983abab9ce384f262f9a9b6bb1329a692b9aa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:01:40 +0100 Subject: [PATCH] Bump io.micrometer:micrometer-registry-prometheus from 1.12.6 to 1.14.1 (#601) * Bump io.micrometer:micrometer-registry-prometheus from 1.12.6 to 1.14.1 Bumps [io.micrometer:micrometer-registry-prometheus](https://github.com/micrometer-metrics/micrometer) from 1.12.6 to 1.14.1. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.6...v1.14.1) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-registry-prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Fix imports --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tanja Krasnomovets --- build.gradle.kts | 2 +- src/main/kotlin/no/nav/syfo/metrics/AppMetrics.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index caed6280a..f0cb64775 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ version = "1.0" val kluentVersion = "1.73" val ktorVersion = "2.3.12" val prometheusVersion = "0.16.0" -val micrometerVersion = "1.12.6" +val micrometerVersion = "1.14.1" val kotestVersion = "5.9.1" val kotestExtensionsVersion = "2.0.0" val h2Version = "2.3.232" diff --git a/src/main/kotlin/no/nav/syfo/metrics/AppMetrics.kt b/src/main/kotlin/no/nav/syfo/metrics/AppMetrics.kt index 2a821532d..d8d95768a 100644 --- a/src/main/kotlin/no/nav/syfo/metrics/AppMetrics.kt +++ b/src/main/kotlin/no/nav/syfo/metrics/AppMetrics.kt @@ -6,10 +6,10 @@ import io.ktor.server.routing.Routing import io.ktor.server.routing.get import io.micrometer.core.instrument.Clock import io.micrometer.core.instrument.Counter -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.client.hotspot.DefaultExports +import io.prometheus.metrics.model.registry.PrometheusRegistry const val METRICS_NS = "esyfovarsel" @@ -20,7 +20,7 @@ const val CALL_PDL_SUCCESS = "${METRICS_NS}_call_pdl_success_count" const val CALL_PDL_FAIL = "${METRICS_NS}_call_pdl_fail_count" val METRICS_REGISTRY = - PrometheusMeterRegistry(PrometheusConfig.DEFAULT, CollectorRegistry.defaultRegistry, Clock.SYSTEM) + PrometheusMeterRegistry(PrometheusConfig.DEFAULT, PrometheusRegistry.defaultRegistry, Clock.SYSTEM) val COUNT_MER_VEILEDNING_NOTICE_SENT: Counter = Counter .builder(MER_VEILEDNING_NOTICE_SENT)