Merge remote-tracking branch 'upstream/main' into feature/valkey

; Conflicts:
;	opentelemetry-contrib-instrumentations/pyproject.toml
;	opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
;	tests/opentelemetry-docker-tests/tests/test-requirements.txt

Author: sightseeker

.changelog/4367.fixed

@@ -0,0 +1 @@
+`opentelemetry-instrumentation-django`: Remove duplicate query logging in SQLCommenter middleware that broke Django's `assertNumQueries`

.changelog/4433.fixed

@@ -0,0 +1 @@
+`opentelemetry-instrumentation-flask`: wrap wsgi_app call in try/except to prevent active_requests gauge leak

.changelog/4529.fixed

@@ -0,0 +1 @@
+`opentelemetry-instrumentation-asyncpg`: instrument prepared statements

.changelog/4613.fixed

@@ -0,0 +1 @@
+`opentelemetry-instrumentation-aiokafka`, `opentelemetry-instrumentation-confluent-kafka`, `opentelemetry-instrumentation-kafka-python`: fix malformed RST formatting in module docstrings

.github/workflows/changelog.yml

@@ -9,6 +9,7 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
+  merge_group:
 
 permissions:
   contents: read
@@ -17,6 +18,7 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     if: |
+      github.event_name != 'merge_group' &&
       !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
       && github.actor != 'otelbot[bot]'
 
@@ -30,7 +32,7 @@ jobs:
 
       - name: Ensure no direct changes to CHANGELOG.md
         run: |
-          if [[ $(git diff --name-only FETCH_HEAD -- '**/CHANGELOG.md') ]]
+          if [[ $(git diff --name-only FETCH_HEAD -- 'CHANGELOG.md' '**/CHANGELOG.md') ]]
           then
             echo "CHANGELOG.md files should not be directly modified."
             echo "Please add a changelog fragment file to the appropriate .changelog/ directory instead."
@@ -41,13 +43,15 @@ jobs:
           fi
 
       - name: Check for changelog fragment
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
           # Check for any new fragment files in any .changelog/ directory
           fragments=$(git diff --diff-filter=A --name-only FETCH_HEAD -- '**/.changelog/*' '.changelog/*' | grep -v '.gitignore' || true)
           if [[ -z "$fragments" ]]; then
             echo "No changelog fragment found for this PR."
             echo ""
-            echo "Add a file named .changelog/${{ github.event.pull_request.number }}.<type>"
+            echo "Add a file named .changelog/${PR_NUMBER}.<type>"
             echo "where <type> is one of: added, changed, deprecated, removed, fixed"
             echo ""
             echo "For coordinated packages, add to the root .changelog/ directory."
@@ -57,6 +61,24 @@ jobs:
             echo "Or add the \"Skip Changelog\" label if this job should be skipped."
             exit 1
           fi
+          invalid=()
+          while IFS= read -r f; do
+            base=$(basename "$f")
+            if [[ ! "$base" =~ ^([0-9]+)\.(added|changed|deprecated|removed|fixed)$ ]]; then
+              invalid+=("$f (expected <PR_NUMBER>.<type>; type one of added, changed, deprecated, removed, fixed)")
+              continue
+            fi
+            if [[ "${BASH_REMATCH[1]}" != "${PR_NUMBER}" ]]; then
+              invalid+=("$f (PR number ${BASH_REMATCH[1]} does not match this PR's number ${PR_NUMBER})")
+            fi
+          done <<< "$fragments"
+          if (( ${#invalid[@]} > 0 )); then
+            echo "Invalid changelog fragment(s):"
+            for msg in "${invalid[@]}"; do
+              echo "  $msg"
+            done
+            exit 1
+          fi
           echo "Found changelog fragment(s):"
           echo "$fragments"
 

.github/workflows/check-links.yml

@@ -13,6 +13,12 @@ on:
       - '**/*.rst'
       - '.github/workflows/check-links.yml'
       - '.github/workflows/check_links_config.json'
+  merge_group:
+    paths:
+      - '**/*.md'
+      - '**/*.rst'
+      - '.github/workflows/check-links.yml'
+      - '.github/workflows/check_links_config.json'
 
 permissions:
   contents: read
@@ -21,6 +27,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
   cancel-in-progress: true
 
+env:
+  DIFF_RANGE: ${{ github.event_name == 'merge_group' && format('{0}...{1}', github.event.merge_group.base_sha, github.event.merge_group.head_sha) || format('origin/{0}...HEAD', github.base_ref) }}
+
 jobs:
   check-links:
     runs-on: ubuntu-latest
@@ -53,14 +62,14 @@ jobs:
             ${{ steps.changed-files.outputs.all_changed_files }} \
             || { echo "Check that anchor links are lowercase"; exit 1; }
 
-      - name: Check new links only on pull requests
-        if: steps.changed-files.outputs.any_changed == 'true' && github.event_name == 'pull_request'
+      - name: Check new links
+        if: steps.changed-files.outputs.any_changed == 'true' && (github.event_name == 'pull_request' || github.event_name == 'merge_group')
         run: |
           # Extract URLs only from added lines in the diff to avoid
           # rate limiting when checking all links in large files like
           # CHANGELOG.md. Only new/changed links are checked on PRs;
           # pushes to main still check all links in changed files.
-          git diff "origin/${{ github.base_ref }}...HEAD" -- \
+          git diff "$DIFF_RANGE" -- \
             ${{ steps.changed-files.outputs.all_changed_files }} \
             | grep '^+' | grep -v '^+++' \
             | grep -oP 'https?://[^\s\)\]\"'"'"'`>]+' \

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
     branches:
     - 'main'
   pull_request:
+  merge_group:
 
 permissions:
   contents: read

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/ci.yml.j2

@@ -8,6 +8,7 @@ on:
     branches:
     - 'main'
   pull_request:
+  merge_group:
 
 permissions:
   contents: read

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

@@ -41,7 +41,9 @@ jobs:
     {%- endif %}
     {%- if job_data == "docs" %}
     if: |
-      github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
+      github.event_name == 'merge_group' ||
+      (github.event_name == 'pull_request' &&
+      github.event.pull_request.user.login != 'otelbot[bot]')
     {%- endif %}
     steps:
       - name: Checkout repo @ SHA - ${% raw %}{{ github.sha }}{% endraw %}

.github/workflows/misc.yml

@@ -70,7 +70,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     if: |
-      github.event.pull_request.user.login != 'otelbot[bot]' && github.event_name == 'pull_request'
+      github.event_name == 'merge_group' ||
+      (github.event_name == 'pull_request' &&
+      github.event.pull_request.user.login != 'otelbot[bot]')
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4