Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: "$rootDir/gradle/java.gradle"
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
apply from: "$rootDir/gradle/slf4j-simple.gradle"
apply plugin: 'idea'

testJvmConstraints {
Expand Down Expand Up @@ -49,6 +47,13 @@ tasks.named("check") {
dependsOn "previewTest"
}

// Use latest logback for Java 21+ tests with better virtual thread support.
configurations.named("testRuntimeClasspath") {
resolutionStrategy {
force libs.logback.classic.latest
}
}

dependencies {
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
plugins {
id 'idea'
}

apply from: "$rootDir/gradle/java.gradle"

muzzle {
pass {
coreJdk('25')
}
}

idea {
module {
jdkName = '25'
}
}

// Use latest logback for Java 21+ tests with better virtual thread support.
configurations.named("testRuntimeClasspath") {
resolutionStrategy {
force libs.logback.classic.latest
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ plugins {
}

apply from: "$rootDir/gradle/java.gradle"
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
apply from: "$rootDir/gradle/slf4j-simple.gradle"

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_21
Expand All @@ -30,3 +28,11 @@ tasks.named("compileTestJava", JavaCompile) {
dependencies {
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
}

// Use latest logback for Java 21+ tests with better virtual thread support.
configurations.named("testRuntimeClasspath") {
resolutionStrategy {
force libs.logback.classic.latest
}
}

2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ lz4 = "1.7.1"
# Logging
slf4j = "1.7.30"
logback = "1.2.13"
logback-latest = "1.5.27"

# JSON
jackson = "2.20.0"
Expand Down Expand Up @@ -134,6 +135,7 @@ lz4 = { module = "org.lz4:lz4-java", version.ref = "lz4" }

# Logging
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
logback-classic-latest = { module = "ch.qos.logback:logback-classic", version.ref = "logback-latest" }
logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j" }
jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
Expand Down
27 changes: 0 additions & 27 deletions gradle/slf4j-simple.gradle

This file was deleted.