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

SylvainJuge · SylvainJuge · commit 5ccac8f9f500 · 2025-05-22T15:01:45.000+02:00
diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/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
 }
 
diff --git a/dependencyManagement/build.gradle.kts b/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",
diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md
@@ -46,7 +46,7 @@ These are the supported libraries and frameworks:
 | [Armeria](https://armeria.dev)                                                                                                              | 1.3+                               | [opentelemetry-armeria-1.3](../instrumentation/armeria/armeria-1.3/library)                                                                                                                                                                                                                                                                                                             | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics]                                                  |
 | [Armeria gRPC](https://armeria.dev)                                                                                                         | 1.14+                              |                                                                                                                                                                                                                                                                                                                                                                                         | [RPC Client Spans], [RPC Client Metrics], [RPC Server Spans], [RPC Server Metrics]                                                      |
 | [AsyncHttpClient](https://github.com/AsyncHttpClient/async-http-client)                                                                     | 1.9+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics]                                                                                              |
-| [Avaje Jex](https://avaje.io/jex/) | 3.0+ | N/A | Provides `http.route` [2] |
+| [Avaje Jex](https://avaje.io/jex/)                                                                                                          | 3.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                               |
 | [AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html)                                                                | 1.0+                               | [opentelemetry-aws-lambda-core-1.0](../instrumentation/aws-lambda/aws-lambda-core-1.0/library),<br>[opentelemetry-aws-lambda-events-2.2](../instrumentation/aws-lambda/aws-lambda-events-2.2/library)                                                                                                                                                                                   | [FaaS Server Spans]                                                                                                                     |
 | [AWS SDK](https://aws.amazon.com/sdk-for-java/)                                                                                             | 1.11 - 1.12.583,<br>2.2+           | [opentelemetry-aws-sdk-1.11](../instrumentation/aws-sdk/aws-sdk-1.11/library),<br>[opentelemetry-aws-sdk-1.11-autoconfigure](../instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure),<br>[opentelemetry-aws-sdk-2.2](../instrumentation/aws-sdk/aws-sdk-2.2/library),<br>[opentelemetry-aws-sdk-2.2-autoconfigure](../instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure) | [Messaging Spans], [Database Client Spans], [Database Client Metrics]&nbsp;[6], [HTTP Client Spans]                                     |
 | [Azure Core](https://docs.microsoft.com/en-us/java/api/overview/azure/core-readme)                                                          | 1.14+                              | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Context propagation                                                                                                                     |
diff --git a/examples/distro/smoke-tests/build.gradle b/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")
diff --git a/examples/extension/build.gradle b/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")

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ codenarc {`
`431`	`431`	`checkstyle {`
`432`	`432`	`configFile = rootProject.file("buildscripts/checkstyle.xml")`
`433`	`433`	`// this version should match the version of google_checks.xml used as basis for above configuration`
`434`		`- toolVersion = "10.23.1"`
	`434`	`+ toolVersion = "10.24.0"`
`435`	`435`	`maxWarnings = 0`
`436`	`436`	`}`
`437`	`437`