Merge remote-tracking branch 'origin/master' into dependabot/cargo/tr…

…ust-dns-proto-0.21.1
vectordotdev · Mar 1, 2022 · a29eec9 · a29eec9
2 parents bbf043c + 635ddcc
commit a29eec9
Show file tree

Hide file tree

Showing 336 changed files with 3,231 additions and 1,831 deletions.
diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1.6.0
       - name: Login to DockerHub
-        uses: docker/login-action@v1.13.0
+        uses: docker/login-action@v1.14.0
         if: github.ref == 'refs/heads/master'
         with:
           username: ${{ secrets.CI_DOCKER_USERNAME }}

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -47,36 +47,6 @@ jobs:
           all_but_latest: true # can cancel workflows scheduled later
 
   test-integration:
-    name: Integration - Linux, ${{ matrix.test }}
-    runs-on: ubuntu-20.04
-    if: |
-      !github.event.pull_request
-        || contains(github.event.pull_request.labels.*.name, 'ci-condition: integration tests enable')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - test: 'humio'
-          - test: 'kafka'
-    steps:
-      - uses: actions/checkout@v2.4.0
-      - run: make ci-sweep
-      - uses: actions/cache@v2.1.7
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
-      - run: bash scripts/environment/prepare.sh
-      - run: echo "::add-matcher::.github/matchers/rust.json"
-      - run: make slim-builds
-      - run: make test-integration-${{ matrix.test }}
-        env:
-          TEST_DATADOG_API_KEY: ${{ secrets.CI_TEST_DATADOG_API_KEY }}
-
-  # just keep both during migration
-  test-integration-docker-compose:
     name: Integration - Linux, ${{ matrix.test }}
     runs-on: ubuntu-20.04
     if: |
@@ -98,7 +68,9 @@ jobs:
           - test: 'eventstoredb'
           - test: 'fluent'
           - test: 'gcp'
+          - test: 'humio'
           - test: 'influxdb'
+          - test: 'kafka'
           - test: 'logstash'
           - test: 'loki'
           - test: 'mongo'
@@ -113,6 +85,7 @@ jobs:
           - test: 'splunk'
     steps:
       - uses: actions/checkout@v2.4.0
+      - run: make ci-sweep
       - run: make test-integration-${{ matrix.test }}
         env:
           TEST_DATADOG_API_KEY: ${{ secrets.CI_TEST_DATADOG_API_KEY }}
@@ -125,7 +98,6 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test-integration
-      - test-integration-docker-compose
     steps:
       - name: validate
         run: echo "OK"

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -375,7 +375,7 @@ jobs:
       - uses: actions/checkout@v2.4.0
       - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
       - name: Login to DockerHub
-        uses: docker/login-action@v1.13.0
+        uses: docker/login-action@v1.14.0
         with:
           username: ${{ secrets.CI_DOCKER_USERNAME }}
           password: ${{ secrets.CI_DOCKER_PASSWORD }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -353,7 +353,7 @@ jobs:
       - uses: actions/checkout@v2.4.0
       - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
       - name: Login to DockerHub
-        uses: docker/login-action@v1.13.0
+        uses: docker/login-action@v1.14.0
         with:
           username: ${{ secrets.CI_DOCKER_USERNAME }}
           password: ${{ secrets.CI_DOCKER_PASSWORD }}

diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml
@@ -253,23 +253,23 @@ jobs:
 
       - name: Run baseline experiment
         run: |
-          rm -rf /tmp/${{ github.event.number }}-${{ github.run_attempt }}/
-          mkdir -p /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/
+          rm -rf /tmp/${{ github.run_id }}-${{ github.run_attempt }}/
+          mkdir -p /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/
           ./soaks/bin/soak_one.sh --soak ${{ matrix.target }} \
                                   --build-image "false" \
                                   --variant "baseline" \
                                   --tag ${{ needs.compute-soak-meta.outputs.baseline-tag }} \
                                   --cpus ${{ needs.compute-soak-meta.outputs.soak-cpus }} \
                                   --memory ${{ needs.compute-soak-meta.outputs.soak-memory }} \
                                   --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
-                                  --capture-dir /tmp/${{ github.event.number }}-${{ github.run_attempt }} \
+                                  --capture-dir /tmp/${{ github.run_id }}-${{ github.run_attempt }} \
                                   --warmup-seconds 30
 
       - name: Upload timing captures
         uses: actions/upload-artifact@v1
         with:
-          name: ${{ github.event.number }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-baseline
-          path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/baseline.captures
+          name: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-baseline
+          path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/baseline.captures
 
       - name: Clear up unused images
         run: |
@@ -285,7 +285,7 @@ jobs:
 
     steps:
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.10.1"
 
@@ -300,15 +300,15 @@ jobs:
       - name: Download captures artifact
         uses: actions/download-artifact@v2
         with:
-          path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+          path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Display structure of downloaded files
         run: ls -R
-        working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+        working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Detect erratic
         run: |
-          ./soaks/bin/detect_erratic --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
+          ./soaks/bin/detect_erratic --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
                                      --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
                                      --warmup-seconds 30 \
                                      --variant baseline \
@@ -339,23 +339,23 @@ jobs:
 
       - name: Run comparison experiment
         run: |
-          rm -rf /tmp/${{ github.event.number }}-${{ github.run_attempt }}/
-          mkdir -p /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/
+          rm -rf /tmp/${{ github.run_id }}-${{ github.run_attempt }}/
+          mkdir -p /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/
           ./soaks/bin/soak_one.sh --soak ${{ matrix.target }} \
                                   --build-image "false" \
                                   --variant "comparison" \
                                   --tag ${{ needs.compute-soak-meta.outputs.comparison-tag }} \
                                   --cpus ${{ needs.compute-soak-meta.outputs.soak-cpus }} \
                                   --memory ${{ needs.compute-soak-meta.outputs.soak-memory }} \
                                   --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
-                                  --capture-dir /tmp/${{ github.event.number }}-${{ github.run_attempt }} \
+                                  --capture-dir /tmp/${{ github.run_id }}-${{ github.run_attempt }} \
                                   --warmup-seconds 30
 
       - name: Upload timing captures
         uses: actions/upload-artifact@v1
         with:
-          name: ${{ github.event.number }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-comparison
-          path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}/${{ matrix.target }}/comparison.captures
+          name: ${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.target }}-replica_${{ matrix.replica }}-comparison
+          path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}/${{ matrix.target }}/comparison.captures
 
       - name: Clear up unused images
         run: |
@@ -371,7 +371,7 @@ jobs:
 
     steps:
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.10.1"
 
@@ -386,15 +386,15 @@ jobs:
       - name: Download captures artifact
         uses: actions/download-artifact@v2
         with:
-          path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+          path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Display structure of downloaded files
         run: ls -R
-        working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+        working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Detect erratic
         run: |
-          ./soaks/bin/detect_erratic --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
+          ./soaks/bin/detect_erratic --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
                                      --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
                                      --warmup-seconds 30 \
                                      --variant comparison \
@@ -411,7 +411,7 @@ jobs:
 
     steps:
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.10.1"
 
@@ -426,32 +426,32 @@ jobs:
       - name: Download captures artifact
         uses: actions/download-artifact@v2
         with:
-          path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+          path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Display structure of downloaded files
         run: ls -R
-        working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+        working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Analyze captures
         run: |
-          ./soaks/bin/analyze_experiment --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
+          ./soaks/bin/analyze_experiment --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
                                          --baseline-sha ${{ needs.compute-soak-meta.outputs.baseline-sha }} \
                                          --comparison-sha ${{ needs.compute-soak-meta.outputs.comparison-sha }} \
                                          --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }} \
                                          --warmup-seconds 30 \
                                          --coefficient-of-variation-limit ${{ needs.compute-soak-meta.outputs.coefficient-of-variation }} \
                                          --erratic-soaks ${{ needs.compute-soak-meta.outputs.erratic-soaks }} \
-                                         --p-value 0.1 > /tmp/${{ github.event.number}}-${{ github.run_attempt }}-analysis
+                                         --p-value 0.1 > /tmp/${{ github.run_id}}-${{ github.run_attempt }}-analysis
       - uses: actions/upload-artifact@v2
         with:
           name: soak-analysis
-          path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}-analysis
+          path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}-analysis
 
       - name: Read analysis file
         id: read-analysis
         uses: juliangruber/read-file-action@v1
         with:
-          path: /tmp/${{ github.event.number }}-${{ github.run_attempt }}-analysis
+          path: /tmp/${{ github.run_id }}-${{ github.run_attempt }}-analysis
 
       - name: Post Results To PR
         uses: peter-evans/create-or-update-comment@v1
@@ -471,7 +471,7 @@ jobs:
 
     steps:
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.10.1"
 
@@ -486,15 +486,15 @@ jobs:
       - name: Download captures artifact
         uses: actions/download-artifact@v2
         with:
-          path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+          path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Display structure of downloaded files
         run: ls -R
-        working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+        working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Detect regressions
         run: |
-          ./soaks/bin/detect_regressions --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
+          ./soaks/bin/detect_regressions --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
                                          --warmup-seconds 30 \
                                          --erratic-soaks ${{ needs.compute-soak-meta.outputs.erratic-soaks }} \
                                          --p-value 0.1
@@ -509,7 +509,7 @@ jobs:
 
     steps:
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.10.1"
 
@@ -524,21 +524,21 @@ jobs:
       - name: Download captures artifact
         uses: actions/download-artifact@v2
         with:
-          path: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+          path: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Display structure of downloaded files
         run: ls -R
-        working-directory: ${{ github.event.number }}-${{ github.run_attempt }}-captures/
+        working-directory: ${{ github.run_id }}-${{ github.run_attempt }}-captures/
 
       - name: Plot analysis
         run: |
-          mkdir -p ${{ github.event.number }}-${{ github.run_attempt }}-captures/plots/
-          ./soaks/bin/plot_analysis --capture-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/ \
-                                    --output-dir ${{ github.event.number }}-${{ github.run_attempt }}-captures/plots/ \
+          mkdir -p ${{ github.run_id }}-${{ github.run_attempt }}-captures/plots/
+          ./soaks/bin/plot_analysis --capture-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/ \
+                                    --output-dir ${{ github.run_id }}-${{ github.run_attempt }}-captures/plots/ \
                                     --vector-cpus ${{ needs.compute-soak-meta.outputs.vector-cpus }}
 
       - name: Upload plots
         uses: actions/upload-artifact@v1
         with:
-          name: ${{ github.event.number }}-${{ github.run_attempt }}-captures-plots
-          path: "${{ github.event.number }}-${{ github.run_attempt }}-captures/plots"
+          name: ${{ github.run_id }}-${{ github.run_attempt }}-captures-plots
+          path: "${{ github.run_id }}-${{ github.run_attempt }}-captures/plots"
diff --git a/.github/workflows/soak_comment.yml b/.github/workflows/soak_comment.yml
@@ -43,7 +43,7 @@ jobs:
         id: read-analysis
         uses: juliangruber/read-file-action@v1
         with:
-          path: /tmp/${{ github.workflow_run.event.number }}-${{ github.workflow_run.run_attempt }}-analysis
+          path: /tmp/${{ github.event.workflow_run.run_id }}-${{ github.event.workflow_run.run_attempt }}-analysis
 
       - name: Post Results To PR
         uses: peter-evans/create-or-update-comment@v1

diff --git a/.github/workflows/soak_infra.yml b/.github/workflows/soak_infra.yml
@@ -37,7 +37,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1.13.0
+        uses: docker/login-action@v1.14.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -80,7 +80,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1.13.0
+        uses: docker/login-action@v1.14.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}