Parsbar prometheus (#2565)

* Parsbar prometheus

* Mai-sikker test

Author: jolarsen

domenetjenester/iay/src/test/java/no/nav/foreldrepenger/abakus/registerdata/inntekt/sigrun/SigrunTjenesteTest.java

@@ -24,7 +24,9 @@ class SigrunTjenesteTest {
     private static final String FNR = "12345678910";
     private static final PersonIdent PERSONIDENT = new PersonIdent(FNR);
 
-    private static final Year IFJOR = MonthDay.now().isBefore(MonthDay.of(Month.MAY, 1)) ?
+    private static final MonthDay TIDLIGSTE_SJEKK_FJOR = MonthDay.of(Month.MAY, 1);
+
+    private static final Year IFJOR = MonthDay.now().isBefore(TIDLIGSTE_SJEKK_FJOR) ?
         Year.now().minusYears(2) : Year.now().minusYears(1);
 
     private static final SigrunRestClient CONSUMER = Mockito.mock(SigrunRestClient.class);
@@ -61,7 +63,11 @@ void skal_hente_og_mappe_om_data_fra_sigrun() {
 
 
         var inntekter = TJENESTE.hentPensjonsgivende(PERSONIDENT, null);
-        assertThat(inntekter.keySet()).hasSize(2);
+        if (MonthDay.now().isBefore(TIDLIGSTE_SJEKK_FJOR)) {
+            assertThat(inntekter.keySet()).hasSize(2);
+        } else {
+            assertThat(inntekter.keySet()).hasSize(3);
+        }
         assertThat(inntekter.get(intervallFor(IFJOR))).isNull();
         assertThat(inntekter.get(intervallFor(IFJOR.minusYears(1))).get(InntektspostType.LØNN).compareTo(new BigDecimal(1000L))).isZero();
         assertThat(inntekter.get(intervallFor(IFJOR.minusYears(2))).get(InntektspostType.SELVSTENDIG_NÆRINGSDRIVENDE).compareTo(new BigDecimal(500L))).isZero();

web/src/main/java/no/nav/foreldrepenger/abakus/app/metrics/PrometheusRestService.java

@@ -1,14 +1,17 @@
 package no.nav.foreldrepenger.abakus.app.metrics;
 
 
+import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
 import static no.nav.vedtak.log.metrics.MetricsUtil.REGISTRY;
 
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 
 @Path("/metrics")
+@Produces(TEXT_PLAIN)
 @ApplicationScoped
 public class PrometheusRestService {