oppgraderer versjoner

fjerner call logging for /isalive og /isready

Author: di0nys1us

build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.21"
 }
 
 group = "no.nav.hjelpemidler"
@@ -15,22 +15,22 @@ repositories {
 dependencies {
     implementation("com.natpryce:konfig:1.6.10.0")
     implementation("org.influxdb:influxdb-java:2.22")
-    implementation("com.github.navikt:rapids-and-rivers:2022.05.11-08.56.814d601f572e") {
+    implementation("com.github.navikt:rapids-and-rivers:2022110411121667556720.8a951a765583") {
         exclude(group = "ch.qos.logback")
     }
 
     // Logging
-    implementation("io.github.microutils:kotlin-logging:2.1.21")
-    runtimeOnly("ch.qos.logback:logback-classic:1.2.11")
-    runtimeOnly("net.logstash.logback:logstash-logback-encoder:7.1.1")
+    implementation("io.github.microutils:kotlin-logging:3.0.4")
+    runtimeOnly("ch.qos.logback:logback-classic:1.4.4")
+    runtimeOnly("net.logstash.logback:logstash-logback-encoder:7.2")
 
     // Jackson
-    val jacksonVersion = "2.13.3"
+    val jacksonVersion = "2.14.0"
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
 
     // Ktor
-    val ktorVersion = "2.0.1"
+    val ktorVersion = "2.1.3"
     implementation("io.ktor:ktor-server-auth:$ktorVersion")
     implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
     implementation("io.ktor:ktor-server-call-logging:$ktorVersion")
@@ -39,7 +39,7 @@ dependencies {
     // Testing
     testImplementation(kotlin("test"))
     testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
-    testImplementation("io.mockk:mockk:1.12.4")
+    testImplementation("io.mockk:mockk:1.13.2")
 }
 
 tasks.withType<KotlinCompile> {

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

@@ -7,6 +7,7 @@ import io.ktor.server.auth.Authentication
 import io.ktor.server.auth.authenticate
 import io.ktor.server.plugins.callloging.CallLogging
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.server.request.path
 import io.ktor.server.routing.routing
 import mu.KotlinLogging
 import no.nav.helse.rapids_rivers.KafkaConfig
@@ -52,7 +53,15 @@ fun main() {
         )
     ).withKtorModule {
         install(CallLogging) {
+            disableDefaultColors()
             level = Level.DEBUG
+            filter {
+                when (it.request.path()) {
+                    "/isalive" -> false
+                    "/isready" -> false
+                    else -> true
+                }
+            }
         }
         install(ContentNegotiation) {
             jackson {

src/main/kotlin/no/nav/hjelpemidler/api/HotSak.kt

@@ -22,7 +22,7 @@ fun parseHotsakOrdrelinje(context: Context, ordrelinje: OrdrelinjeOebs) {
         sikkerlogg.warn("Vedtak HOTSAK-melding med manglende informasjon: $message")
         context.metrics.manglendeFeltForVedtakHOTSAK()
 
-        PostToSlack().post(
+        PostToSlack.post(
             Configuration.application["SLACK_HOOK"]!!,
             "*${Configuration.profile}* - Manglende felt i Hotsak Oebs ordrelinje: ```$message```",
             "#digihot-hotsak-varslinger-dev"

src/main/kotlin/no/nav/hjelpemidler/api/InfotrygdSak.kt

@@ -22,7 +22,7 @@ fun parseInfotrygdOrdrelinje(context: Context, ordrelinje: OrdrelinjeOebs) {
         sikkerlogg.warn("Vedtak Infotrygd-melding med manglande informasjon: $message")
         context.metrics.manglendeFeltForVedtakInfotrygd()
 
-        PostToSlack().post(
+        PostToSlack.post(
             Configuration.application["SLACK_HOOK"]!!,
             "*${Configuration.profile}* - Manglande felt i Vedtak Infotrygd-melding: ```$message```",
             "#digihot-brukers-hjelpemiddelside-dev"

src/main/kotlin/no/nav/hjelpemidler/configuration/Configuration.kt

@@ -10,9 +10,10 @@ import com.natpryce.konfig.stringType
 internal object Configuration {
 
     private val prodProperties = ConfigurationMap(
-        Profile.PROD.pair(),
+        Profile.PROD.entry(),
 
         "HTTP_PORT" to "8080",
+
         "kafka.aiven.consumer" to "hm-oebs-listener-v1",
         "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
         "kafka.reset.policy" to "latest",
@@ -21,16 +22,19 @@ internal object Configuration {
     )
 
     private val devProperties = ConfigurationMap(
-        Profile.DEV.pair(),
+        Profile.DEV.entry(),
+
         "HTTP_PORT" to "8080",
+
         "kafka.aiven.consumer" to "hm-oebs-listener-v2",
         "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
         "kafka.reset.policy" to "latest",
+
         "SENSU_URL" to "https://digihot-proxy.dev-fss-pub.nais.io/sensu",
     )
 
     private val localProperties = ConfigurationMap(
-        Profile.LOCAL.pair(),
+        Profile.LOCAL.entry(),
 
         "HTTP_PORT" to "8085",
         "OEBSTOKEN" to "abc",
@@ -81,6 +85,6 @@ internal object Configuration {
     enum class Profile {
         PROD, DEV, LOCAL;
 
-        fun pair(): Pair<String, String> = "application.profile" to name
+        fun entry(): Pair<String, String> = "application.profile" to name
     }
 }

src/main/kotlin/no/nav/hjelpemidler/slack/PostToSlack.kt

@@ -6,7 +6,7 @@ import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
 
-class PostToSlack {
+object PostToSlack {
     private val username = "hm-oebs-listener"
     private val icon_emoji = ":this-is-fine-fire:"
     private val objectMapper = jacksonObjectMapper()