Merge branch 'refs/heads/master' into file_handling

navikt · Jul 15, 2024 · 6ef1741 · 6ef1741
2 parents 5ff961a + 434b194
commit 6ef1741
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 47 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 
     implementation("io.micrometer:micrometer-registry-prometheus")
-    implementation("io.micrometer:micrometer-tracing-bridge-brave")
 
     implementation("org.projectreactor:reactor-spring:1.0.1.RELEASE")
 

diff --git a/src/main/kotlin/no/nav/klage/config/CustomTraceFilter.kt b/src/main/kotlin/no/nav/klage/config/CustomTraceFilter.kt
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,5 +1,3 @@
-navCallIdName: nav-callid
-
 spring:
   application:
     name: klage-dittnav-api
@@ -46,12 +44,7 @@ management:
     tags:
       application: ${spring.application.name}
   tracing:
-    baggage:
-      remote-fields:
-        - ${navCallIdName}
-      correlation:
-        fields:
-          - ${navCallIdName}
+    enabled: false
   prometheus:
     metrics:
       export:

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -1,5 +1,3 @@
-navCallIdName: nav-callid
-
 spring:
   application:
     name: klage-dittnav-api