Merge branch 'main' into add_metric_annotation_instrument

Author: Duncan-tree-zhou

.fossa.yml

@@ -388,6 +388,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:azure-core:azure-core-1.36:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:azure-core:azure-core-1.53:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:cassandra:cassandra-3.0:javaagent'
@@ -427,6 +430,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:couchbase:couchbase-3.2:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:couchbase:couchbase-3.4:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent'
@@ -619,6 +625,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/renovate.json5

@@ -46,56 +46,58 @@
     {
       groupName: 'quarkus packages',
       matchPackageNames: [
-        'io.quarkus{/,}**',
+        'io.quarkus:**',
       ],
     },
     {
       groupName: 'gradle develocity packages',
       matchPackageNames: [
-        'com.gradle.develocity{/,}**',
+        'com.gradle.develocity:**',
       ],
     },
     {
       groupName: 'armeria packages',
       matchPackageNames: [
-        'com.linecorp.armeria:{/,}**',
+        'com.linecorp.armeria:**',
       ],
     },
     {
       groupName: 'spotless packages',
       matchPackageNames: [
-        'com.diffplug.spotless{/,}**',
+        'com.diffplug.spotless',
+        'com.diffplug.spotless:**',
       ],
     },
     {
       groupName: 'byte buddy packages',
       matchPackageNames: [
-        'net.bytebuddy:{/,}**',
+        'net.bytebuddy:**',
       ],
     },
     {
       groupName: 'gradle shadow packages',
       matchPackageNames: [
-        'com.gradleup.shadow{/,}**',
+        'com.gradleup.shadow:**',
       ],
     },
     {
       groupName: 'guava packages',
       matchPackageNames: [
-        'com.google.guava{/,}**',
+        'com.google.guava:**',
       ],
     },
     {
       groupName: 'jackson packages',
       matchPackageNames: [
-        'com.fasterxml.jackson{/,}**',
+        'com.fasterxml.jackson:**',
+        'com.fasterxml.jackson.core:**',
       ],
     },
     {
       // prevent update to 2.4-groovy-4.0-SNAPSHOT
       allowedVersions: '!/\\-SNAPSHOT$/',
       matchPackageNames: [
-        'org.spockframework:{/,}**',
+        'org.spockframework:**',
       ],
     },
     {
@@ -109,7 +111,7 @@
       // OpenTelemetry SDK updates are handled by auto-update-otel-sdk.yml
       enabled: false,
       matchPackageNames: [
-        'io.opentelemetry:{/,}**',
+        'io.opentelemetry:**',
       ],
     },
     {
@@ -140,7 +142,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.mockito:{/,}**',
+        'org.mockito:**',
       ],
     },
     {
@@ -212,7 +214,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -225,7 +227,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.slf4j:{/,}**',
+        'org.slf4j:**',
       ],
     },
     {
@@ -239,8 +241,8 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'com.google.inject:{/,}**',
-        'com.google.inject.extensions:{/,}**',
+        'com.google.inject:**',
+        'com.google.inject.extensions:**',
       ],
     },
     {
@@ -316,7 +318,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -329,7 +331,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.springframework.boot:spring-boot-dependencies{/,}**',
+        'org.springframework.boot:spring-boot-dependencies:**',
       ],
     },
     {
@@ -342,7 +344,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.eclipse.jetty:{/,}**',
+        'org.eclipse.jetty:**',
       ],
     },
   ],

.github/repository-settings.md

@@ -8,6 +8,7 @@ private admin repo.
 
 ### Repository secrets
 
+- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
 - `GRADLE_PUBLISH_KEY`
@@ -17,13 +18,13 @@ private admin repo.
   - Key is associated with [@trask](https://github.com/trask)'s gmail address
 - `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
 - `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
-- `FLAKY_TEST_REPORTER_ACCESS_KEY` - owned by [@laurit](https://github.com/laurit)
 
 ### Organization secrets
 
+- `DEVELOCITY_ACCESS_KEY` (scoped only to Java repos)
 - `FOSSA_API_KEY`
+- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY` (scoped only to this repo)
 - `OTELBOT_PRIVATE_KEY`
-- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
 
 ### Organization variables
 

.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/auto-license-report.yml

@@ -14,6 +14,7 @@ permissions:
 
 jobs:
   check:
+    if: ${{ github.event.pull_request.draft == false }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -51,7 +52,7 @@ jobs:
 
       - name: Upload patch file
         if: steps.create-patch.outputs.exists == 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           path: patch
           name: patch

.github/workflows/auto-spotless.yml

@@ -14,6 +14,7 @@ permissions:
 
 jobs:
   check:
+    if: ${{ github.event.pull_request.draft == false }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -50,7 +51,7 @@ jobs:
 
       - name: Upload patch file
         if: steps.create-patch.outputs.exists == 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           path: patch
           name: patch

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

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Download patch
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           run-id: ${{ github.event.workflow_run.id }}
           path: ${{ runner.temp }}