open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to slf4j 2.0.2 (#6774) 

~testLatestDeps is failing, see #6791~
This commit is contained in:
Trask Stalnaker 2022-10-05 18:28:53 -07:00 committed by GitHub
parent 06b6f0a2f2
commit 6f6af66c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 155 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dependencyManagement/build.gradle.kts
View File

@ -59,18 +59,18 @@ val CORE_DEPENDENCIES = listOf(
"org.mockito:mockito-core:4.8.0",
"org.mockito:mockito-junit-jupiter:4.8.0",
"org.mockito:mockito-inline:4.8.0",
"org.slf4j:slf4j-api:1.7.36",
"org.slf4j:slf4j-simple:1.7.36",
"org.slf4j:log4j-over-slf4j:1.7.36",
"org.slf4j:jcl-over-slf4j:1.7.36",
"org.slf4j:jul-to-slf4j:1.7.36"
"org.slf4j:slf4j-api:2.0.2",
"org.slf4j:slf4j-simple:2.0.2",
"org.slf4j:log4j-over-slf4j:2.0.2",
"org.slf4j:jcl-over-slf4j:2.0.2",
"org.slf4j:jul-to-slf4j:2.0.2"
)
// See the comment above about why we keep this rather large list.
// There are dependencies included here that appear to have no usages, but are maintained at
// this top level to help consistently satisfy large numbers of transitive dependencies.
val DEPENDENCIES = listOf(
"ch.qos.logback:logback-classic:1.2.11",
"ch.qos.logback:logback-classic:1.3.1", // 1.4+ requires Java 11+
"com.github.stefanbirkner:system-lambda:1.2.1",
"com.github.stefanbirkner:system-rules:1.19.0",
"uk.org.webcompere:system-stubs-jupiter:2.0.1",

8
instrumentation/apache-camel-2.20/javaagent/build.gradle.kts
View File

@ -73,3 +73,11 @@ tasks {
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

12
instrumentation/dropwizard/dropwizard-testing/build.gradle.kts
View File

@ -13,5 +13,13 @@ dependencies {
testImplementation("com.fasterxml.jackson.module:jackson-module-afterburner")
}
// Requires old Guava. Can't use enforcedPlatform since predates BOM
configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0")
configurations.testRuntimeClasspath {
resolutionStrategy {
// Requires old Guava. Can't use enforcedPlatform since predates BOM
force("com.google.guava:guava:19.0")
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/grails-3.0/javaagent/build.gradle.kts
View File

@ -54,6 +54,14 @@ configurations.configureEach {
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}
tasks.withType<Test>().configureEach {
// required on jdk17
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")

8
instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts
View File

@ -24,3 +24,11 @@ tasks.withType<Test>().configureEach {
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

10
instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts
View File

@ -70,6 +70,14 @@ tasks {
withType<Test>().configureEach {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-integration-4.1/library/build.gradle.kts
View File

@ -22,3 +22,11 @@ tasks {
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

16
instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
View File

@ -65,3 +65,19 @@ tasks {
dependsOn(testing.suites)
}
}
configurations {
listOf(
testRuntimeClasspath,
named("testNoReceiveTelemetryRuntimeClasspath")
)
.forEach {
it.configure {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}
}
}

8
instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts
View File

@ -19,3 +19,11 @@ dependencies {
testLibrary("org.springframework.boot:spring-boot-starter-test:2.5.3")
testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

10
instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts
View File

@ -25,6 +25,14 @@ dependencies {
tasks {
test {
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts
View File

@ -25,3 +25,11 @@ dependencies {
tasks.withType<Test>().configureEach {
jvmArgs("-Djava.rmi.server.hostname=127.0.0.1")
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts
View File

@ -68,3 +68,11 @@ tasks.withType<Test>().configureEach {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts
View File

@ -54,3 +54,11 @@ tasks.withType<Test>().configureEach {
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-webmvc-5.3/library/build.gradle.kts
View File

@ -15,3 +15,11 @@ dependencies {
exclude("org.junit.vintage", "junit-vintage-engine")
}
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

8
instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
View File

@ -52,3 +52,11 @@ tasks.withType<Test>().configureEach {
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
}
configurations.testRuntimeClasspath {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}

21
instrumentation/vaadin-14.2/javaagent/build.gradle.kts
View File

@ -46,7 +46,7 @@ tasks {
if (findProperty("testLatestDeps") as Boolean) {
dependsOn(vaadin14LatestTest)
}
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
}
}
@ -72,3 +72,22 @@ dependencies {
// add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+")
add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.1.+")
}
configurations {
listOf(
testRuntimeClasspath,
named("vaadin142TestRuntimeClasspath"),
named("vaadin14LatestTestRuntimeClasspath"),
named("vaadin16TestRuntimeClasspath"),
named("latestDepTestRuntimeClasspath")
)
.forEach {
it.configure {
resolutionStrategy {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")
}
}
}
}

6
javaagent-internal-logging-simple/build.gradle.kts
View File

@ -9,14 +9,12 @@ plugins {
group = "io.opentelemetry.javaagent"
val agentSlf4jVersion = "2.0.0"
dependencies {
compileOnly(project(":javaagent-bootstrap"))
compileOnly(project(":javaagent-tooling"))
implementation("org.slf4j:slf4j-api:$agentSlf4jVersion")
implementation("org.slf4j:slf4j-simple:$agentSlf4jVersion")
implementation("org.slf4j:slf4j-api")
implementation("org.slf4j:slf4j-simple")
annotationProcessor("com.google.auto.service:auto-service")
compileOnly("com.google.auto.service:auto-service-annotations")

6
licenses/licenses.md generated
View File

@ -1,7 +1,7 @@
#javaagent
##Dependency License Report
_2022-09-26 15:38:28 PDT_
_2022-09-28 14:05:54 PDT_
## Apache License, Version 2.0
**1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18`
@ -201,11 +201,11 @@ _2022-09-26 15:38:28 PDT_
## MIT License
**44** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.0`
**44** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.2`
> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org)
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
**45** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.0`
**45** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.2`
> - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org)
> - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)