Merge branch 'main' into kafka-connect

Author: laurit

.fossa.yml

@@ -136,6 +136,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:gwt-2.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon-4.3:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:helidon-4.3:library'
     - type: gradle
       path: ./
       target: ':instrumentation:hikaricp-3.0:javaagent'
@@ -754,6 +760,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:openai:openai-java-1.1:library'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opensearch:opensearch-java-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

.github/config/lychee.toml

@@ -21,4 +21,6 @@ exclude = [
   '^http://code.google.com/p/concurrentlinkedhashmap$',
   '^https://softwareengineering.stackexchange.com/questions/29727.*',
   '^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
+  # new artifact, remove after 2.21.0 release
+  '^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
 ]

.github/renovate.json5

@@ -351,10 +351,12 @@
       customType: 'regex',
       datasourceTemplate: 'java-version',
       managerFilePatterns: [
-        '.github/workflows/**'
+        '.github/workflows/**',
+        '**/*.gradle.kts'
       ],
       matchStrings: [
         '(?<currentValue>\\d+) # renovate: datasource=java-version',
+        '"(?<currentValue>\\d+)" // renovate: datasource=java-version',
       ],
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',

.github/workflows/codeql.yml

@@ -63,7 +63,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/init@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
           --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/analyze@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/dependency-review.yml

@@ -19,4 +19,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
+        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/upload-sarif@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
         with:
           sarif_file: results.sarif

.github/workflows/reusable-pr-smoke-test-images.yml

@@ -22,19 +22,15 @@ on:
       skip-java-11:
         type: boolean
         required: false
-      skip-java-17:
-        type: boolean
-        required: false
-      skip-java-21:
-        type: boolean
-        required: false
 
 permissions:
   contents: read
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -64,13 +60,10 @@ jobs:
         run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 17 Docker image
-        if: "!inputs.skip-java-17"
         run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 21 Docker image
-        if: "!inputs.skip-java-21"
         run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain
 
-      - name: Build Java 23 Docker image
-        if: "!inputs.skip-java-23"
-        run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain
+      - name: Build Java ${{ env.LATEST_JAVA_VERSION }} Docker image
+        run: ./gradlew ${{ inputs.project }}:jibDockerBuild -Ptag=${{ env.TAG }} -PtargetJDK=${{ env.LATEST_JAVA_VERSION }} -Djib.httpTimeout=120000 -Djib.console=plain

.github/workflows/reusable-publish-smoke-test-images.yml

@@ -22,12 +22,6 @@ on:
       skip-java-11:
         type: boolean
         required: false
-      skip-java-17:
-        type: boolean
-        required: false
-      skip-java-21:
-        type: boolean
-        required: false
 
 permissions:
   contents: read
@@ -38,6 +32,8 @@ jobs:
     permissions:
       contents: read
       packages: write
+    env:
+      LATEST_JAVA_VERSION: 25 # renovate: datasource=java-version
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -74,13 +70,10 @@ jobs:
         run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 17 Docker image
-        if: "!inputs.skip-java-17"
         run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=17 -Djib.httpTimeout=120000 -Djib.console=plain
 
       - name: Build Java 21 Docker image
-        if: "!inputs.skip-java-21"
         run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=21 -Djib.httpTimeout=120000 -Djib.console=plain
 
-      - name: Build Java 23 Docker image
-        if: "!inputs.skip-java-23"
-        run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=23 -Djib.httpTimeout=120000 -Djib.console=plain
+      - name: Build Java ${{ env.LATEST_JAVA_VERSION }} Docker image
+        run: ./gradlew ${{ inputs.project }}:jib -Ptag=${{ env.TAG }} -PtargetJDK=${{ env.LATEST_JAVA_VERSION }} -Djib.httpTimeout=120000 -Djib.console=plain

README.md

@@ -138,10 +138,10 @@ For more information about the maintainer role, see the [community repository](h
 
 ### Approvers
 
-- [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana
-- [Jack Berg](https://github.com/jack-berg), New Relic
+- [Gregor Zeitlinger](https://github.com/zeitlinger), Grafana Labs
+- [Jack Berg](https://github.com/jack-berg), Grafana Labs
 - [Jason Plumb](https://github.com/breedx-splk), Splunk
-- [Jay DeLuca](https://github.com/jaydeluca), Grafana
+- [Jay DeLuca](https://github.com/jaydeluca), Grafana Labs
 - [Jean Bisutti](https://github.com/jeanbisutti), Microsoft
 - [John Watson](https://github.com/jkwatson), Cloudera
 - [Jonas Kunz](https://github.com/JonasKunz), Elastic

benchmark-overhead/Dockerfile.petclinic

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.28_6-jdk@sha256:f6eb706417f377c64613258e3c6389e28da6dca2f5bf40274726acc7efc09dc6 as app-build
+FROM eclipse-temurin:11.0.28_6-jdk@sha256:28d7b8bf8420d0a6fcb5eb5c0fbe0cb51e8a71635c2eabbba1b13fcd83c63ac7 as app-build
 
 # This is the base image that will contain a built version of the spring-petclinic-rest
 # application. Installing the dependencies and maven compiling the application is time