Merge branch 'main' into copilot/fix-79effdad-6d82-4980-ad08-443e4438f725

Author: jaydeluca

.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'
@@ -613,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'
@@ -709,6 +718,12 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:nats:nats-2.17:library'
     - type: gradle
       path: ./
       target: ':instrumentation:netty:netty-3.8:javaagent'
@@ -745,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'

.lychee.toml .github/config/lychee.toml.lychee.toml renamed to .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/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

@@ -112,6 +112,17 @@
         'io.opentelemetry:{/,}**',
       ],
     },
+    {
+      // junit 6+ requires Java 17+
+      matchPackageNames: [
+        'org.junit:**',
+        'org.junit.jupiter:**',
+      ],
+      matchUpdateTypes: [
+        'major',
+      ],
+      enabled: false,
+    },
     {
       // junit-pioneer 2+ requires Java 11+
       matchPackageNames: [
@@ -336,6 +347,20 @@
     },
   ],
   customManagers: [
+    {
+      customType: 'regex',
+      datasourceTemplate: 'java-version',
+      managerFilePatterns: [
+        '.github/workflows/**',
+        '**/*.gradle.kts'
+      ],
+      matchStrings: [
+        '(?<currentValue>\\d+) # renovate: datasource=java-version',
+        '"(?<currentValue>\\d+)" // renovate: datasource=java-version',
+      ],
+      depNameTemplate: 'java',
+      extractVersionTemplate: '^(?<version>\\d+)',
+    },
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',

.github/scripts/check-package-names.sh

@@ -29,6 +29,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
   if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
     continue
   fi
+  if [[ "$dir" == "instrumentation/nats/nats-2.17/library/src/main/java/io/nats/client/impl" ]]; then
+    continue
+  fi
 
   # some common modules don't have any base version
   # - lettuce-common

.github/scripts/dependencies.dockerfile

@@ -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/draft-change-log-entries.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/scripts/extract-labeled-prs.sh

@@ -28,7 +28,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Set up gradle
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           cache-read-only: true