Merge branch 'main' of github.com:elastic/elastic-otel-java into azure-resource-provider-update

Author: SylvainJuge

.github/workflows/labeler.yml

@@ -14,6 +14,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
+
     - name: Get token
       id: get_token
       uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
@@ -26,33 +27,27 @@ jobs:
             "organization_projects": "write",
             "issues": "read"
           }
+
     - name: Add agent-java label
-      uses: actions/github-script@v7
-      with:
-        script: |
-          github.rest.issues.addLabels({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            labels: ["agent-java"]
-          })
+      run: gh issue edit "${NUMBER}" --add-label "agent-java" --repo "${{ github.repository }}"
+      env:
+        NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - id: is_elastic_member
       uses: elastic/oblt-actions/github/is-member-of@v1
       with:
         github-org: "elastic"
         github-user: ${{ github.actor }}
         github-token: ${{ steps.get_token.outputs.token }}
+
     - name: Add community and triage labels
       if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]' && github.actor != 'elastic-observability-automation[bot]'
-      uses: actions/github-script@v7
-      with:
-        script: |
-          github.rest.issues.addLabels({
-            issue_number: context.issue.number,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            labels: ["community", "triage"]
-          })
+      run: gh issue edit "${NUMBER}" --add-label "community,triage" --repo "${{ github.repository }}"
+      env:
+        NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Add comment for community PR
       if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-renovate-prod[bot]' && github.actor != 'elastic-observability-automation[bot]'
       uses: wow-actions/auto-comment@v1
@@ -64,12 +59,46 @@ jobs:
           It may take some time before we review a PR, so even if you don’t see activity for some time, it **does not** mean that we have forgotten about it. 
           
           Every once in a while we go through a process of prioritization, after which we are focussing on the tasks that were planned for the upcoming [milestone](https://github.com/elastic/apm-agent-java/milestones). The prioritization status is typically reflected through the PR labels. It could be pending triage, a candidate for a future milestone, or have a target milestone set to it.
+
     - name: Assign new internal pull requests to project
-      uses: elastic/[email protected]
-      if: contains(steps.is_elastic_member.outputs.result, 'true') && github.event.pull_request
-      env:
-        MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
+      id: add-to-project
+      if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request'
+      uses: elastic/oblt-actions/github/project-add@v1
       with:
-        project: 'https://github.com/orgs/elastic/projects/454'
-        project_id: '5882982'
-        column_name: 'In Progress'
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1829
+        item-url: ${{ github.event.pull_request.url }}
+
+    - name: set status in project
+      id: set-project-status-field
+      if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request'
+      uses: elastic/oblt-actions/github/project-field-set@v1
+      with:
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1829
+        item-id: ${{ steps.add-to-project.outputs.item-id }}
+        field-name: 'Status'
+        field-value: 'In Progress'
+
+    - name: set agent in project
+      id: set-project-agent-field
+      if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request'
+      uses: elastic/oblt-actions/github/project-field-set@v1
+      with:
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1829
+        item-id: ${{ steps.add-to-project.outputs.item-id }}
+        field-name: 'Agent'
+        field-value: 'java'
+
+    - name: set iteration in project
+      id: set-project-iteration-field
+      if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request'
+      uses: elastic/oblt-actions/github/project-field-set@v1
+      with:
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1829
+        item-id: ${{ steps.add-to-project.outputs.item-id }}
+        field-name: 'Iteration'
+        field-value: '@current'
+        field-type: 'iteration'

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:29150cd940cc7f69407d978d5a19c86f4d9e67cf44e4d6ded787a497e8f27c9a
+FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:c56628d8102cc34eeb4aaaf6279e88d2b23775569f9deeacc915b52f28163b8f
 ARG JAR_FILE
 ARG EXTENSION_JAR_FILE
 COPY ${JAR_FILE} /javaagent.jar

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 shadow = "8.3.6"
 jib = "3.4.5"
-spotless = "7.0.2"
+spotless = "7.0.3"
 junit = "5.12.1"
 autoservice = "1.1.1"
 
@@ -10,18 +10,18 @@ opentelemetryProto = "1.3.2-alpha"
 
 # otel agent, we rely on the '*-alpha' and get the non-alpha dependencies transitively
 # updated from upstream agent with gradle/update-upstream.sh
-opentelemetryJavaagentAlpha = "2.14.0-alpha"
+opentelemetryJavaagentAlpha = "2.15.0-alpha"
 
 # otel contrib
 # updated from upstream agent with gradle/update-upstream.sh
-opentelemetryContribAlpha = "1.44.0-alpha"
+opentelemetryContribAlpha = "1.45.0-alpha"
 
 # otel semconv
 # updated from upstream agent with gradle/update-upstream.sh
 # While the semconv stable/incubating artifacts are provided as transitive dependencies, keeping
 # an explicit version here allows to easily override to a not-yet-released version.
-opentelemetrySemconv = "1.30.0"
-opentelemetrySemconvAlpha = "1.30.0-alpha"
+opentelemetrySemconv = "1.32.0"
+opentelemetrySemconvAlpha = "1.32.0-alpha"
 
 [libraries]
 
@@ -75,7 +75,7 @@ muzzleGenerationPlugin = { group = "io.opentelemetry.instrumentation.muzzle-gene
 # Ant should be kept in sync with the version used in the shadow plugin
 ant = "org.apache.ant:ant:1.10.15"
 # ASM is currently only used during compile-time, so it is okay to diverge from the version used in ByteBuddy
-asm = "org.ow2.asm:asm:9.7"
+asm = "org.ow2.asm:asm:9.8"
 
 # Instrumented libraries
 openaiClient = "com.openai:openai-java:0.33.0"

settings.gradle.kts

@@ -48,5 +48,5 @@ dependencyResolutionManagement {
 }
 
 plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" //for resolving testing JVMs
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" //for resolving testing JVMs
 }