bumper r&r og tbd-libs

navikt · Nov 12, 2024 · b05a489 · b05a489
1 parent c054674
commit b05a489
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 25 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 val junitJupiterVersion = "5.11.3"
 val testcontainersVersion = "1.19.5"
-val rapidsAndRiversVersion = "2024020507581707116327.1c34df474331"
-val tbdLibsVersion = "2024.05.31-08.02-2c3441c1"
+val rapidsAndRiversVersion = "2024111211071731406062.648687519469"
+val tbdLibsVersion = "2024.11.12-11.09-16cf2599"
 val flywayVersion = "10.8.1"
 val hikariCPVersion = "5.1.0"
 val postgresqlVersion = "42.7.2"
@@ -44,10 +44,11 @@ dependencies {
 
     testImplementation("io.mockk:mockk:$mockkVersion")
 
+    testImplementation("com.github.navikt.tbd-libs:rapids-and-rivers-test:$tbdLibsVersion")
+    testImplementation("org.testcontainers:postgresql:$testcontainersVersion")
+
     testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
-    testImplementation("org.testcontainers:postgresql:$testcontainersVersion")
 }
 
 kotlin {

diff --git a/src/main/kotlin/no/nav/helse/spammer/App.kt b/src/main/kotlin/no/nav/helse/spammer/App.kt
@@ -1,13 +1,13 @@
 package no.nav.helse.spammer
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.navikt.tbd_libs.azure.AzureToken
 import com.github.navikt.tbd_libs.azure.AzureTokenProvider
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
+import com.github.navikt.tbd_libs.result_object.Result
 import com.github.navikt.tbd_libs.spurtedu.SpurteDuClient
 import no.nav.helse.rapids_rivers.RapidApplication
-import no.nav.helse.rapids_rivers.RapidsConnection
 import kotlin.time.ExperimentalTime
 
 @ExperimentalTime
@@ -34,11 +34,11 @@ fun main() {
         objectMapper = jacksonObjectMapper().registerModule(JavaTimeModule()),
         tokenProvider = object : AzureTokenProvider {
             // trenger egentlig ikke token provider fordi vi slår aldri opp en hemmelighet
-            override fun bearerToken(scope: String): AzureToken {
+            override fun bearerToken(scope: String): Result<AzureToken> {
                 TODO("Not yet implemented")
             }
 
-            override fun onBehalfOfToken(scope: String, token: String): AzureToken {
+            override fun onBehalfOfToken(scope: String, token: String): Result<AzureToken> {
                 TODO("Not yet implemented")
             }
         }

diff --git a/src/main/kotlin/no/nav/helse/spammer/AppStateMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/AppStateMonitor.kt
@@ -1,6 +1,14 @@
 package no.nav.helse.spammer
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
+import io.micrometer.core.instrument.MeterRegistry
 import no.nav.helse.rapids_rivers.*
 import org.slf4j.LoggerFactory
 import java.time.LocalDateTime
@@ -38,12 +46,12 @@ internal class AppStateMonitor(
     }
 
     private var lastReportTime = LocalDateTime.MIN
-    override fun onError(problems: MessageProblems, context: MessageContext) {
+    override fun onError(problems: MessageProblems, context: MessageContext, metadata: MessageMetadata) {
         log.error(problems.toString())
         sikkerLogg.error(problems.toExtendedReport())
     }
 
-    override fun onPacket(packet: JsonMessage, context: MessageContext) {
+    override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
         val now = LocalDateTime.now()
         if (now.toLocalTime() in natt || lastReportTime > now.minusMinutes(15)) return // don't create alerts too eagerly
         val appsDown = packet["states"]

diff --git a/src/main/kotlin/no/nav/helse/spammer/AvstemmingMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/AvstemmingMonitor.kt
@@ -1,7 +1,15 @@
 package no.nav.helse.spammer
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDate
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
+import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -28,11 +36,11 @@ internal class AvstemmingMonitor(
         }.register(this)
     }
 
-    override fun onError(problems: MessageProblems, context: MessageContext) {
+    override fun onError(problems: MessageProblems, context: MessageContext, metadata: MessageMetadata) {
         sikkerLog.error("forstod ikke avstemming:\n${problems.toExtendedReport()}")
     }
 
-    override fun onPacket(packet: JsonMessage, context: MessageContext) {
+    override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
         val fagområde = when (val forkortelsen = packet["fagområde"].asText()) {
             "SP" -> "brukerutbetalinger ($forkortelsen)"
             "SPREF" -> "arbeidsgiverrefusjoner ($forkortelsen)"

diff --git a/src/main/kotlin/no/nav/helse/spammer/LoopMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/LoopMonitor.kt
@@ -3,9 +3,15 @@ package no.nav.helse.spammer
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import com.github.navikt.tbd_libs.spurtedu.SkjulRequest
 import com.github.navikt.tbd_libs.spurtedu.SpurteDuClient
-import no.nav.helse.rapids_rivers.*
+import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
 import java.time.LocalDateTime
 
@@ -25,11 +31,11 @@ internal class LoopMonitor(
         }.register(this)
     }
 
-    override fun onError(problems: MessageProblems, context: MessageContext) {
+    override fun onError(problems: MessageProblems, context: MessageContext, metadata: MessageMetadata) {
         sikkerLog.error("forstod ikke vedtaksperiode_i_loop:\n${problems.toExtendedReport()}")
     }
 
-    override fun onPacket(packet: JsonMessage, context: MessageContext) {
+    override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
         val vedtaksperiodeId = packet["vedtaksperiodeId"].asText()
         val forrigeTilstand = packet["forrigeTilstand"].asText()
         val gjeldendeTilstand = packet["gjeldendeTilstand"].asText()

diff --git a/src/main/kotlin/no/nav/helse/spammer/PåminnelseMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/PåminnelseMonitor.kt
@@ -1,8 +1,14 @@
 package no.nav.helse.spammer
 
 import com.fasterxml.jackson.databind.JsonNode
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import com.github.navikt.tbd_libs.spurtedu.SpurteDuClient
-import no.nav.helse.rapids_rivers.*
+import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
 import kotlin.time.ExperimentalTime
 
@@ -38,7 +44,7 @@ internal class PåminnelseMonitor(
     }
 
     private class Påminnelser(private val slackClient: SlackClient?, private val slackThreadDao: SlackThreadDao?, private val spurteDuClient: SpurteDuClient): River.PacketListener {
-        override fun onPacket(packet: JsonMessage, context: MessageContext) {
+        override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
             if (slackThreadDao == null) return
             val antallGangerPåminnet = packet["antallGangerPåminnet"].asInt()
             // sørger for å lage en alarm for hver 20. påminnelse

diff --git a/src/main/kotlin/no/nav/helse/spammer/SlackmeldingMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/SlackmeldingMonitor.kt
@@ -1,6 +1,13 @@
 package no.nav.helse.spammer
 
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.isMissingOrNull
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
+import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
 
 internal class SlackmeldingMonitor(
@@ -19,11 +26,11 @@ internal class SlackmeldingMonitor(
         }.register(this)
     }
 
-    override fun onError(problems: MessageProblems, context: MessageContext) {
+    override fun onError(problems: MessageProblems, context: MessageContext, metadata: MessageMetadata) {
         sikkerLog.error("forstod ikke slackmelding:\n${problems.toExtendedReport()}")
     }
 
-    override fun onPacket(packet: JsonMessage, context: MessageContext) {
+    override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
         val melding = packet["melding"].asText()
         val skalHaPrefix = packet["utenPrefix"].isMissingOrNull()
         val skalHaSuffix = packet["utenSuffix"].isMissingOrNull()

diff --git a/src/main/kotlin/no/nav/helse/spammer/UtbetalingMonitor.kt b/src/main/kotlin/no/nav/helse/spammer/UtbetalingMonitor.kt
@@ -1,7 +1,14 @@
 package no.nav.helse.spammer
 
 import com.fasterxml.jackson.databind.JsonNode
-import no.nav.helse.rapids_rivers.*
+import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
+import com.github.navikt.tbd_libs.rapids_and_rivers.River
+import com.github.navikt.tbd_libs.rapids_and_rivers.asLocalDateTime
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageContext
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageMetadata
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.MessageProblems
+import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
+import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
 import kotlin.time.ExperimentalTime
 
@@ -26,11 +33,11 @@ internal class UtbetalingMonitor(
     }
 
     private class UtbetalingFeilet(private val slackClient: SlackClient?, private val slackThreadDao: SlackThreadDao?): River.PacketListener {
-        override fun onError(problems: MessageProblems, context: MessageContext) {
+        override fun onError(problems: MessageProblems, context: MessageContext, metadata: MessageMetadata) {
             sikkerLog.error("forstod ikke transaksjon_status:\n${problems.toExtendedReport()}")
         }
 
-        override fun onPacket(packet: JsonMessage, context: MessageContext) {
+        override fun onPacket(packet: JsonMessage, context: MessageContext, metadata: MessageMetadata, meterRegistry: MeterRegistry) {
             if (slackThreadDao == null) return
             slackClient?.postMessage(
                 String.format(

diff --git a/src/test/kotlin/no/nav/helse/spammer/LoopMonitorTest.kt b/src/test/kotlin/no/nav/helse/spammer/LoopMonitorTest.kt
@@ -1,9 +1,9 @@
 package no.nav.helse.spammer
 
+import com.github.navikt.tbd_libs.rapids_and_rivers.test_support.TestRapid
 import io.mockk.CapturingSlot
 import io.mockk.mockk
 import io.mockk.verify
-import no.nav.helse.rapids_rivers.testsupport.TestRapid
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test