Skip to content

Commit f60af5d

Browse files
fix(deps): update jackson packages to v2.17.0 (main) (minor) (#10828)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent d93fb1e commit f60af5d

File tree

16 files changed

+24
-20
lines changed

16 files changed

+24
-20
lines changed

dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ val groovyVersion = "4.0.19"
2727
// configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0"
2828

2929
val DEPENDENCY_BOMS = listOf(
30-
"com.fasterxml.jackson:jackson-bom:2.16.2",
30+
"com.fasterxml.jackson:jackson-bom:2.17.0",
3131
"com.squareup.okio:okio-bom:3.9.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3232
"com.google.guava:guava-bom:33.0.0-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",

examples/distro/smoke-tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
testImplementation("org.testcontainers:testcontainers:1.19.7")
7-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2")
7+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
88
testImplementation("com.google.protobuf:protobuf-java-util:3.25.3")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.1.0-alpha")

examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dependencies {
100100

101101
//All dependencies below are only for tests
102102
testImplementation("org.testcontainers:testcontainers:1.19.7")
103-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2")
103+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
104104
testImplementation("com.google.protobuf:protobuf-java-util:3.25.3")
105105
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
106106
testImplementation("io.opentelemetry:opentelemetry-api")

instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/HeadersFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static Map<String, String> ofStream(InputStream inputStream) {
3232
}
3333
while (parser.nextToken() != JsonToken.END_OBJECT) {
3434
parser.nextToken();
35-
if (!parser.getCurrentName().equals("headers")) {
35+
if (!parser.currentName().equals("headers")) {
3636
parser.skipChildren();
3737
continue;
3838
}
@@ -46,7 +46,7 @@ static Map<String, String> ofStream(InputStream inputStream) {
4646
while (parser.nextToken() != JsonToken.END_OBJECT) {
4747
String value = parser.nextTextValue();
4848
if (value != null) {
49-
headers.put(parser.getCurrentName(), value);
49+
headers.put(parser.currentName(), value);
5050
}
5151
}
5252
return headers;

instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void handleRequest(InputStream input, OutputStream output, Context contex
146146
parser.nextToken();
147147
while (parser.nextToken() != JsonToken.END_OBJECT) {
148148
parser.nextToken();
149-
if (!parser.getCurrentName().equals("body")) {
149+
if (!parser.currentName().equals("body")) {
150150
parser.skipChildren();
151151
continue;
152152
}

javaagent-tooling/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ dependencies {
2323
implementation("io.opentelemetry:opentelemetry-extension-kotlin")
2424
implementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
2525
// the incubator's ViewConfigCustomizer is used to support loading yaml-based metric views
26-
implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
26+
implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") {
27+
// we use byte-buddy-dep
28+
exclude("net.bytebuddy", "byte-buddy")
29+
}
2730

2831
// Exporters with dependencies
2932
implementation("io.opentelemetry:opentelemetry-exporter-logging")

licenses/licenses.md

+13-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testing/armeria-shaded-for-testing/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ tasks {
1919
// Ensures tests are not affected by Armeria instrumentation
2020
relocate("com.linecorp.armeria", "io.opentelemetry.testing.internal.armeria")
2121
relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson")
22+
relocate("net.bytebuddy", "io.opentelemetry.testing.internal.bytebuddy")
2223

2324
// Allows tests of Netty instrumentations which would otherwise conflict.
2425
// The relocation must end with io.netty to allow Netty to detect shaded native libraries.

0 commit comments

Comments
 (0)