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

Author: SylvainJuge

README.md

@@ -141,7 +141,7 @@ For more information about the maintainer role, see the [community repository](h
 - [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana
 - [Jack Berg](https://github.com/jack-berg), New Relic
 - [Jason Plumb](https://github.com/breedx-splk), Splunk
-- [Jay DeLuca](https://github.com/jaydeluca)
+- [Jay DeLuca](https://github.com/jaydeluca), Grafana
 - [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 - [John Watson](https://github.com/jkwatson), Cloudera
 - [Jonas Kunz](https://github.com/JonasKunz), Elastic

conventions/build.gradle.kts

@@ -57,7 +57,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
   implementation("com.google.guava:guava:33.4.8-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.7")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
   implementation("org.owasp:dependency-check-gradle:12.1.3")

dependencyManagement/build.gradle.kts

@@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf(
   // even if they are only used by test dependencies, so not using junit bom since it is LGPL
 
   "com.fasterxml.jackson:jackson-bom:2.19.1",
-  "com.squareup.okio:okio-bom:3.14.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
+  "com.squareup.okio:okio-bom:3.15.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.4.8-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",

examples/distro/build.gradle

@@ -13,7 +13,7 @@ buildscript {
   }
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
-    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.7"
+    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.8"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.18.0-alpha-SNAPSHOT"
   }
 }

examples/extension/build.gradle

@@ -10,7 +10,7 @@ plugins {
   into a single jar.
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
-  id "com.gradleup.shadow" version "8.3.7"
+  id "com.gradleup.shadow" version "8.3.8"
   id "com.diffplug.spotless" version "7.0.4"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.18.0-alpha-SNAPSHOT"

gradle-plugins/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
   implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
-  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.7")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.8")
 
   testImplementation("org.assertj:assertj-core:3.27.3")
 

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

@@ -43,7 +43,7 @@ testing {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
-        version = if (testLatestDeps) "latest.release" else "1.12.80"
+        val version = if (testLatestDeps) "latest.release" else "1.12.80"
         implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
       }
     }

licenses/licenses.md

@@ -12,11 +12,11 @@ plugins {
   id("otel.java-conventions")
 
   id("com.google.cloud.tools.jib")
-  id("io.quarkus") version "3.24.1"
+  id("io.quarkus") version "3.24.2"
 }
 
 dependencies {
-  implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.1"))
+  implementation(enforcedPlatform("io.quarkus:quarkus-bom:3.24.2"))
   implementation("io.quarkus:quarkus-rest")
 }