publish parsed json to rapid and add logging

Author: Gustav Lillesæter

src/main/kotlin/no/nav/hjelpemidler/Application.kt

@@ -12,6 +12,7 @@ import no.nav.helse.rapids_rivers.KafkaConfig
 import no.nav.helse.rapids_rivers.RapidApplication
 import no.nav.helse.rapids_rivers.RapidsConnection
 import no.nav.hjelpemidler.configuration.Configuration
+import no.nav.hjelpemidler.metrics.SensuMetrics
 import no.nav.hjelpemidler.rivers.LoggRiver
 import java.net.InetAddress
 import java.time.LocalDateTime
@@ -65,11 +66,12 @@ fun main() {
                 try {
                     validJson = Klaxon().parse<Statusinfo>(rawJson)
                     sikkerlogg.info("Parsing incoming json request successful: ${Klaxon().toJsonString(validJson)}")
+                    SensuMetrics().meldingFraOebs()
                 } catch (e: Exception) {
                     // Deal with invalid json in request
                     sikkerlogg.info("Parsing incoming json request failed with exception (responding 4xx): $e")
                     e.printStackTrace()
-
+                    SensuMetrics().feilVedMeldingFraOebs()
                     call.respond(HttpStatusCode.BadRequest, "bad request: json not valid")
                     return@post
                 }
@@ -80,7 +82,11 @@ fun main() {
                 // Publish the received json to our rapid
                 rapidApp!!.publish(
                     UUID.randomUUID().toString(),
-                    "{\"@id\": \"$uid\", \"@event_name\": \"oebs-listener-testevent\", \"@opprettet\": \"$opprettet\", \"fnrBruker\": ${validJson?.accountNumber} \"data\": $rawJson}"
+                    "{\"@id\": \"$uid\", \"@event_name\": \"oebs-listener-testevent\", \"@opprettet\": \"$opprettet\", \"fnrBruker\": ${validJson?.accountNumber} \"data\": ${
+                    Klaxon().toJsonString(
+                        validJson
+                    )
+                    }}"
                 )
 
                 call.respond(HttpStatusCode.OK, "ok")
@@ -115,7 +121,7 @@ data class Statusinfo(
     @Json(name = "OrdreNumber")
     val ordreNumber: Int,
     @Json(name = "LineNumber")
-    val lineNUmber: Int,
+    val lineNumber: Int,
     @Json(name = "Description")
     val description: String,
     @Json(name = "CategoryDescription")

src/main/kotlin/no/nav/hjelpemidler/metrics/SensuMetrics.kt

@@ -1,6 +1,7 @@
 package no.nav.hjelpemidler.metrics
 
 import no.nav.hjelpemidler.configuration.Configuration
+import org.influxdb.dto.Point
 import org.slf4j.LoggerFactory
 import java.net.URI
 import java.net.http.HttpClient
@@ -9,7 +10,6 @@ import java.net.http.HttpResponse
 import java.time.Duration
 import java.util.*
 import java.util.concurrent.TimeUnit
-import org.influxdb.dto.Point
 
 class SensuMetrics {
     private val log = LoggerFactory.getLogger(SensuMetrics::class.java)
@@ -29,12 +29,19 @@ class SensuMetrics {
         registerPoint(MELDING_TIL_RAPID_FEILET, mapOf("counter" to 1L), emptyMap())
     }
 
+    fun meldingFraOebs() {
+        registerPoint(MELDING_FRA_OEBS, mapOf("counter" to 1L), emptyMap())
+    }
+
+    fun feilVedMeldingFraOebs() {
+        registerPoint(OEBS_MELDING_FEIL, mapOf("counter" to 1L), emptyMap())
+    }
+
     fun test() {
         println("writing to sensu")
         registerPoint("testing", mapOf("counter" to 1L), emptyMap())
     }
 
-
     private fun registerPoint(measurement: String, fields: Map<String, Any>, tags: Map<String, String>) {
         log.info("Posting point to Influx: measurment {} fields {} tags {} ", measurement, fields, tags)
         val point = Point.measurement(measurement)
@@ -66,12 +73,12 @@ class SensuMetrics {
 
     private class SensuEvent(sensuName: String, output: String) {
         val json: String = "{" +
-                "\"name\":\"" + sensuName + "\"," +
-                "\"type\":\"metric\"," +
-                "\"handlers\":[\"events_nano\"]," +
-                "\"output\":\"" + output.replace("\\", "\\\\", true) + "\"," +
-                "\"status\":0" +
-                "}"
+            "\"name\":\"" + sensuName + "\"," +
+            "\"type\":\"metric\"," +
+            "\"handlers\":[\"events_nano\"]," +
+            "\"output\":\"" + output.replace("\\", "\\\\", true) + "\"," +
+            "\"status\":0" +
+            "}"
     }
 
     companion object {
@@ -82,7 +89,9 @@ class SensuMetrics {
         )
 
         private const val SOKNADER = "hm-oebs-listener"
-        const val MELDING_TIL_RAPID_SUKSESS = "$SOKNADER.soknadmottatt.rapid.suksess"
-        const val MELDING_TIL_RAPID_FEILET = "$SOKNADER.soknadmottatt.rapid.feilet"
+        const val MELDING_TIL_RAPID_SUKSESS = "$SOKNADER.rapid.suksess"
+        const val MELDING_TIL_RAPID_FEILET = "$SOKNADER.rapid.feilet"
+        const val MELDING_FRA_OEBS = "$SOKNADER.oebs.melding"
+        const val OEBS_MELDING_FEIL = "$SOKNADER.oebs.feil"
     }
-}
+}