Merge branch 'main' into find-trace-ids-1

Signed-off-by: Mahad Zaryab <[email protected]>

Author: mahadzaryab1

.github/actions/block-pr-from-main-branch/action.yml

@@ -12,6 +12,8 @@ runs:
         echo "Branch: ${{ github.event.pull_request.head.ref }}"
 
         if [ "${{ github.event.pull_request.head.repo.fork }}" == "true" ] && [ "${{ github.event.pull_request.head.ref }}" == 'main' ]; then
-          echo "PRs from the main branch of forked repositories are not allowed."
+          echo "Error 🛑: PRs from the main branch of forked repositories are not allowed."
+          echo "  Please create a named branch and resubmit the PR."
+          echo "  See https://github.com/jaegertracing/jaeger/blob/main/CONTRIBUTING_GUIDELINES.md#branches"
           exit 1
         fi

.github/actions/verify-metrics-snapshot/action.yaml

@@ -14,7 +14,7 @@ runs:
   using: 'composite'
   steps:
     - name: Upload current metrics snapshot
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: ${{ inputs.artifact_key }}
         path: ./.metrics/${{ inputs.snapshot }}.txt
@@ -63,7 +63,7 @@ runs:
 
     - name: Upload the diff artifact
       if: ${{ (github.ref_name != 'main') && (steps.compare-snapshots.outputs.has_diff == 'true') }}
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: diff_${{ inputs.artifact_key }}
         path: ./.metrics/diff_${{ inputs.snapshot }}.txt

.github/workflows/ci-build-binaries.yml

@@ -22,7 +22,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: define matrix
       id: set-matrix
       run: |
@@ -40,7 +40,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         submodules: true
 

.github/workflows/ci-comment.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
         with:
           ref: ${{ github.event.repository.default_branch }}
 

.github/workflows/ci-crossdock.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         submodules: true
 

.github/workflows/ci-deploy-demo.yml

@@ -29,7 +29,7 @@ jobs:
       uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4
 
     - name: Checkout jaeger repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
 
     - name: Deploy using appropriate script
       run: |

.github/workflows/ci-docker-all-in-one.yml

@@ -12,25 +12,20 @@ concurrency:
   group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
   cancel-in-progress: true
 
-# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
 permissions:
   contents: read
 
 jobs:
   all-in-one:
     runs-on: ubuntu-latest
     timeout-minutes: 30 # max + 3*std over the last 2600 runs
-    strategy:
-      fail-fast: false
-      matrix:
-        jaeger_version: [v1, v2]
 
     steps:
     - uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         submodules: true
 
@@ -62,9 +57,7 @@ jobs:
 
     - name: Build, test, and publish all-in-one image
       run: |
-        bash scripts/build/build-all-in-one-image.sh \
-          ${{ env.BUILD_FLAGS }} \
-          "${{ matrix.jaeger_version }}"
+        bash scripts/build/build-all-in-one-image.sh ${{ env.BUILD_FLAGS }} v2
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

.github/workflows/ci-docker-build.yml

@@ -25,7 +25,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         submodules: true
 

.github/workflows/ci-docker-hotrod.yml

@@ -23,17 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         runtime: [docker, k8s]
-        jaeger-version: [v1, v2]
-        exclude:
-          - runtime: k8s
-            jaeger-version: v1
+        jaeger-version: [v2]
 
     steps:
     - uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       with:
         submodules: true
 

.github/workflows/ci-e2e-all.yml

@@ -52,7 +52,7 @@ jobs:
         run: echo "${{ github.event.number }}" > pr_number.txt
       - name: Upload PR number artifact
         if: github.event_name == 'pull_request'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
         with:
           name: pr_number
           path: pr_number.txt