Merge pull request #118 from navikt/dependabot/maven/all-minor-patch-…

…702b2861f5

Bump the all-minor-patch group with 14 updates

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           image_suffix: prod
-          byosbom: target/bom.json
+          byosbom: target/classes/META-INF/sbom/application.cdx.json
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
 

.github/workflows/manual-deploy.yml

@@ -40,7 +40,7 @@ jobs:
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           image_suffix: ${{ github.event.inputs.environment }}
-          byosbom: target/bom.json
+          byosbom: target/classes/META-INF/sbom/application.cdx.json
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
 

mottaker/pom.xml

@@ -39,19 +39,10 @@
 		</dependency>
 		<dependency>
 			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_common</artifactId>
-			<version>${prometheus-simpleclient.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient</artifactId>
-			<version>${prometheus-simpleclient.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_hotspot</artifactId>
-			<version>${prometheus-simpleclient.version}</version>
+			<artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
+			<version>${prometheus.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>

mottaker/src/main/kotlin/no/nav/soknad/arkivering/soknadsmottaker/supervision/InnsendtMetrics.kt

@@ -1,15 +1,15 @@
 package no.nav.soknad.arkivering.soknadsmottaker.supervision
 
-import io.prometheus.client.CollectorRegistry
-import io.prometheus.client.Counter
+import io.prometheus.metrics.core.metrics.Counter
+import io.prometheus.metrics.model.registry.PrometheusRegistry
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.config.ConfigurableBeanFactory
 import org.springframework.context.annotation.Scope
 import org.springframework.stereotype.Component
 
 @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
 @Component
-class InnsendtMetrics(private val registry: CollectorRegistry) {
+class InnsendtMetrics(private val registry: PrometheusRegistry) {
 
 	private val logger = LoggerFactory.getLogger(javaClass)
 
@@ -37,35 +37,35 @@ class InnsendtMetrics(private val registry: CollectorRegistry) {
 	}
 
 	private fun registerCounter(name: String, help: String): Counter {
-		return Counter.build()
-			.namespace(soknadNamespace)
-			.name(name)
+		return Counter.builder()
+			.name("${soknadNamespace}_${name}")
 			.help(help)
 			.labelNames(labelName, appName)
+			.withoutExemplars()
 			.register(registry)
 	}
 
 
 	fun mottattSoknadInc(tema: String) {
 		val counter = innsendtCounter[ok]
-		counter?.labels(tema, app)?.inc()
-		counter?.labels(all, app)?.inc()
+		counter?.labelValues(tema, app)?.inc()
+		counter?.labelValues(all, app)?.inc()
 	}
 
 	fun mottattSoknadGet(tema: String): Double? {
 		val counter = innsendtCounter[ok]
-		return counter?.labels(tema, app)?.get()
+		return counter?.labelValues(tema, app)?.get()
 	}
 
 	fun mottattErrorInc(tema: String) {
 		val counter = innsendtCounter[error]
-		counter?.labels(tema, app)?.inc()
-		counter?.labels(all, app)?.inc()
+		counter?.labelValues(tema, app)?.inc()
+		counter?.labelValues(all, app)?.inc()
 	}
 
 	fun mottattErrorGet(tema: String): Double? {
 		val counter = innsendtCounter[error]
-		return counter?.labels(tema, app)?.get()
+		return counter?.labelValues(tema, app)?.get()
 	}
 
 	fun unregister() {

mottaker/src/test/kotlin/no/nav/soknad/arkivering/soknadsmottaker/SoknadsmottakerApplicationTests.kt

@@ -1,6 +1,6 @@
 package no.nav.soknad.arkivering.soknadsmottaker
 
-import io.prometheus.client.CollectorRegistry
+import io.prometheus.metrics.model.registry.PrometheusRegistry
 import no.nav.soknad.arkivering.soknadsmottaker.config.KafkaConfig
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
@@ -15,7 +15,7 @@ class SoknadsmottakerApplicationTests {
 	private lateinit var kafkaConfig: KafkaConfig
 
 	@MockBean
-	lateinit var collectorRegistry: CollectorRegistry
+	lateinit var prometheusRegistry: PrometheusRegistry
 
 	@Test
 	fun `Spring context loads`() {

mottaker/src/test/kotlin/no/nav/soknad/arkivering/soknadsmottaker/rest/ReceiverTests.kt

@@ -3,7 +3,7 @@ package no.nav.soknad.arkivering.soknadsmottaker.rest
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
-import io.prometheus.client.CollectorRegistry
+import io.prometheus.metrics.model.registry.PrometheusRegistry
 import no.nav.soknad.arkivering.avroschemas.InnsendingMetrics
 import no.nav.soknad.arkivering.avroschemas.Soknadarkivschema
 import no.nav.soknad.arkivering.soknadsmottaker.config.KafkaConfig
@@ -37,7 +37,7 @@ class ReceiverTests {
 	private val doneKafkaMock = mockk<KafkaTemplate<String, String>>()
 	private val utkastKafkaMock = mockk<KafkaTemplate<String, String>>()
 
-	private val metrics = InnsendtMetrics(CollectorRegistry(true))
+	private val metrics = InnsendtMetrics(PrometheusRegistry.defaultRegistry)
 	private val receiver = mockReceiver(metrics)
 
 	@Test
@@ -50,7 +50,12 @@ class ReceiverTests {
 		val metricRecord = slot<ProducerRecord<String, InnsendingMetrics>>()
 
 		every { kafkaMock.send(capture(record)) } returns setFuture(makeSendResult(topic, convert(soknad)))
-		every { metricsKafkaMock.send(capture(metricRecord)) } returns setFuture(makeSendResult(metricsTopic, InnsendingMetrics()))
+		every { metricsKafkaMock.send(capture(metricRecord)) } returns setFuture(
+			makeSendResult(
+				metricsTopic,
+				InnsendingMetrics()
+			)
+		)
 
 		receiver.receive(soknad, null)
 
@@ -62,15 +67,23 @@ class ReceiverTests {
 		assertEquals(sentInBefore!! + 1.0, metrics.mottattSoknadGet("BIL"), "Should increase counter by 1")
 
 		assertEquals(metricsTopic, metricRecord.captured.topic(), "Should send metrics to the right topic")
-		assertEquals(1, metricRecord.captured.headers().headers(MESSAGE_ID).count(),
-			"Metrics should have a MESSAGE_ID header")
-		assertEquals("soknadsmottaker", metricRecord.captured.value().application,
-			"Metrics should have correct application name")
+		assertEquals(
+			1, metricRecord.captured.headers().headers(MESSAGE_ID).count(),
+			"Metrics should have a MESSAGE_ID header"
+		)
+		assertEquals(
+			"soknadsmottaker", metricRecord.captured.value().application,
+			"Metrics should have correct application name"
+		)
 		assertEquals("publish to kafka", metricRecord.captured.value().action, "Metrics should have correct action")
-		assertTrue(metricRecord.captured.value().startTime <= System.currentTimeMillis(),
-			"Metrics should have correct startTime")
-		assertTrue(metricRecord.captured.value().duration <= metricRecord.captured.value().startTime,
-			"Metrics should have a duration")
+		assertTrue(
+			metricRecord.captured.value().startTime <= System.currentTimeMillis(),
+			"Metrics should have correct startTime"
+		)
+		assertTrue(
+			metricRecord.captured.value().duration <= metricRecord.captured.value().startTime,
+			"Metrics should have a duration"
+		)
 
 		metrics.unregister()
 	}
@@ -84,7 +97,12 @@ class ReceiverTests {
 		val metricRecord = slot<ProducerRecord<String, InnsendingMetrics>>()
 
 		every { kafkaMock.send(capture(record)) } throws KafkaException("Mocked Exception")
-		every { metricsKafkaMock.send(capture(metricRecord)) } returns setFuture(makeSendResult(metricsTopic, metricMessage))
+		every { metricsKafkaMock.send(capture(metricRecord)) } returns setFuture(
+			makeSendResult(
+				metricsTopic,
+				metricMessage
+			)
+		)
 
 		assertThrows<KafkaException> {
 			receiver.receive(soknad, null)
@@ -98,8 +116,9 @@ class ReceiverTests {
 	}
 
 	private fun <T> makeSendResult(topic: String, melding: T) = SendResult(
-			ProducerRecord(topic, "123", melding),
-			RecordMetadata(TopicPartition(topic, 1), 1L, 1, 1L, 1, 1))
+		ProducerRecord(topic, "123", melding),
+		RecordMetadata(TopicPartition(topic, 1), 1L, 1, 1L, 1, 1)
+	)
 
 	private fun <T> setFuture(v: SendResult<String, T>): CompletableFuture<SendResult<String, T>> {
 		return CompletableFuture.completedFuture(v)
@@ -123,7 +142,8 @@ class ReceiverTests {
 			it.brukernotifikasjonBeskjedTopic = "min-side.aapen-brukernotifikasjon-beskjed-v1"
 			it.brukernotifikasjonOppgaveTopic = "min-side.aapen-brukernotifikasjon-oppgave-v1"
 		}
-		val kafkaSender = KafkaSender(conf, kafkaMock, metricsKafkaMock, beskjedKafkaMock, oppgaveKafkaMock, doneKafkaMock, utkastKafkaMock)
+		val kafkaSender =
+			KafkaSender(conf, kafkaMock, metricsKafkaMock, beskjedKafkaMock, oppgaveKafkaMock, doneKafkaMock, utkastKafkaMock)
 		val archiverService = ArchiverService(kafkaSender, metrics)
 		return RestApi(archiverService)
 	}

mottaker/src/test/kotlin/no/nav/soknad/arkivering/soknadsmottaker/service/ArchiverServiceTests.kt

@@ -3,7 +3,6 @@ package no.nav.soknad.arkivering.soknadsmottaker.service
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import io.prometheus.client.CollectorRegistry
 import no.nav.soknad.arkivering.soknadsmottaker.supervision.InnsendtMetrics
 import no.nav.soknad.arkivering.soknadsmottaker.utils.createSoknad
 import org.junit.jupiter.api.Test
@@ -12,12 +11,13 @@ import java.util.*
 class ArchiverServiceTests {
 	private val kafkaSender = mockk<KafkaSender>()
 
+	private val metrics = mockk<InnsendtMetrics>(relaxed = true)
+
 	@Test
 	fun `Calls Kafka sender`() {
 		every { kafkaSender.publishSoknadarkivschema(any(), any()) } returns Unit
 		every { kafkaSender.publishMetric(any(), any()) } returns Unit
 
-		val metrics = InnsendtMetrics(CollectorRegistry.defaultRegistry)
 		val archiverService = ArchiverService(kafkaSender, metrics)
 
 		archiverService.archive(UUID.randomUUID().toString(), createSoknad())

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.5</version>
+		<version>3.3.0</version>
 		<relativePath/>
 	</parent>
 
@@ -17,26 +17,26 @@
 	<description>Receives benefit applications</description>
 
 	<properties>
-		<spring-boot.version>3.2.5</spring-boot.version>
+		<spring-boot.version>3.3.0</spring-boot.version>
 		<java.version>21</java.version>
 		<kotlin.version>2.0.0</kotlin.version>
 		<maven.version>3.8.8</maven.version>
 
 		<!--Kotlin-->
 		<kotlin-serialization.version>1.6.3</kotlin-serialization.version>
-		<coroutines.version>1.8.0</coroutines.version>
+		<coroutines.version>1.8.1</coroutines.version>
 
 		<!--Spring-->
 		<springdoc-openapi.version>2.5.0</springdoc-openapi.version>
-		<spring-web.version>6.1.6</spring-web.version>
+		<spring-web.version>6.1.8</spring-web.version>
 
 		<!--Serialization-->
-		<jackson.version>2.17.0</jackson.version>
+		<jackson.version>2.17.1</jackson.version>
 		<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-		<gson.version>2.10.1</gson.version>
+		<gson.version>2.11.0</gson.version>
 
 		<!--NAV-->
-		<token-support.version>4.1.4</token-support.version>
+		<token-support.version>4.1.8</token-support.version>
 
 		<!--Kafka-->
 		<confluent.version>7.6.1</confluent.version>
@@ -46,26 +46,26 @@
 		<tms-varsel.version>1.0.4</tms-varsel.version>
 
 		<!--Logging-->
-		<prometheus-simpleclient.version>0.16.0</prometheus-simpleclient.version>
 		<logstash.version>7.4</logstash.version>
+		<prometheus.version>1.3.1</prometheus.version>
 
 		<!--Jakarta-->
 		<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
-		<jakarta-validation-api.version>3.0.2</jakarta-validation-api.version>
+		<jakarta-validation-api.version>3.1.0</jakarta-validation-api.version>
 		<jakarta-annotation.version>3.0.0</jakarta-annotation.version>
 
 		<!--Other -->
 		<okhttp3.version>4.12.0</okhttp3.version>
-		<swagger-annotations.version>2.2.21</swagger-annotations.version>
+		<swagger-annotations.version>2.2.22</swagger-annotations.version>
 
 		<!--Test-->
-		<mockk.version>1.13.10</mockk.version>
+		<mockk.version>1.13.11</mockk.version>
 
 		<!--Plugins-->
 		<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
 		<cyclonedx-maven-plugin.version>2.8.0</cyclonedx-maven-plugin.version>
-		<maven-enforcer.version>3.4.1</maven-enforcer.version>
-		<openapi-generator-maven-plugin.version>7.5.0</openapi-generator-maven-plugin.version>
+		<maven-enforcer.version>3.5.0</maven-enforcer.version>
+		<openapi-generator-maven-plugin.version>7.6.0</openapi-generator-maven-plugin.version>
 	</properties>
 
 	<modules>