Skip to content

Commit 03a2b8a

Browse files
committed
Group all dependencies in dependabot settings.
Avoid deprecated functions.
1 parent 2fc2b1c commit 03a2b8a

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ updates:
1010
schedule:
1111
interval: "daily"
1212
open-pull-requests-limit: 10
13+
groups:
14+
all-dependencies:
15+
patterns:
16+
- "*"

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ dependencies {
5454
testImplementation("org.mockito:mockito-inline:5.2.0")
5555
}
5656

57+
java.sourceCompatibility = JavaVersion.VERSION_17
58+
5759
tasks.withType<KotlinCompile> {
5860
kotlinOptions {
5961
freeCompilerArgs = listOf("-Xjsr305=strict")

src/main/kotlin/no/nav/klage/document/config/CustomTraceFilter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ class CustomTraceFilter(
2626
chain: FilterChain
2727
) {
2828
//Create if not exists
29-
tracer.createBaggage(navCallIdName, tracer.currentTraceContext().context()!!.traceId())
29+
tracer.createBaggageInScope(navCallIdName, tracer.currentTraceContext().context()!!.traceId())
3030

3131
//also add this, since some services require that version/spelling
32-
tracer.createBaggage("Nav-Call-Id", tracer.currentTraceContext().context()!!.traceId())
32+
tracer.createBaggageInScope("Nav-Call-Id", tracer.currentTraceContext().context()!!.traceId())
3333

3434
chain.doFilter(request, response)
3535
}

0 commit comments

Comments
 (0)