Merge remote-tracking branch 'upstream/main' into modernize-junit

Author: trask

.github/renovate.json5

@@ -4,6 +4,8 @@
     'config:best-practices',
     'helpers:pinGitHubActionDigestsToSemver',
   ],
+  ignorePaths: [], // overwrite default ignore which includes **/test/**
+                   // used to update docker image versions used in Java test files
   ignorePresets: [
     ':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
     'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
@@ -243,5 +245,17 @@
         '"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
       ],
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'docker',
+      managerFilePatterns: [
+        '**/*.java',
+      ],
+      matchStrings: [
+        '"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
+      ],
+      autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
+      versioningTemplate: 'docker',
+    },
   ],
 }

.github/workflows/build-common.yml

@@ -111,7 +111,7 @@ jobs:
 
       - name: Test
         run: >
-          ./gradlew test
+          ./gradlew check -x spotlessCheck
           "-PtestJavaVersion=${{ matrix.test-java-version }}"
           "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}"
           "-Porg.gradle.java.installations.auto-download=false"
@@ -122,36 +122,6 @@ jobs:
         if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
         run: cat build-scan.txt
 
-  integration-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          cache-read-only: ${{ inputs.cache-read-only }}
-
-      - name: Integration test
-        run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
-
-      - name: Build scan
-        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
-        run: cat build-scan.txt
-
-      - name: Save integration test results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: always()
-        with:
-          name: integration-test-results
-          path: jmx-metrics/build/reports/tests/integrationTest
-
   markdown-lint-check:
     uses: ./.github/workflows/reusable-markdown-lint.yml
 

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
         uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           languages: ${{ matrix.language }}
           # using "linked" helps to keep up with the latest Kotlin support
@@ -65,6 +65,6 @@ jobs:
         run: ./gradlew assemble --no-build-cache --no-daemon
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/issue-management-stale-action.yml

@@ -45,9 +45,9 @@ jobs:
           exempt-issue-labels: "needs author feedback"
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          days-before-stale: 365
-          days-before-close: 0
-          close-issue-label: stale
+          days-before-issue-stale: 365
+          days-before-issue-close: 0
+          stale-issue-label: stale
           close-issue-message: >
             Since there has been no activity on this enhancement for the past year we are closing it to help maintain our backlog.
             Anyone who would like to work on it is still welcome to do so, and we can re-open it at that time.

.github/workflows/ossf-scorecard.yml

@@ -52,6 +52,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@a8d1ac45b9a34d11fe398d5503176af0d06b303e # v3.30.7
+        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           sarif_file: results.sarif

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

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          fetch-depth: 0 # needed for merge-base below
+          fetch-depth: 0 # needed for merge-base used in lint:links-in-modified-files
 
       - uses: jdx/mise-action@e3d7b8d67a7958d1207f6ed871e83b1ea780e7b0 # v3.3.1
 

.mise/tasks/lint/links-in-modified-files.sh

@@ -17,12 +17,12 @@ fi
 config_modified=$(git diff --name-only --merge-base "$usage_base" $usage_head \
                   | grep -E '^(\.github/config/lychee\.toml|\.mise/tasks/lint/.*|mise\.toml)$' || true)
 
-if [ -n "$config_modified" ] ; then
+if [ "$usage_event" != "pull_request" ] ; then
+  echo "Not a PR - checking all files."
+  mise run lint:links
+elif [ -n "$config_modified" ] ; then
   echo "config changes, checking all files."
   mise run lint:links
-elif [ "$usage_event" != "pull_request" ] ; then
-  echo "Not a PR - skipping link linting."
-  exit 0
 else
   # Using lychee's default extension filter here to match when it runs against all files
   # Note: --diff-filter=d filters out deleted files

.mise/tasks/lint/links.sh

@@ -5,4 +5,9 @@ set -e
 
 #USAGE arg "<file>" var=#true help="files to check" default="."
 
-lychee --verbose --config .github/config/lychee.toml "$usage_file"
+for f in $usage_file; do
+    echo "Checking links in file: $f"
+done
+
+# shellcheck disable=SC2086
+lychee --verbose --config .github/config/lychee.toml $usage_file

.mise/tasks/lint/local-links.sh

@@ -5,4 +5,9 @@ set -e
 
 #USAGE arg "<file>" var=#true help="files to check" default="."
 
-lychee --verbose --scheme file --include-fragments "$usage_file"
+for f in $usage_file; do
+    echo "Checking links in file: $f"
+done
+
+# shellcheck disable=SC2086
+lychee --verbose --scheme file --include-fragments $usage_file

CONTRIBUTING.md

@@ -31,12 +31,6 @@ To run the tests:
 ./gradlew test
 ```
 
-Some modules include integration tests that can be run with:
-
-```bash
-./gradlew integrationTest
-```
-
 ## Snapshot Builds
 
 Snapshot builds of the `main` branch are available from the Sonatype snapshot repository at: