Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-other

Author: SylvainJuge

benchmark-overhead/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers-postgresql")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("org.jooq:joox:2.0.1")
   testImplementation("com.jayway.jsonpath:json-path:2.9.0")
   testImplementation("org.slf4j:slf4j-simple:2.0.17")

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 buildscript {
   dependencies {
-    classpath("com.squareup.okhttp3:okhttp:5.2.1")
+    classpath("com.squareup.okhttp3:okhttp:5.3.0")
   }
 }
 

examples/distro/instrumentation/servlet-3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
 
-  testImplementation "com.squareup.okhttp3:okhttp:5.2.1"
+  testImplementation "com.squareup.okhttp3:okhttp:5.3.0"
   testImplementation "javax.servlet:javax.servlet-api:3.0.1"
   testImplementation "org.eclipse.jetty:jetty-server:8.2.0.v20160908"
   testImplementation "org.eclipse.jetty:jetty-servlet:8.2.0.v20160908"

examples/distro/smoke-tests/build.gradle

@@ -6,7 +6,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 

examples/extension/build.gradle

@@ -101,7 +101,7 @@ dependencies {
   testImplementation("org.testcontainers:testcontainers:2.0.1")
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.33.0")
-  testImplementation("com.squareup.okhttp3:okhttp:5.2.1")
+  testImplementation("com.squareup.okhttp3:okhttp:5.3.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha")
 

instrumentation-docs/build.gradle.kts

@@ -9,7 +9,7 @@ otelJava {
 
 dependencies {
   implementation("org.yaml:snakeyaml:2.5")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.0"))

settings.gradle.kts

@@ -21,7 +21,7 @@ plugins {
   // in particular, these commands are failing (reproducible locally):
   // ./gradlew :smoke-tests:images:servlet:buildLinuxTestImages pushMatrix -PsmokeTestServer=jetty
   // ./gradlew :smoke-tests:images:servlet:buildWindowsTestImages pushMatrix -PsmokeTestServer=jetty
-  id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
+  id("com.bmuschko.docker-remote-api") version "10.0.0" apply false
   id("com.gradle.develocity") version "4.2.2"
 }
 

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

@@ -11,7 +11,7 @@ dependencies {
   implementation("io.opentelemetry.proto:opentelemetry-proto")
   implementation("com.google.protobuf:protobuf-java-util:4.33.0")
   implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
-  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1")
   // we'll replace caffeine shaded in armeria with a later version that doesn't use Unsafe. Caffeine
   // 3+ doesn't work with Java 8, but that is fine since --sun-misc-unsafe-memory-access=deny
   // requires Java 23.