Merge branch 'open-telemetry:main' into main

Author: wl2027

.fossa.yml

@@ -76,6 +76,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:apache-shenyu-2.4:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:avaje-jex-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:c3p0-0.9:javaagent'
@@ -724,6 +727,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:opensearch:opensearch-rest-common:javaagent'
@@ -763,6 +769,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.50:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:pekko:pekko-actor-1.0:javaagent'
@@ -952,9 +961,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-rx-java-3.5:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:vertx:vertx-sql-client-4.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-web-3.0:javaagent'
@@ -1108,9 +1114,21 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-4.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:vertx:vertx-sql-client:vertx-sql-client-common:javaagent'
 
 experimental:
   gradle:

.github/graal-native-docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   mongodb:
-    image: mongo:4.0
+    image: mongo:4.2
     ports:
       - "27017:27017"
 

.github/renovate.json5

@@ -1,9 +1,8 @@
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
   extends: [
-    'config:recommended',
-    'docker:pinDigests',
-    'helpers:pinGitHubActionDigests',
+    'config:best-practices',
+    'helpers:pinGitHubActionDigestsToSemver',
   ],
   ignorePaths: [
     'instrumentation/**',
@@ -28,9 +27,11 @@
     },
     {
       matchPackageNames: [
+        'io.opentelemetry.contrib:opentelemetry-azure-resources',
         'io.opentelemetry.contrib:opentelemetry-aws-resources',
         'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
         'io.opentelemetry.contrib:opentelemetry-gcp-resources',
+        'io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources',
         'io.opentelemetry.contrib:opentelemetry-baggage-processor',
         'io.opentelemetry.proto:opentelemetry-proto',
         'io.opentelemetry.semconv:opentelemetry-semconv',
@@ -78,6 +79,12 @@
         'com.gradleup.shadow{/,}**',
       ],
     },
+    {
+      groupName: 'guava packages',
+      matchPackageNames: [
+        'com.google.guava{/,}**',
+      ],
+    },
     {
       groupName: 'jackson packages',
       matchPackageNames: [
@@ -322,8 +329,8 @@
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',
-      fileMatch: [
-        '^.github/workflows/',
+      managerFilePatterns: [
+        '/^.github/workflows//',
       ],
       matchStrings: [
         'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -332,8 +339,8 @@
     {
       customType: 'regex',
       datasourceTemplate: 'npm',
-      fileMatch: [
-        '^.github/workflows/',
+      managerFilePatterns: [
+        '/^.github/workflows//',
       ],
       matchStrings: [
         'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

.github/repository-settings.md

@@ -1,117 +1,8 @@
 # Repository settings
 
 This document describes any changes that have been made to the
-settings for this repository beyond the [OpenTelemetry default repository
-settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#repository-settings).
-
-## General > Pull Requests
-
-- Allow squash merging > Default to pull request title
-
-- Allow auto-merge
-
-## Actions > General
-
-- Fork pull request workflows from outside collaborators:
-  "Require approval for first-time contributors who are new to GitHub"
-
-  (To reduce friction for new contributors,
-  as the default is "Require approval for first-time contributors")
-
-- Workflow permissions
-  - Default permissions granted to the `GITHUB_TOKEN` when running workflows in this repository:
-    Read repository contents and packages permissions
-  - Allow GitHub Actions to create and approve pull requests: UNCHECKED
-
-## Rules > Rulesets
-
-### `main` and release branches
-
-- Targeted branches:
-  - `main`
-  - `release/*`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require a pull request before merging: CHECKED
-    - Required approvals: 1
-    - Require review from Code Owners: CHECKED
-    - Allowed merge methods: Squash
-  - Require status checks to pass
-    - Do not require status checks on creation: CHECKED
-    - Status checks that are required
-      - EasyCLA
-      - `required-status-check`
-      - `gradle-wrapper-validation`
-  - Block force pushes: CHECKED
-  - Require code scanning results: CHECKED
-    - CodeQL
-      - Security alerts: High or higher
-      - Alerts: Errors
-
-> [!NOTE]
-> This repository can't "require linear history" because there is an old merge commit on `main`
-> (and so also on the release branches).
-
-### `cloudfoundry` branch
-
-- Targeted branches:
-  - `cloudfoundry`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Require a pull request before merging: CHECKED
-    - Required approvals: 1
-    - Require review from Code Owners: CHECKED
-    - Allowed merge methods: Squash
-  - Require status checks to pass
-    - EasyCLA
-  - Block force pushes: CHECKED
-
-### `gh-pages` branch
-
-- Targeted branches:
-  - `gh-pages`
-- Branch rules
-  - Restrict deletions: CHECKED
-  - Require linear history: CHECKED
-  - Block force pushes: CHECKED
-
-### Old-style release branches
-
-- Targeted branches:
-  - `v0.*`
-  - `v1.*`
-- Branch rules
-  - Restrict creations: CHECKED
-  - Restrict updates: CHECKED
-  - Restrict deletions: CHECKED
-
-### Restrict branch creation
-
-- Targeted branches
-  - Exclude:
-    - `release/*`
-    - `renovate/**/*`
-    - `otelbot/**/*`
-    - `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
-- Restrict creations: CHECKED
-
-### Restrict updating tags
-
-- Targeted tags
-  - All tags
-- Restrict updates: CHECKED
-- Restrict deletions: CHECKED
-
-## Branch protections
-
-### `main`, `release/*`, `cloudfoundry`
-
-- Restrict who can push to matching branches: CHECKED
-
-## Code security and analysis
-
-- Secret scanning: Enabled
+settings in this repository outside the settings tracked in the
+private admin repo.
 
 ## Secrets and variables > Actions
 
@@ -132,6 +23,7 @@ settings](https://github.com/open-telemetry/community/blob/main/docs/how-to-conf
 
 - `FOSSA_API_KEY`
 - `OTELBOT_PRIVATE_KEY`
+- `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
 
 ### Organization variables
 

.github/scripts/dependencies.dockerfile

@@ -0,0 +1,3 @@
+# this file exists so that Renovate can auto-update docker image versions that are then used elsewhere
+
+FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee

.github/scripts/link-check.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+export MSYS_NO_PATHCONV=1 # for Git Bash on Windows
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LYCHEE_CONFIG="$SCRIPT_DIR/../../.lychee.toml"
+DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.dockerfile"
+
+# Extract lychee version from dependencies.dockerfile
+LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
+
+# Build the lychee command with optional GitHub token
+CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $(basename "$LYCHEE_CONFIG")"
+
+# Add GitHub token if available
+if [[ -n "$GITHUB_TOKEN" ]]; then
+    CMD="$CMD --github-token $GITHUB_TOKEN"
+fi
+
+# Add the target directory
+CMD="$CMD ."
+
+# Determine if we should allocate a TTY
+DOCKER_FLAGS="--rm --init"
+if [[ -t 0 ]]; then
+    DOCKER_FLAGS="$DOCKER_FLAGS -it"
+else
+    DOCKER_FLAGS="$DOCKER_FLAGS -i"
+fi
+
+# Run lychee with proper signal handling
+# shellcheck disable=SC2086
+exec docker run $DOCKER_FLAGS -v "$(dirname "$LYCHEE_CONFIG")":/data -w /data $CMD

.github/workflows/auto-license-report.yml

@@ -0,0 +1,57 @@
+name: Auto license report
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Free disk space
+        run: .github/scripts/gha-free-disk-space.sh
+
+      - name: Set up JDK for running Gradle
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version-file: .java-version
+
+      - name: Set up gradle
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+        with:
+          cache-read-only: true
+
+      - name: Check out PR branch
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh pr checkout ${{ github.event.pull_request.number }}
+
+      - name: Update license report
+        run: ./gradlew generateLicenseReport --no-build-cache
+
+      - id: create-patch
+        name: Create patch file
+        run: |
+          git add -N licenses
+          git diff > patch
+          if [ -s patch ]; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Upload patch file
+        if: steps.create-patch.outputs.exists == 'true'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          path: patch
+          name: patch