Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instrumentation into metric-interceptor

Author: jaydeluca

.fossa.yml

@@ -958,9 +958,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-rx-java-3.5:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:vertx:vertx-sql-client-4.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-web-3.0:javaagent'
@@ -1114,9 +1111,21 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
 
 experimental:
   gradle:

.github/graal-native-docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   mongodb:
-    image: mongo:4.0
+    image: mongo:4.2
     ports:
       - "27017:27017"
 

.github/workflows/auto-license-report.yml

@@ -28,7 +28,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
         with:
           cache-read-only: true
 

.github/workflows/auto-spotless.yml

@@ -28,7 +28,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
         with:
           cache-read-only: true
 

.github/workflows/auto-update-pull-request.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Download patch
-        uses: actions/[email protected]
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           run-id: ${{ github.event.workflow_run.id }}
           path: ${{ runner.temp }}

benchmark-overhead-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.0")
 }
 
 tasks {

benchmark-overhead/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  id("com.diffplug.spotless") version "7.0.3"
+  id("com.diffplug.spotless") version "7.0.4"
 }
 
 spotless {

benchmark-overhead/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

conventions/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.3"
+  id("com.diffplug.spotless") version "7.0.4"
 }
 
 spotless {
@@ -54,12 +54,12 @@ dependencies {
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.3")
+  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.6")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
-  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.1")
+  implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.0.2")
   implementation("org.owasp:dependency-check-gradle:12.1.1")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")

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

@@ -161,7 +161,7 @@ dependencies {
   compileOnly("com.google.errorprone:error_prone_annotations")
 
   codenarc("org.codenarc:CodeNarc:3.6.0")
-  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.24"))
+  codenarc(platform("org.codehaus.groovy:groovy-bom:3.0.25"))
 
   modules {
     // checkstyle uses the very old google-collections which causes Java 9 module conflict with
@@ -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
 }