diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index ba9e74f305..79cf97c1b2 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -27,7 +27,7 @@ val groovyVersion = "4.0.19" // configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0" val DEPENDENCY_BOMS = listOf( - "com.fasterxml.jackson:jackson-bom:2.16.2", + "com.fasterxml.jackson:jackson-bom:2.17.0", "com.squareup.okio:okio-bom:3.9.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637 "com.google.guava:guava-bom:33.0.0-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle index d47095c719..916c1285a8 100644 --- a/examples/distro/smoke-tests/build.gradle +++ b/examples/distro/smoke-tests/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { testImplementation("org.testcontainers:testcontainers:1.19.7") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0") testImplementation("com.google.protobuf:protobuf-java-util:3.25.3") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.1.0-alpha") diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index c5815bad4e..a216b9dc9a 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -100,7 +100,7 @@ dependencies { //All dependencies below are only for tests testImplementation("org.testcontainers:testcontainers:1.19.7") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0") testImplementation("com.google.protobuf:protobuf-java-util:3.25.3") testImplementation("com.squareup.okhttp3:okhttp:4.12.0") testImplementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactory.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactory.java index 590b887683..75ba3c6f25 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactory.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactory.java @@ -32,7 +32,7 @@ final class HeadersFactory { } while (parser.nextToken() != JsonToken.END_OBJECT) { parser.nextToken(); - if (!parser.getCurrentName().equals("headers")) { + if (!parser.currentName().equals("headers")) { parser.skipChildren(); continue; } @@ -46,7 +46,7 @@ final class HeadersFactory { while (parser.nextToken() != JsonToken.END_OBJECT) { String value = parser.nextTextValue(); if (value != null) { - headers.put(parser.getCurrentName(), value); + headers.put(parser.currentName(), value); } } return headers; diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java index 4ad18114a0..3b9f9f968b 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java @@ -146,7 +146,7 @@ public class AwsLambdaStreamWrapperHttpPropagationTest { parser.nextToken(); while (parser.nextToken() != JsonToken.END_OBJECT) { parser.nextToken(); - if (!parser.getCurrentName().equals("body")) { + if (!parser.currentName().equals("body")) { parser.skipChildren(); continue; } diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index 3bfe59719b..6b41f188e9 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -23,7 +23,10 @@ dependencies { implementation("io.opentelemetry:opentelemetry-extension-kotlin") implementation("io.opentelemetry:opentelemetry-extension-trace-propagators") // the incubator's ViewConfigCustomizer is used to support loading yaml-based metric views - implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") + implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") { + // we use byte-buddy-dep + exclude("net.bytebuddy", "byte-buddy") + } // Exporters with dependencies implementation("io.opentelemetry:opentelemetry-exporter-logging") diff --git a/licenses/jackson-annotations-2.16.2.jar/META-INF/LICENSE b/licenses/jackson-annotations-2.17.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-annotations-2.16.2.jar/META-INF/LICENSE rename to licenses/jackson-annotations-2.17.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-annotations-2.16.2.jar/META-INF/NOTICE b/licenses/jackson-annotations-2.17.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-annotations-2.16.2.jar/META-INF/NOTICE rename to licenses/jackson-annotations-2.17.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-core-2.16.2.jar/META-INF/LICENSE b/licenses/jackson-core-2.17.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.16.2.jar/META-INF/LICENSE rename to licenses/jackson-core-2.17.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.16.2.jar/META-INF/NOTICE b/licenses/jackson-core-2.17.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.16.2.jar/META-INF/NOTICE rename to licenses/jackson-core-2.17.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-databind-2.16.2.jar/META-INF/LICENSE b/licenses/jackson-databind-2.17.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-databind-2.16.2.jar/META-INF/LICENSE rename to licenses/jackson-databind-2.17.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-databind-2.16.2.jar/META-INF/NOTICE b/licenses/jackson-databind-2.17.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-databind-2.16.2.jar/META-INF/NOTICE rename to licenses/jackson-databind-2.17.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-dataformat-yaml-2.16.2.jar/META-INF/LICENSE b/licenses/jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.16.2.jar/META-INF/LICENSE rename to licenses/jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE b/licenses/jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE rename to licenses/jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index f27b5a08fd..c8df25af6b 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2024-03-13 09:50:25 EET_ +_2024-03-13 10:54:35 EET_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -9,33 +9,33 @@ _2024-03-13 09:50:25 EET_ > - **POM Project URL**: [https://github.com/raphw/weak-lock-free](https://github.com/raphw/weak-lock-free) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.16.2` +**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.17.0` > - **Project URL**: [https://github.com/FasterXML/jackson](https://github.com/FasterXML/jackson) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [jackson-annotations-2.16.2.jar/META-INF/LICENSE](jackson-annotations-2.16.2.jar/META-INF/LICENSE) - - [jackson-annotations-2.16.2.jar/META-INF/NOTICE](jackson-annotations-2.16.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-annotations-2.17.0.jar/META-INF/LICENSE](jackson-annotations-2.17.0.jar/META-INF/LICENSE) + - [jackson-annotations-2.17.0.jar/META-INF/NOTICE](jackson-annotations-2.17.0.jar/META-INF/NOTICE) -**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.16.2` +**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.17.0` > - **Project URL**: [https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [jackson-core-2.16.2.jar/META-INF/LICENSE](jackson-core-2.16.2.jar/META-INF/LICENSE) - - [jackson-core-2.16.2.jar/META-INF/NOTICE](jackson-core-2.16.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-core-2.17.0.jar/META-INF/LICENSE](jackson-core-2.17.0.jar/META-INF/LICENSE) + - [jackson-core-2.17.0.jar/META-INF/NOTICE](jackson-core-2.17.0.jar/META-INF/NOTICE) -**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.16.2` +**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.17.0` > - **Project URL**: [https://github.com/FasterXML/jackson](https://github.com/FasterXML/jackson) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [jackson-databind-2.16.2.jar/META-INF/LICENSE](jackson-databind-2.16.2.jar/META-INF/LICENSE) - - [jackson-databind-2.16.2.jar/META-INF/NOTICE](jackson-databind-2.16.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-databind-2.17.0.jar/META-INF/LICENSE](jackson-databind-2.17.0.jar/META-INF/LICENSE) + - [jackson-databind-2.17.0.jar/META-INF/NOTICE](jackson-databind-2.17.0.jar/META-INF/NOTICE) -**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.16.2` +**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.17.0` > - **Project URL**: [https://github.com/FasterXML/jackson-dataformats-text](https://github.com/FasterXML/jackson-dataformats-text) > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [jackson-dataformat-yaml-2.16.2.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.16.2.jar/META-INF/LICENSE) - - [jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE) + - [jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE) **6** **Group:** `com.google.cloud.opentelemetry` **Name:** `detector-resources-support` **Version:** `0.27.0` > - **POM Project URL**: [https://github.com/GoogleCloudPlatform/opentelemetry-operations-java](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java) diff --git a/testing/armeria-shaded-for-testing/build.gradle.kts b/testing/armeria-shaded-for-testing/build.gradle.kts index e0ba5ce7eb..fe932238d4 100644 --- a/testing/armeria-shaded-for-testing/build.gradle.kts +++ b/testing/armeria-shaded-for-testing/build.gradle.kts @@ -19,6 +19,7 @@ tasks { // Ensures tests are not affected by Armeria instrumentation relocate("com.linecorp.armeria", "io.opentelemetry.testing.internal.armeria") relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson") + relocate("net.bytebuddy", "io.opentelemetry.testing.internal.bytebuddy") // Allows tests of Netty instrumentations which would otherwise conflict. // The relocation must end with io.netty to allow Netty to detect shaded native libraries.