Merge branch 'main' into v2-sanitizer

jaegertracing · Jul 21, 2024 · dab72f9 · dab72f9
2 parents 75026c0 + b2aded6
commit dab72f9
Show file tree

Hide file tree

Showing 184 changed files with 4,898 additions and 2,047 deletions.
diff --git a/.github/actions/setup-go-tip/action.yml b/.github/actions/setup-go-tip/action.yml
@@ -43,7 +43,7 @@ runs:
     # This requires Go toolchain, so install it first.
     - name: Install Go toolchain
       if: steps.download.outputs.success == 'false'
-      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/actions/setup-node.js/action.yml b/.github/actions/setup-node.js/action.yml
@@ -8,7 +8,7 @@ runs:
       run: |
         echo "JAEGER_UI_NODE_JS_VERSION=$(cat jaeger-ui/.nvmrc)" >> ${GITHUB_ENV}
 
-    - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+    - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
       with:
         node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }}
         cache: 'yarn'

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -25,12 +25,6 @@ updates:
       interval: daily
     labels: [ "changelog:dependencies" ]
 
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels: [ "changelog:dependencies" ]
-
   - package-ecosystem: docker
     directories:
       - /cmd/agent

diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
@@ -50,7 +50,7 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
@@ -43,7 +43,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build, test, and publish crossdock image
       run: bash scripts/build-crossdock.sh

diff --git a/.github/workflows/ci-all-in-one-build.yml → .github/workflows/ci-docker-all-in-one.yml b/.github/workflows/ci-all-in-one-build.yml → .github/workflows/ci-docker-all-in-one.yml
@@ -42,7 +42,7 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
@@ -55,7 +55,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Define BUILD_FLAGS var if running on a Pull Request
       run: |

diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
@@ -46,7 +46,7 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Build only linux/amd64 container images for a Pull Request
       if: github.ref_name != 'main'

diff --git a/.github/workflows/ci-hotrod.yml → .github/workflows/ci-docker-hotrod.yml b/.github/workflows/ci-hotrod.yml → .github/workflows/ci-docker-hotrod.yml
@@ -32,24 +32,32 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch
 
-    - name: Install tools
-      run: make install-ci
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - name: Define BUILD_FLAGS var if running on a Pull Request
+      run: |
+        case ${GITHUB_EVENT_NAME} in
+          pull_request)
+            echo "BUILD_FLAGS=-l -p linux/amd64" >> ${GITHUB_ENV}
+            ;;
+          *)
+            echo "BUILD_FLAGS=" >> ${GITHUB_ENV}
+            ;;
+        esac
 
     - name: Build, test, and publish hotrod image
-      run: bash scripts/hotrod-integration-test.sh
+      run: bash scripts/hotrod-integration-test.sh ${{ env.BUILD_FLAGS }}
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
 
     - name: Print logs from hotrod
-      run: docker logs example-hotrod
+      run: docker compose -f ./examples/hotrod/docker-compose.yml logs
       if: failure()
diff --git a/.github/workflows/ci-badger.yaml → .github/workflows/ci-e2e-badger.yaml b/.github/workflows/ci-badger.yaml → .github/workflows/ci-e2e-badger.yaml
@@ -29,7 +29,7 @@ jobs:
 
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-cassandra.yml → .github/workflows/ci-e2e-cassandra.yml b/.github/workflows/ci-cassandra.yml → .github/workflows/ci-e2e-cassandra.yml
@@ -37,7 +37,7 @@ jobs:
 
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-elasticsearch.yml → .github/workflows/ci-e2e-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml → .github/workflows/ci-e2e-elasticsearch.yml
@@ -22,6 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         version:
+        - major: 6.x
+          distribution: elasticsearch
+          jaeger: v1
         - major: 7.x
           distribution: elasticsearch
           jaeger: v1
@@ -46,14 +49,11 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
-    - name: Install tools
-      run: make install-ci
-
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
     - name: Run ${{ matrix.version.distribution }} integration tests
       id: test-execution
       run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

diff --git a/.github/workflows/ci-grpc.yml → .github/workflows/ci-e2e-grpc.yml b/.github/workflows/ci-grpc.yml → .github/workflows/ci-e2e-grpc.yml
@@ -29,7 +29,7 @@ jobs:
 
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-kafka.yml → .github/workflows/ci-e2e-kafka.yml b/.github/workflows/ci-kafka.yml → .github/workflows/ci-e2e-kafka.yml
@@ -26,7 +26,7 @@ jobs:
 
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-e2e-memory.yaml b/.github/workflows/ci-e2e-memory.yaml
@@ -0,0 +1,41 @@
+name: CIT Memory
+
+on:
+  push:
+    branches: [main]
+
+  pull_request:
+    branches: [main]
+
+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:  # added using https://github.com/step-security/secure-workflows
+  contents: read
+
+jobs:
+  memory-v2:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+      with:
+        go-version: 1.22.x
+
+    - name: Run Memory storage integration tests
+      run: |
+        STORAGE=memory_v2 make jaeger-v2-storage-integration-test
+
+    - name: Upload coverage to codecov
+      uses: ./.github/actions/upload-codecov
+      with:
+        files: cover.out
+        flags: memory_v2
diff --git a/.github/workflows/ci-opensearch.yml → .github/workflows/ci-e2e-opensearch.yml b/.github/workflows/ci-opensearch.yml → .github/workflows/ci-e2e-opensearch.yml
@@ -46,14 +46,11 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 
-    - name: Install tools
-      run: make install-ci
-
-    - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+    - uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
 
     - name: Run ${{ matrix.version.distribution }} integration tests
       id: test-execution

diff --git a/.github/workflows/ci-build-spm.yml → .github/workflows/ci-e2e-spm.yml b/.github/workflows/ci-build-spm.yml → .github/workflows/ci-e2e-spm.yml
@@ -32,7 +32,7 @@ jobs:
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml
@@ -39,7 +39,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/.../workflows/validate-dependabot-config.yml → ...b/workflows/ci-lint-dependabot-config.yml b/.../workflows/validate-dependabot-config.yml → ...b/workflows/ci-lint-dependabot-config.yml
diff --git a/.github/workflows/ci-protogen-tests.yml → .github/workflows/ci-lint-protogen.yml b/.github/workflows/ci-protogen-tests.yml → .github/workflows/ci-lint-protogen.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         submodules: recursive
 
-    - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+    - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: 1.22.x
 

diff --git a/...kflows/ci-validation-of-shell-scripts.yml → .github/workflows/ci-lint-shell-scripts.yml b/...kflows/ci-validation-of-shell-scripts.yml → .github/workflows/ci-lint-shell-scripts.yml
@@ -1,4 +1,4 @@
-name: Validation Of Shell Scripts
+name: Lint Shell Scripts
 
 on:
   push:
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 jobs:
-  validation-of-shell-scripts:
+  link-shell-scripts:
     runs-on: ubuntu-latest
 
     steps:
@@ -20,17 +20,11 @@ jobs:
       with:
         egress-policy: audit
 
-    - name: check out code 
+    - name: check out code
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Install shellcheck
       run: sudo apt-get install shellcheck
 
     - name: Run shellcheck
       run: shellcheck scripts/*.sh
-
-
-
-
-
-