La til error ID i feilhåndtering, benytte IP i query-oppsett i bekref…

…telse-api
navikt · Oct 4, 2024 · 7b666d9 · 7b666d9
1 parent 62c5b91
commit 7b666d9
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 5 deletions.
diff --git a/apps/bekreftelse-api/nais/nais-dev.yaml b/apps/bekreftelse-api/nais/nais-dev.yaml
@@ -9,6 +9,10 @@ spec:
   image: {{ image }}
   port: 8080
   env:
+    - name: POD_IP
+      valueFrom:
+        fieldRef:
+          fieldPath: status.podIP
     - name: KAFKA_STREAMS_ID_SUFFIX
       value: "v2"
     - name: KAFKA_PAW_ARBEIDSSOKER_BEKREFTELSE_TOPIC

diff --git a/apps/bekreftelse-api/nais/nais-prod.yaml b/apps/bekreftelse-api/nais/nais-prod.yaml
@@ -9,6 +9,10 @@ spec:
   image: {{ image }}
   port: 8080
   env:
+    - name: POD_IP
+      valueFrom:
+        fieldRef:
+          fieldPath: status.podIP
     - name: KAFKA_STREAMS_ID_SUFFIX
       value: "v1"
     - name: KAFKA_PAW_ARBEIDSSOKER_BEKREFTELSE_TOPIC

diff --git a/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/Application.kt b/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/Application.kt
@@ -26,9 +26,10 @@ fun main() {
     val applicationContext = ApplicationContext.create()
     val appName = applicationContext.serverConfig.runtimeEnvironment.appNameOrDefaultForLocal()
 
-    logger.info("Starter: $appName")
 
     with(applicationContext.serverConfig) {
+        logger.info("Starter $appName med IP $ip og port $port")
+
         embeddedServer(Netty, port = port) {
             module(applicationContext)
         }.apply {

diff --git a/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/config/ServerConfig.kt b/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/config/ServerConfig.kt
@@ -6,8 +6,9 @@ import no.nav.paw.config.env.currentRuntimeEnvironment
 const val SERVER_CONFIG_FILE_NAME = "server_config.toml"
 
 data class ServerConfig(
-    val port: Int,
+    val ip: String,
     val host: String,
+    val port: Int,
     val callGroupSize: Int,
     val workerGroupSize: Int,
     val connectionGroupSize: Int,

diff --git a/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/plugins/KafkaStreams.kt b/apps/bekreftelse-api/src/main/kotlin/no/nav/paw/bekreftelse/api/plugins/KafkaStreams.kt
@@ -59,7 +59,7 @@ fun buildKafkaStreams(
     )
         .withDefaultKeySerde(Serdes.Long()::class)
         .withDefaultValueSerde(SpecificAvroSerde::class)
-        .withServerConfig(serverConfig.host, serverConfig.port)
+        .withServerConfig(serverConfig.ip, serverConfig.port)
 
     val kafkaStreams = KafkaStreams(
         topology,

diff --git a/apps/bekreftelse-api/src/main/resources/local/server_config.toml b/apps/bekreftelse-api/src/main/resources/local/server_config.toml
@@ -1,5 +1,6 @@
-port = 8080
+ip = "127.0.0.1"
 host = "localhost"
+port = 8080
 callGroupSize = 16
 workerGroupSize = 8
 connectionGroupSize = 8

diff --git a/apps/bekreftelse-api/src/main/resources/nais/server_config.toml b/apps/bekreftelse-api/src/main/resources/nais/server_config.toml
@@ -1,5 +1,6 @@
+ip = "${POD_IP}"
+host = "${HOSTNAME}"
 port = 8080
-host = "${OTEL_POD_IP}"
 callGroupSize = 16
 workerGroupSize = 8
 connectionGroupSize = 8

diff --git a/lib/error-handling/src/main/kotlin/no/nav/paw/error/handler/HttpExceptionHandler.kt b/lib/error-handling/src/main/kotlin/no/nav/paw/error/handler/HttpExceptionHandler.kt
@@ -15,11 +15,14 @@ import no.nav.paw.error.model.build500Error
 import no.nav.paw.error.model.buildError
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.slf4j.MDC
 
 private val logger: Logger = LoggerFactory.getLogger("no.nav.paw.logger.error.http")
 
 suspend fun ApplicationCall.handleException(throwable: Throwable) {
     val problemDetails = resolveProblemDetails(request, throwable)
+    MDC.put("x_error_id", problemDetails.id.toString())
+    MDC.put("x_error_code", problemDetails.code)
     logger.error(problemDetails.detail, throwable)
     respond(problemDetails.status, problemDetails)
 }

diff --git a/lib/error-handling/src/main/kotlin/no/nav/paw/error/model/ProblemDetails.kt b/lib/error-handling/src/main/kotlin/no/nav/paw/error/model/ProblemDetails.kt
@@ -5,12 +5,14 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import io.ktor.http.HttpStatusCode
 import no.nav.paw.error.serialize.HttpStatusCodeDeserializer
 import no.nav.paw.error.serialize.HttpStatusCodeSerializer
+import java.util.*
 
 /**
  * Object som inneholder detaljer om en oppstått feilsituasjon, basert på RFC 9457.
  * @see <a href="https://datatracker.ietf.org/doc/html/rfc9457">IETF RFC 9457</a>
  */
 data class ProblemDetails(
+    val id: UUID = UUID.randomUUID(),
     val code: String, // Maskinelt lesbar feilkode
     val title: String,
     @JsonSerialize(using = HttpStatusCodeSerializer::class) @JsonDeserialize(using = HttpStatusCodeDeserializer::class) val status: HttpStatusCode,