Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into semconv-stable-code

Author: SylvainJuge

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

@@ -0,0 +1,56 @@
+name: Auto license report
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
+        with:
+          cache-read-only: true
+
+      - name: Check out PR branch
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh pr checkout ${{ github.event.pull_request.number }}
+
+      - name: Update license report
+        run: ./gradlew generateLicenseReport --no-build-cache
+
+      - id: create-patch
+        name: Create patch file
+        run: |
+          git diff > patch
+          if [ -s patch ]; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Upload patch file
+        if: steps.create-patch.outputs.exists == 'true'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          path: patch
+          name: patch

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

@@ -3,6 +3,7 @@ on:
   workflow_run:
     workflows:
       - "Auto spotless"
+      - "Auto license report"
     types:
       - completed
 

examples/distro/build.gradle

@@ -67,7 +67,7 @@ subprojects {
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}"))
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))
 
-    testImplementation("org.mockito:mockito-core:5.17.0")
+    testImplementation("org.mockito:mockito-core:5.18.0")
 
     testImplementation(enforcedPlatform("org.junit:junit-bom:5.12.2"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetricsBuilder.java

@@ -82,18 +82,6 @@ public RuntimeMetricsBuilder emitExperimentalTelemetry() {
     return this;
   }
 
-  /**
-   * Enable experimental JMX telemetry collection.
-   *
-   * @deprecated Use {@link #emitExperimentalTelemetry()} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public RuntimeMetricsBuilder enableExperimentalJmxTelemetry() {
-    emitExperimentalTelemetry = true;
-    return this;
-  }
-
   /** Enable the capture of the jvm.gc.cause attribute with the jvm.gc.duration metric. */
   @CanIgnoreReturnValue
   public RuntimeMetricsBuilder captureGcCause() {

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/RuntimeMetricsBuilder.java

@@ -29,18 +29,6 @@ public RuntimeMetricsBuilder emitExperimentalTelemetry() {
     return this;
   }
 
-  /**
-   * Enable experimental JMX telemetry collection.
-   *
-   * @deprecated Use {@link #emitExperimentalTelemetry()} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public RuntimeMetricsBuilder enableExperimentalJmxTelemetry() {
-    emitExperimentalTelemetry = true;
-    return this;
-  }
-
   /** Enable the capture of the jvm.gc.cause attribute with the jvm.gc.duration metric. */
   @CanIgnoreReturnValue
   public RuntimeMetricsBuilder captureGcCause() {

test-report/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation("com.google.api-client:google-api-client:2.7.2")
+  implementation("com.google.api-client:google-api-client:2.8.0")
   implementation("com.google.apis:google-api-services-sheets:v4-rev20250509-2.0.0")
   implementation("com.google.auth:google-auth-library-oauth2-http:1.35.0")
 }