Merge pull request #39 from navikt/new-structure

Adds Sleuth to app.

Author: oyvind-wedoe

build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val mockkVersion = "1.13.2"
 val logstashVersion = "7.2"
 val springVersion = "2.5.5"
+val springSleuthVersion = "3.1.4"
 val testContainersVersion = "1.17.5"
 val springDocVersion = "1.6.11"
 val tokenValidationVersion = "2.1.6"
@@ -31,6 +32,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.cloud:spring-cloud-starter-sleuth:$springSleuthVersion")
 
     implementation("org.zalando:problem-spring-web-starter:$problemSpringWebStartVersion")
 

src/main/kotlin/no/nav/klage/document/clients/KabalJsonToPdfClient.kt

@@ -1,5 +1,6 @@
 package no.nav.klage.document.clients
 
+import brave.Tracer
 import no.nav.klage.document.domain.PDFDocument
 import no.nav.klage.document.util.getLogger
 import org.springframework.http.MediaType
@@ -8,7 +9,8 @@ import org.springframework.web.reactive.function.client.WebClient
 
 @Component
 class KabalJsonToPdfClient(
-    private val kabalJsonToPdfWebClient: WebClient
+    private val kabalJsonToPdfWebClient: WebClient,
+    private val tracer: Tracer
 ) {
     companion object {
         @Suppress("JAVA_CLASS_ON_COMPANION")
@@ -20,6 +22,7 @@ class KabalJsonToPdfClient(
             .uri { it.path("/topdf").build() }
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(json)
+            .header("Nav-Call-Id", tracer.currentSpan().context().traceIdString())
             .retrieve()
             .toEntity(ByteArray::class.java)
             .map {