eksponerer override av status pages

navikt · Nov 13, 2024 · 97facd5 · 97facd5
1 parent 6f0a7a6
commit 97facd5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ val logbackClassicVersion = "1.5.12"
 val logbackEncoderVersion = "8.0"
 val awaitilityVersion = "4.2.2"
 val kafkaTestcontainerVersion = "1.20.3"
-val tbdLibsVersion = "2024.11.12-20.46-e1fd6a25"
+val tbdLibsVersion = "2024.11.13-14.59-b1d0e5c4"
 
 group = "com.github.navikt"
 version = properties["version"] ?: "local-build"

diff --git a/src/main/kotlin/no/nav/helse/rapids_rivers/RapidApplication.kt b/src/main/kotlin/no/nav/helse/rapids_rivers/RapidApplication.kt
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.github.navikt.tbd_libs.kafka.AivenConfig
 import com.github.navikt.tbd_libs.kafka.ConsumerProducerFactory
 import com.github.navikt.tbd_libs.naisful.NaisEndpoints
+import com.github.navikt.tbd_libs.naisful.defaultStatusPagesConfig
 import com.github.navikt.tbd_libs.naisful.naisApp
 import com.github.navikt.tbd_libs.rapids_and_rivers.JsonMessage
 import com.github.navikt.tbd_libs.rapids_and_rivers.KafkaRapid
@@ -17,6 +18,7 @@ import com.github.navikt.tbd_libs.rapids_and_rivers_api.RapidsConnection
 import io.ktor.server.application.*
 import io.ktor.server.cio.*
 import io.ktor.server.engine.*
+import io.ktor.server.plugins.statuspages.StatusPagesConfig
 import io.micrometer.core.instrument.Clock
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.prometheusmetrics.PrometheusConfig
@@ -188,6 +190,7 @@ class RapidApplication internal constructor(
         private var ktor: EmbeddedServer<CIOApplicationEngine, CIOApplicationEngine.Configuration>? = null
         private val modules = mutableListOf<Application.() -> Unit>()
         private var naisEndpoints = NaisEndpoints.Default
+        private var statusPagesConfig: StatusPagesConfig.() -> Unit = { defaultStatusPagesConfig() }
 
         fun withHttpPort(httpPort: Int) = apply {
             this.httpPort = httpPort
@@ -201,6 +204,10 @@ class RapidApplication internal constructor(
             this.modules.add(module)
         }
 
+        fun withStatusPagesConfig(statusPagesConfig: StatusPagesConfig.() -> Unit) = apply {
+            this.statusPagesConfig = statusPagesConfig
+        }
+
         fun withIsAliveEndpoint(isAliveEndpoint: String) = apply {
             naisEndpoints = naisEndpoints.copy(isreadyEndpoint = isAliveEndpoint)
         }
@@ -237,6 +244,7 @@ class RapidApplication internal constructor(
                 readyCheck = rapid::isReady,
                 preStopHook = stopHook::handlePreStopRequest,
                 cioConfiguration = cioConfiguration,
+                statusPagesConfig = statusPagesConfig,
                 applicationModule = {
                     modules.forEach { it() }
                 }