Skip to content
Merged
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
@@ -0,0 +1,29 @@
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.tasks.testing.Test
import org.gradle.kotlin.dsl.getByType

val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
val slf4jVersion = libs.findVersion("slf4j").get().requiredVersion
val slf4jSimple = "org.slf4j:slf4j-simple:$slf4jVersion"
val projectDependencies = dependencies

configurations.configureEach {
if (name.contains("test", ignoreCase = true)) {
if (name.endsWith("runtimeClasspath", ignoreCase = true)) {
exclude(group = "ch.qos.logback")
}

if (name.endsWith("runtimeOnly", ignoreCase = true)) {
projectDependencies.add(name, slf4jSimple)
}
}
}

tasks.withType<Test>().configureEach {
jvmArgs(
"-Dorg.slf4j.simpleLogger.defaultLogLevel=debug",
"-Dorg.slf4j.simpleLogger.showThreadName=true",
"-Dorg.slf4j.simpleLogger.showDateTime=true",
"-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS",
)
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
}

// 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 Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
}

// 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"

muzzle {
pass {
coreJdk('25')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
// Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI.
id 'dd-trace-java.conventions.testing.slf4j-simple'
}

// 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 Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'idea'
id 'dd-trace-java.module.instrumentation'
id 'dd-trace-java.conventions.testing.slf4j-simple'
}

muzzle {
Expand All @@ -9,8 +10,6 @@ muzzle {
}
}

apply from: "$rootDir/gradle/slf4j-simple.gradle"

tracerJava {
addSourceSetFor(JavaVersion.VERSION_25)
}
Expand Down
27 changes: 0 additions & 27 deletions gradle/slf4j-simple.gradle

This file was deleted.