Merge branch 'master' into source_okta

Author: sonnens

.github/actions/spelling/allow.txt

@@ -461,6 +461,7 @@ Softbank
 Sogou
 solarwinds
 Soref
+sortedset
 splunk
 ssh
 staticuser
@@ -524,6 +525,7 @@ XSALSA
 yandex
 Yarvik
 Yifang
+zadd
 zeek
 zookeeper
 Zopo
@@ -533,3 +535,10 @@ ZTE
 Zync
 envsubst
 jimmystewpot
+esensar
+jchap-pnnl
+jhbigler-pnnl
+jlambatl
+jorgehermo9
+notchairmk
+yjagdale

.github/workflows/changes.yml

@@ -126,8 +126,8 @@ on:
       e2e-opentelemetry-logs:
         value: ${{ jobs.e2e_tests.outputs.opentelemetry-logs }}
 env:
-  BASE_REF: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_ref) || github.event.pull_request.base.ref }}
-  HEAD_REF: ${{ inputs.head_ref  || (github.event_name == 'merge_group' && github.event.merge_group.head_ref)  || github.event.pull_request.head.ref }}
+  BASE_SHA: ${{ inputs.base_ref || (github.event_name == 'merge_group' && github.event.merge_group.base_sha) || github.event.pull_request.base.sha }}
+  HEAD_SHA: ${{ inputs.head_ref || (github.event_name == 'merge_group' && github.event.merge_group.head_sha) || github.event.pull_request.head.sha }}
 
 jobs:
   # Detects changes that are not specific to integration tests
@@ -151,8 +151,8 @@ jobs:
     - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
       id: filter
       with:
-        base: ${{ env.BASE_REF }}
-        ref:  ${{ env.HEAD_REF }}
+        base: ${{ env.BASE_SHA }}
+        ref:  ${{ env.HEAD_SHA }}
         filters: |
           source:
             - ".github/workflows/test.yml"
@@ -201,7 +201,6 @@ jobs:
           website:
             - "website/**"
           not_website:
-            - "**"
             - "!website/**"
 
   # Detects changes that are specific to integration tests
@@ -258,8 +257,8 @@ jobs:
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
-          base: ${{ env.BASE_REF }}
-          ref:  ${{ env.HEAD_REF }}
+          base: ${{ env.BASE_SHA }}
+          ref:  ${{ env.HEAD_SHA }}
           filters: int_test_filters.yaml
 
       # This JSON hack was introduced because GitHub Actions does not support dynamic expressions in the
@@ -336,6 +335,6 @@ jobs:
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
-          base: ${{ env.BASE_REF }}
-          ref:  ${{ env.HEAD_REF }}
+          base: ${{ env.BASE_SHA }}
+          ref:  ${{ env.HEAD_SHA }}
           filters: int_test_filters.yaml

.github/workflows/ci-integration-review.yml

@@ -161,7 +161,7 @@ jobs:
       - e2e-tests
     if: always() && (startsWith(github.event.review.body, '/ci-run-integration') || contains(github.event.review.body, '/ci-run-all'))
     env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
+      FAILED: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
     steps:
       - name: Generate authentication token
         id: generate_token
@@ -186,10 +186,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: 'success'
 
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ env.FAILED }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

.github/workflows/e2e.yml

@@ -117,13 +117,12 @@ jobs:
     timeout-minutes: 5
     if: always()
     needs: e2e-tests
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

.github/workflows/environment.yml

@@ -50,7 +50,7 @@ jobs:
           password: ${{ secrets.CI_DOCKER_PASSWORD }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         with:
           images: timberio/vector-dev
           flavor: |

.github/workflows/integration.yml

@@ -104,6 +104,11 @@ jobs:
               should_run=false
             fi
 
+            if [[ "${{ needs.changes.outputs.website_only }}" == "true" ]]; then
+              echo "Skipping ${{ matrix.service }} test since only website changes were detected"
+              exit 0
+            fi
+
             # Check if any of the three conditions is true
             if [[ "${{ github.event_name }}" == "merge_group" || \
                   "${{ github.event_name }}" == "workflow_dispatch" || \
@@ -121,17 +126,14 @@ jobs:
   integration-test-suite:
     name: Integration Test Suite
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
     if: always()
     needs:
       - integration-tests
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
       - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

.github/workflows/k8s_e2e.yml

@@ -245,7 +245,7 @@ jobs:
       - test-e2e-kubernetes
     if: always()
     env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
+      FAILED: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
     steps:
       - name: (PR review) Get PR branch
         if: github.event_name == 'pull_request_review' && env.FAILED != 'true'
@@ -260,10 +260,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: 'success'
 
-      - run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+      - name: Check all jobs status
+        run: |
+          if [[ "${{ env.FAILED }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

.github/workflows/master_merge_queue.yml

@@ -114,14 +114,12 @@ jobs:
       - unit-mac
       - unit-windows
       - install-sh
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
-      - name: exit
+      - name: Check all jobs status
         run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi

.github/workflows/preview_site_trigger.yml

@@ -7,62 +7,44 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     # Only run for PRs with 'website' in the branch name
-    if: ${{ contains(github.head_ref, 'website') && contains(github.head_ref, '-') }}
+    if: ${{ contains(github.head_ref, 'website') }}
     steps:
-      - name: Echo approval
+      # Validate branch name
+      - name: Validate branch name and set output
+        id: validate
         run: |
-          echo "Workflow has been allowed to run for PR ${{ github.event.number }}. Setting artifacts and then continuing workflow runs"
-
-      # Use GitHub Action to safely validate and store PR information
+          BRANCH="${{ github.head_ref }}"
+          if [[ ! "$BRANCH" =~ ^[a-zA-Z0-9_-]+$ ]]; then
+            echo "valid=false" >> $GITHUB_OUTPUT
+          else
+            echo "valid=true" >> $GITHUB_OUTPUT
+          fi
+
+      # Save PR information (only if branch is valid)
       - name: Validate and save PR information
+        if: steps.validate.outputs.valid == 'true'
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const fs = require('fs').promises;
             const path = require('path');
             const crypto = require('crypto');
+            const prNumber = context.payload.number;
+            const branchName = context.payload.pull_request.head.ref;
 
-            async function createAndValidateArtifact() {
-              try {
-                // Create directory for artifact
-                await fs.mkdir('./pr', { recursive: true });
-
-                // Get PR number and validate
-                const prNumber = context.payload.number;
-                if (typeof prNumber !== 'number' || !Number.isInteger(prNumber) || prNumber <= 0) {
-                  core.setFailed(`Invalid PR number: ${prNumber}`);
-                  return;
-                }
-
-                // Get branch name and validate
-                const branchName = context.payload.pull_request.head.ref;
-                // Validate branch name (only allow alphanumeric, dash, and underscore)
-                const branchNameRegex = /^[a-zA-Z0-9_\-]+$/;
-                if (!branchNameRegex.test(branchName)) {
-                  core.setFailed(`Invalid branch name detected: ${branchName}`);
-                  return;
-                }
-
-                // Write validated information to files
-                await fs.writeFile('./pr/number', prNumber.toString());
-                await fs.writeFile('./pr/branch', branchName);
-
-                // Log success
-                core.info(`Successfully validated and saved PR #${prNumber} with branch ${branchName}`);
+            await fs.mkdir('./pr', { recursive: true });
+            await fs.writeFile('./pr/number', prNumber.toString());
+            await fs.writeFile('./pr/branch', branchName);
 
-                // Create hash signature of the data
-                const numberHash = crypto.createHash('sha256').update(prNumber.toString()).digest('hex');
-                const branchHash = crypto.createHash('sha256').update(branchName).digest('hex');
-                await fs.writeFile('./pr/integrity', `${numberHash}:${branchHash}`);
-              } catch (error) {
-                core.setFailed(`An error occurred: ${error.message}`);
-              }
-            }
+            const numberHash = crypto.createHash('sha256').update(prNumber.toString()).digest('hex');
+            const branchHash = crypto.createHash('sha256').update(branchName).digest('hex');
+            await fs.writeFile('./pr/integrity', `${numberHash}:${branchHash}`);
 
-            createAndValidateArtifact();
+            core.info(`Saved PR #${prNumber} and branch ${branchName}`);
 
-      # Upload the artifact using latest version
+      # Upload the artifact using latest version (only if branch is valid)
       - name: Upload PR information artifact
+        if: steps.validate.outputs.valid == 'true'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: pr

.github/workflows/regression.yml

@@ -544,8 +544,6 @@ jobs:
       - submit-job
       - detect-regression
       - analyze-experiment
-    env:
-      FAILED: ${{ contains(needs.*.result, 'failure') }}
     steps:
       - name: Download capture-artifacts
         continue-on-error: true
@@ -563,11 +561,11 @@ jobs:
             echo "Did not find ${REPORT_MD} file."
           fi
 
-      - name: exit
+      - name: Check all jobs status
         run: |
-          echo "failed=${{ env.FAILED }}"
-          if [[ "$FAILED" == "true" ]] ; then
+          if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+            echo "One or more jobs failed or were cancelled"
             exit 1
           else
-            exit 0
+            echo "All jobs completed successfully"
           fi