From 320f84218a56947c885b596c325a4295764c83e0 Mon Sep 17 00:00:00 2001
From: Jens-Otto Larsen <jens-otto.larsen@nav.no>
Date: Tue, 4 Jun 2024 20:04:39 +0200
Subject: [PATCH] Bom 331, fikse metrikker

---
 .../nav/vedtak/log/metrics/MetricsUtil.java   | 54 +++++++++----------
 pom.xml                                       |  4 +-
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/felles/log/src/main/java/no/nav/vedtak/log/metrics/MetricsUtil.java b/felles/log/src/main/java/no/nav/vedtak/log/metrics/MetricsUtil.java
index 0a6907706..9f213758e 100644
--- a/felles/log/src/main/java/no/nav/vedtak/log/metrics/MetricsUtil.java
+++ b/felles/log/src/main/java/no/nav/vedtak/log/metrics/MetricsUtil.java
@@ -1,10 +1,10 @@
 package no.nav.vedtak.log.metrics;
 
 import static io.micrometer.core.instrument.Metrics.globalRegistry;
-import static io.micrometer.prometheus.PrometheusConfig.DEFAULT;
+import static io.micrometer.prometheusmetrics.PrometheusConfig.DEFAULT;
 
-import io.micrometer.core.instrument.Meter.Id;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmInfoMetrics;
@@ -13,9 +13,7 @@
 import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
-import io.micrometer.core.instrument.config.MeterFilter;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 
 public class MetricsUtil {
     public static final PrometheusMeterRegistry REGISTRY = new PrometheusMeterRegistry(DEFAULT);
@@ -40,36 +38,34 @@ public static String scrape() {
         return REGISTRY.scrape();
     }
 
+    public static void timerUtenHistogram(String navn) {
+        timerMedPercentiler(navn, 0.5, 0.95, 0.99);
+    }
+
+    public static void timerMedianUtenHistogram(String navn) {
+        timerMedPercentiler(navn, 0.5);
+    }
 
-    public static void utvidMedMedian(String navn) {
-        utvidMedPercentiler(navn, 0.5);
+    public static void timerMedPercentiler(String navn, double... percentiles) {
+        Timer.builder(navn)
+            .publishPercentiles(percentiles)
+            .publishPercentileHistogram(false)
+            .register(globalRegistry);
     }
 
-    public static void utvidMedPercentiler(String navn, double... percentiles) {
-        globalRegistry.config().meterFilter(new MeterFilter() {
-            @Override
-            public DistributionStatisticConfig configure(Id id, DistributionStatisticConfig config) {
-                if (id.getName().equals(navn)) {
-                    return DistributionStatisticConfig.builder().percentilesHistogram(false).percentiles(percentiles).build().merge(config);
-                }
-                return config;
-            }
-        });
+    public static void timerMedHistogram(String navn) {
+        timerMedHistogram(navn, 0.5, 0.95, 0.99);
     }
 
-    public static void utvidMedHistogram(String navn) {
-        utvidMedHistogram(navn, 0.5, 0.95, 0.99);
+    public static void timerMedianMedHistogram(String navn) {
+        timerMedHistogram(navn, 0.5);
     }
 
-    public static void utvidMedHistogram(String navn, double... percentiles) {
-        globalRegistry.config().meterFilter(new MeterFilter() {
-            @Override
-            public DistributionStatisticConfig configure(Id id, DistributionStatisticConfig config) {
-                if (id.getName().equals(navn)) {
-                    return DistributionStatisticConfig.builder().percentilesHistogram(true).percentiles(percentiles).build().merge(config);
-                }
-                return config;
-            }
-        });
+    public static void timerMedHistogram(String navn, double... percentiles) {
+        Timer.builder(navn)
+            .publishPercentiles(percentiles)
+            .publishPercentileHistogram(true)
+            .register(globalRegistry);
     }
+
 }
diff --git a/pom.xml b/pom.xml
index 660be55f6..ce9c16f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.1</version>
     </parent>
 
     <artifactId>felles-root</artifactId>
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>