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

Author: SylvainJuge

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -431,7 +431,7 @@ codenarc {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "10.23.1"
+  toolVersion = "10.24.0"
   maxWarnings = 0
 }
 

dependencyManagement/build.gradle.kts

@@ -108,7 +108,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
   "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
-  "io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha",
+  "io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
   "org.assertj:assertj-core:3.27.3",
   "org.awaitility:awaitility:4.3.0",

examples/distro/smoke-tests/build.gradle

@@ -7,7 +7,7 @@ dependencies {
   testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.0")
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.0")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
-  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
+  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
   testImplementation("io.opentelemetry:opentelemetry-api")
 
   testImplementation("ch.qos.logback:logback-classic:1.5.18")

examples/extension/build.gradle

@@ -102,7 +102,7 @@ dependencies {
   testImplementation("com.google.protobuf:protobuf-java-util:4.31.0")
   testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
   testImplementation("io.opentelemetry:opentelemetry-api")
-  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
+  testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")