rest-grensesnitt for prometheus

navikt · Oct 4, 2023 · 3304bfc · 3304bfc
1 parent 7dee9ac
commit 3304bfc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/web/PrometheusWebApi.kt b/.../pensjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/web/PrometheusWebApi.kt
@@ -1,5 +1,6 @@
 package no.nav.pensjon.opptjening.omsorgsopptjening.start.innlesning.barnetrygd.web
 
+import com.google.gson.JsonObject
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.binder.hystrix.MicrometerMetricsPublisher
 import no.nav.pensjon.opptjening.omsorgsopptjening.felles.mapToJson
@@ -9,6 +10,7 @@ import no.nav.security.token.support.core.api.Protected
 import no.nav.security.token.support.core.api.Unprotected
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
@@ -24,7 +26,7 @@ class PrometheusWebApi(
         val log: Logger = LoggerFactory.getLogger(this::class.java)
     }
 
-    @GetMapping("/actuator/prometheus")
+    @GetMapping("/actuator/prometheus", produces = [MediaType.APPLICATION_JSON_VALUE])
     fun getPrometheusData(): ResponseEntity<String> {
         return ResponseEntity.ok(registry.mapToJson())
     }

diff --git a/...sjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/web/PrometheusWebApiTest.kt b/...sjon/opptjening/omsorgsopptjening/start/innlesning/barnetrygd/web/PrometheusWebApiTest.kt
@@ -7,6 +7,8 @@ import no.nav.pensjon.opptjening.omsorgsopptjening.start.innlesning.barnetrygd.d
 import no.nav.security.mock.oauth2.MockOAuth2Server
 import no.nav.security.mock.oauth2.token.DefaultOAuth2TokenCallback
 import no.nav.security.token.support.spring.test.EnableMockOAuth2Server
+import okhttp3.internal.http.hasBody
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.given
@@ -20,6 +22,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import java.time.Instant
+import kotlin.test.assertContains
 
 @SpringBootTest
 @AutoConfigureMockMvc
@@ -39,21 +42,19 @@ class PrometheusWebApiTest {
         ).andExpect(status().isOk())
     }
 
-
-    private fun token(
-        issuerId: String,
-        audience: String
-    ): String {
-        return "Bearer " + oauth2Server.issueToken(
-            issuerId,
-            "theclientid",
-            DefaultOAuth2TokenCallback(
-                issuerId,
-                "subject",
-                JOSEObjectType.JWT.type,
-                listOf(audience), emptyMap(),
-                3600
-            )
-        ).serialize()
+    @Test
+    fun `prometheus-url'en returnerer json`() {
+        mvc.perform(
+            get("/actuator/prometheus")
+        ).andExpect(content().contentType("application/json"))
+    }
+    @Test
+    fun `prometheus-url'en returnerer faktisk json`() {
+        val body = mvc.perform(
+            get("/actuator/prometheus")
+        ).andReturn().response.contentAsString
+        assertThat(body)
+            .startsWith("{")
+            .contains("omsorgsopptjening-start-innlesning")
     }
 }