Merge branch 'open-telemetry:main' into main

Author: AsakerMohd

.github/scripts/dependencies.dockerfile renamed to .github/scripts/dependencies.Dockerfile

@@ -5,22 +5,49 @@ 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"
+ROOT_DIR="$SCRIPT_DIR/../.."
+DEPENDENCIES_DOCKERFILE="$SCRIPT_DIR/dependencies.Dockerfile"
+
+# Parse command line arguments
+LOCAL_LINKS_ONLY=false
+TARGET=""
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --local-links-only)
+            LOCAL_LINKS_ONLY=true
+            shift
+            ;;
+        *)
+            # Treat any other arguments as file paths
+            TARGET="$TARGET $1"
+            shift
+            ;;
+    esac
+done
 
 # Extract lychee version from dependencies.dockerfile
 LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
 
+if [[ -z "$TARGET" ]]; then
+    TARGET="."
+fi
+
 # Build the lychee command with optional GitHub token
-CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --config $(basename "$LYCHEE_CONFIG")"
+CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --root-dir /data"
 
 # Add GitHub token if available
 if [[ -n "$GITHUB_TOKEN" ]]; then
     CMD="$CMD --github-token $GITHUB_TOKEN"
 fi
 
-# Add the target directory
-CMD="$CMD ."
+if [[ "$LOCAL_LINKS_ONLY" == "true" ]]; then
+    CMD="$CMD --scheme file --include-fragments"
+else
+    CMD="$CMD --config .github/scripts/lychee-config.toml"
+fi
+
+CMD="$CMD $TARGET"
 
 # Determine if we should allocate a TTY
 DOCKER_FLAGS="--rm --init"
@@ -32,4 +59,4 @@ fi
 
 # Run lychee with proper signal handling
 # shellcheck disable=SC2086
-exec docker run $DOCKER_FLAGS -v "$(dirname "$LYCHEE_CONFIG")":/data -w /data $CMD
+exec docker run $DOCKER_FLAGS -v "$ROOT_DIR":/data -w /data $CMD

.github/scripts/link-check.sh

@@ -18,6 +18,6 @@ jobs:
       pull-requests: write  # for assigning reviewers
     runs-on: ubuntu-latest
     steps:
-      - uses: open-telemetry/assign-reviewers-action@cb42e3ee14a59c01abccd401f126a0f4c3991cb3 # main
+      - uses: open-telemetry/assign-reviewers-action@fcd27c5381c10288b23d423ab85473710a33389e # main
         with:
           config-file: .github/component_owners.yml

.lychee.toml renamed to .github/scripts/lychee-config.toml

@@ -8,6 +8,9 @@ on:
   pull_request:
   merge_group:
   workflow_dispatch:
+  schedule:
+    # Run daily at 7:30 AM UTC
+    - cron: '30 7 * * *'
 
 permissions:
   contents: read
@@ -119,10 +122,13 @@ jobs:
           path: jmx-metrics/build/reports/tests/integrationTest
 
   link-check:
+    # merge group and push events are excluded to avoid unnecessary CI failures
+    # (these failures will instead be captured by the daily scheduled run)
+    #
     # release branches are excluded to avoid unnecessary maintenance if external links break
     # (and also because the README.md might need update on release branches before the release
     # download has been published)
-    if: "!startsWith(github.ref_name, 'release/')"
+    if: github.event_name != 'merge_group' && github.event_name != 'push' && !startsWith(github.ref_name, 'release/')
     uses: ./.github/workflows/reusable-link-check.yml
 
   markdown-lint-check:
@@ -199,3 +205,31 @@ jobs:
             )
           )
         run: exit 1 # fail
+
+  workflow-notification:
+    permissions:
+      contents: read
+      issues: write
+    if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && always()
+    needs:
+      - build
+      - test
+      - integration-test
+      - link-check
+      - markdown-lint-check
+      - misspell-check
+      - shell-script-check
+      - publish-snapshots
+    uses: ./.github/workflows/reusable-workflow-notification.yml
+    with:
+      success: >-
+        ${{
+          needs.build.result == 'success' &&
+          needs.test.result == 'success' &&
+          needs.integration-test.result == 'success' &&
+          needs.link-check.result == 'success' &&
+          needs.markdown-lint-check.result == 'success' &&
+          needs.misspell-check.result == 'success' &&
+          needs.shell-script-check.result == 'success' &&
+          needs.publish-snapshots.result == 'success'
+        }}

.github/workflows/assign-reviewers.yml

@@ -23,8 +23,18 @@ jobs:
         with:
           persist-credentials: false
 
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        id: create-token
+        with:
+          # analyzing classic branch protections requires a token with admin read permissions
+          # see https://github.com/ossf/scorecard-action/blob/main/docs/authentication/fine-grained-auth-token.md
+          # and https://github.com/open-telemetry/community/issues/2769
+          app-id: ${{ vars.OSSF_SCORECARD_APP_ID }}
+          private-key: ${{ secrets.OSSF_SCORECARD_PRIVATE_KEY }}
+
       - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
+          repo_token:  ${{ steps.create-token.outputs.token }}
           results_file: results.sarif
           results_format: sarif
           publish_results: true

.github/workflows/build.yml

@@ -11,8 +11,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0 # needed for merge-base below
 
-      - name: Link check
+      - name: Link check - relative links (all files)
+        if: github.event_name == 'pull_request'
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: ./.github/scripts/link-check.sh --local-links-only
+
+      - name: Get modified files
+        if: github.event_name == 'pull_request'
+        id: modified-files
+        run: |
+          merge_base=$(git merge-base origin/${{ github.base_ref }} HEAD)
+          # Using lychee's default extension filter here to match when it runs against all files
+          modified_files=$(git diff --name-only $merge_base...${{ github.event.pull_request.head.sha }} \
+                            | grep -E '\.(md|mkd|mdx|mdown|mdwn|mkdn|mkdown|markdown|html|htm|txt)$' \
+                            | tr '\n' ' ' || true)
+          echo "files=$modified_files" >> $GITHUB_OUTPUT
+          echo "Modified files: $modified_files"
+
+      - name: Link check - all links (modified files only)
+        if: github.event_name == 'pull_request' && steps.modified-files.outputs.files != ''
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: ./.github/scripts/link-check.sh ${{ steps.modified-files.outputs.files }}
+
+      - name: Link check - all links (all files)
+        if: github.event_name != 'pull_request'
         env:
           GITHUB_TOKEN: ${{ github.token }}
         run: ./.github/scripts/link-check.sh

.github/workflows/ossf-scorecard.yml

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "7.0.4"
+  id("com.diffplug.spotless") version "7.1.0"
 }
 
 repositories {
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:7.1.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("org.owasp:dependency-check-gradle:12.1.3")

.github/workflows/reusable-link-check.yml

@@ -2,7 +2,7 @@ plugins {
   `java-platform`
 }
 
-val otelInstrumentationVersion = "2.17.0-alpha"
+val otelInstrumentationVersion = "2.17.1-alpha"
 val semconvVersion = "1.34.0"
 
 javaPlatform {
@@ -16,6 +16,7 @@ dependencies {
   // as runtime dependencies if they are actually used as runtime dependencies)
   api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
   api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.1"))
+  api(enforcedPlatform("com.google.protobuf:protobuf-bom:4.31.1"))
 
   constraints {
     api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
@@ -25,8 +26,8 @@ dependencies {
     api("com.google.auto.service:auto-service-annotations:1.1.1")
     api("com.google.auto.value:auto-value:1.11.0")
     api("com.google.auto.value:auto-value-annotations:1.11.0")
-    api("com.google.errorprone:error_prone_annotations:2.39.0")
-    api("com.google.errorprone:error_prone_core:2.39.0")
+    api("com.google.errorprone:error_prone_annotations:2.40.0")
+    api("com.google.errorprone:error_prone_core:2.40.0")
     api("io.github.netmikey.logunit:logunit-jul:2.0.0")
     api("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha")
     api("io.prometheus:simpleclient:0.16.0")
@@ -43,7 +44,7 @@ dependencies {
 
     api("com.google.code.findbugs:annotations:3.0.1u2")
     api("com.google.code.findbugs:jsr305:3.0.2")
-    api("com.squareup.okhttp3:okhttp:4.12.0")
+    api("com.squareup.okhttp3:okhttp:5.1.0")
     api("com.uber.nullaway:nullaway:0.12.7")
     api("org.assertj:assertj-core:3.27.3")
     api("org.awaitility:awaitility:4.3.0")

buildSrc/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
   id("com.github.johnrengelman.shadow")
   id("me.champeau.jmh") version "0.7.3"
   id("ru.vyarus.animalsniffer") version "2.0.1"
-  id("com.squareup.wire") version "5.3.3"
+  id("com.squareup.wire") version "5.3.5"
 }
 
 description = "Exporter implementations that store signals on disk"