Merge branch 'main' into convert-groovy-javaagent

Author: laurit

.fossa.yml

@@ -619,6 +619,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-myfaces-3.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:kafka:kafka-connect-2.6:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:kafka:kafka-streams-0.11:javaagent'

.github/labeler.yml

@@ -2,7 +2,7 @@ test native:
 - all:
   - changed-files:
       - any-glob-to-any-file:
-          - instrumentation/logback/logback-appender-10/library/**
+          - instrumentation/logback/logback-appender-1.0/library/**
           - instrumentation/jdbc/library/**
           - instrumentation/spring/**
           - smoke-tests-otel-starter/**

.github/repository-settings.md

@@ -10,6 +10,10 @@ private admin repo.
 
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
+- `DEVELOCITY_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
+  - Generated at https://develocity.opentelemetry.io > My settings > Access keys
+  - Format of env var is `develocity.opentelemetry.io=<access key>`,
+    see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
 - `GRADLE_PUBLISH_KEY`
 - `GRADLE_PUBLISH_SECRET`
 - `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password

.github/scripts/draft-change-log-entries.sh

@@ -15,31 +15,29 @@ if [[ $minor == 0 ]]; then
   prior_minor=$(sed -n "s/^## Version $prior_major\.\([0-9]\+\)\..*/\1/p" CHANGELOG.md | head -1)
   if [[ -z $prior_minor ]]; then
     # assuming this is the first release
-    range=
+    range=HEAD
   else
     range="v$prior_major.$prior_minor.0..HEAD"
   fi
 else
   range="v$major.$((minor - 1)).0..HEAD"
 fi
 
-echo "## Unreleased"
-echo
-echo "### Migration notes"
+echo "# Changelog"
 echo
+echo "## Unreleased"
 echo
+
+"$(dirname "$0")/extract-labeled-prs.sh" "$range"
+
 echo "### 🌟 New javaagent instrumentation"
 echo
-echo
 echo "### 🌟 New library instrumentation"
 echo
-echo
 echo "### 📈 Enhancements"
 echo
-echo
 echo "### 🛠️ Bug fixes"
 echo
-echo
 echo "### 🧰 Tooling"
 echo
 
@@ -48,4 +46,5 @@ git log --reverse \
         --author='^(?!renovate\[bot\] )' \
         --pretty=format:"- %s" \
         "$range" \
-  | sed -E 's,\(#([0-9]+)\)$,\n  ([#\1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/\1)),'
+  | sed -E 's, *\(#([0-9]+)\)$,\n  ([#\1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/\1)),'
+echo

.github/scripts/extract-labeled-prs.sh

@@ -0,0 +1,78 @@
+#!/bin/bash -e
+
+# This script extracts PRs with "breaking change" and "deprecation" labels for the given version range
+# Usage: extract-labeled-prs.sh [git-range]
+# If no range is provided, it uses HEAD
+
+range="${1:-HEAD}"
+
+# Get the date range for filtering
+if [[ "$range" == "HEAD" ]]; then
+  # Get all commits from HEAD
+  oldest_commit=$(git log --reverse --pretty=format:"%H" HEAD | head -1)
+  since_date=$(git show -s --format=%ci "$oldest_commit" | cut -d' ' -f1)
+else
+  # Get commits in the specified range
+  if [[ $range =~ ^(.+)\.\.(.+)$ ]]; then
+    from_ref="${BASH_REMATCH[1]}"
+    oldest_commit=$(git rev-parse "$from_ref")
+    since_date=$(git show -s --format=%ci "$oldest_commit" | cut -d' ' -f1)
+  else
+    echo "[ERROR] Invalid range format: $range" >&2
+    exit 1
+  fi
+fi
+
+# Initialize tracking variables
+breaking_changes=""
+deprecations=""
+breaking_changes_found=false
+deprecations_found=false
+
+# Get PRs with "breaking change" label using GitHub search
+breaking_prs=$(gh pr list \
+  --repo open-telemetry/opentelemetry-java-instrumentation \
+  --label "breaking change" \
+  --state merged \
+  --search "merged:>=$since_date" \
+  --json number,title \
+  --jq '.[] | "\(.number)|\(.title)"' 2>/dev/null || echo "")
+
+if [[ -n "$breaking_prs" ]]; then
+  breaking_changes_found=true
+  while IFS='|' read -r pr_number pr_title; do
+    breaking_changes+="- $pr_title"$'\n'"  ([#$pr_number](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/$pr_number))"$'\n'
+  done <<< "$breaking_prs"
+fi
+
+# Get PRs with "deprecation" label using GitHub search
+deprecation_prs=$(gh pr list \
+  --repo open-telemetry/opentelemetry-java-instrumentation \
+  --label "deprecation" \
+  --state merged \
+  --search "merged:>=$since_date" \
+  --json number,title \
+  --jq '.[] | "\(.number)|\(.title)"' 2>/dev/null || echo "")
+
+if [[ -n "$deprecation_prs" ]]; then
+  deprecations_found=true
+  while IFS='|' read -r pr_number pr_title; do
+    deprecations+="- $pr_title"$'\n'"  ([#$pr_number](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/$pr_number))"$'\n'
+  done <<< "$deprecation_prs"
+fi
+
+# Output breaking changes section
+if [[ "$breaking_changes_found" == "true" ]]; then
+  echo "### ⚠️ Breaking Changes"
+  echo
+  echo -n "$breaking_changes"
+  echo
+fi
+
+# Output deprecations section
+if [[ "$deprecations_found" == "true" ]]; then
+  echo "### 🚫 Deprecations"
+  echo
+  echo -n "$deprecations"
+  echo
+fi

.github/workflows/build-common.yml

@@ -16,6 +16,8 @@ on:
         type: boolean
         required: false
     secrets:
+      DEVELOCITY_ACCESS_KEY:
+        required: false
       FLAKY_TEST_REPORTER_ACCESS_KEY:
         required: false
 
@@ -43,6 +45,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Spotless
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
   license-check:
@@ -65,6 +69,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Generate license report
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         # with the build cache enabled occasionally produces outdated results
         run: ./gradlew generateLicenseReport --no-build-cache
 
@@ -192,6 +198,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only }}
 
       - name: Build
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: ./gradlew check javadoc sourcesJar spdxSbom -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
@@ -275,7 +283,7 @@ jobs:
 
       # vaadin 14 tests fail with node 18
       - name: Set up Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 16
 
@@ -296,6 +304,8 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
 
       - name: List tests
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         # "check" is needed to activate all tests for listing purposes
         # listTestsInPartition writes test tasks that apply to the given partition to a file named
         # "test-tasks.txt" and then disables all tasks (including tests) after it runs
@@ -310,6 +320,8 @@ jobs:
           echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
 
       - name: Test
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         # spotless is checked separately since it's a common source of failure
         run: >
           ./gradlew
@@ -432,11 +444,15 @@ jobs:
           cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
 
       - name: Build
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         # running suite "none" compiles everything needed by smoke tests without executing any tests
         # --no-daemon is used to free up the memory from the build step before running the test step below
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Test
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
         run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
 
       - name: Build scan

.github/workflows/build-daily-no-build-cache.yml

@@ -15,13 +15,15 @@ jobs:
     with:
       no-build-cache: true
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     with:
       no-build-cache: true
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   # muzzle is not included here because it doesn't use gradle cache anyway and so is already covered

.github/workflows/build-daily.yml

@@ -13,11 +13,13 @@ jobs:
   common:
     uses: ./.github/workflows/build-common.yml
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   muzzle:

.github/workflows/build.yml

@@ -14,6 +14,7 @@ jobs:
   common:
     uses: ./.github/workflows/build-common.yml
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   test-latest-deps:
@@ -23,6 +24,7 @@ jobs:
     if: "!startsWith(github.ref_name, 'release/')"
     uses: ./.github/workflows/reusable-test-latest-deps.yml
     secrets:
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       FLAKY_TEST_REPORTER_ACCESS_KEY: ${{ secrets.FLAKY_TEST_REPORTER_ACCESS_KEY }}
 
   muzzle:
@@ -80,6 +82,7 @@ jobs:
 
       - name: Build and publish artifact snapshots
         env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
@@ -88,6 +91,7 @@ jobs:
 
       - name: Build and publish gradle plugin snapshots
         env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         include:
           - language: actions
           - language: java
-    runs-on: oracle-8cpu-32gb-x86-64
+    runs-on: oracle-vm-8cpu-32gb-x86-64
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -63,7 +63,7 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
+        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         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@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
+        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           category: "/language:${{matrix.language}}"