Merge branch 'main' into jordan.gonzalez/bottlecap/universal-instrume…

…ntation
DataDog · Oct 9, 2024 · d6ba035 · d6ba035
2 parents b61fe08 + 5d728fa
commit d6ba035
Show file tree

Hide file tree

Showing 12 changed files with 2,370 additions and 1,514 deletions.
diff --git a/.github/workflows/rs_ci.yml b/.github/workflows/rs_ci.yml
@@ -43,10 +43,10 @@ jobs:
           unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
           export PATH="$PATH:$HOME/.local/bin"
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
         with:
           cache: false
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - working-directory: bottlecap
         run: cargo check --workspace
 
@@ -71,11 +71,11 @@ jobs:
           unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
           export PATH="$PATH:$HOME/.local/bin"
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
         with:
           components: clippy
           cache: false
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - working-directory: bottlecap
         run: cargo clippy --workspace --all-features
 
@@ -100,10 +100,10 @@ jobs:
           unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
           export PATH="$PATH:$HOME/.local/bin"
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
         with:
           cache: false
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - working-directory: bottlecap
         run: cargo build --all
 
@@ -128,13 +128,13 @@ jobs:
           unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
           export PATH="$PATH:$HOME/.local/bin"
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
         with:
           cache: false
       - uses: taiki-e/install-action@v2
         with:
           tool: [email protected]
-      - uses: mozilla-actions/[email protected].5
+      - uses: mozilla-actions/[email protected].6
       - working-directory: bottlecap
         run: cargo nextest run --workspace
 
@@ -146,7 +146,7 @@ jobs:
         os: [ ubuntu-22.04, macos-latest ]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+      - uses: actions-rust-lang/setup-rust-toolchain@v1.10.0
         with:
           components: rustfmt
           cache: false

diff --git a/.github/workflows/serverless-vuln-scan.yml b/.github/workflows/serverless-vuln-scan.yml
@@ -34,31 +34,31 @@ jobs:
           ./scripts/build_binary_and_layer_dockerized.sh
 
       - name: Scan amd64 image with trivy
-        uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
+        uses: aquasecurity/trivy-action@a20de5420d57c4102486cdd9578b45609c99d7eb # v0.26.0
         with:
           image-ref: "datadog/build-lambda-extension-amd64:${{ env.VERSION }}"
           ignore-unfixed: true
           exit-code: 1
           format: table
 
       - name: Scan arm64 image with trivy
-        uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
+        uses: aquasecurity/trivy-action@a20de5420d57c4102486cdd9578b45609c99d7eb # v0.26.0
         with:
           image-ref: "datadog/build-lambda-extension-arm64:${{ env.VERSION }}"
           ignore-unfixed: true
           exit-code: 1
           format: table
 
       - name: Scan latest released image with trivy
-        uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
+        uses: aquasecurity/trivy-action@a20de5420d57c4102486cdd9578b45609c99d7eb # v0.26.0
         with:
           image-ref: "public.ecr.aws/datadog/lambda-extension:latest"
           ignore-unfixed: true
           exit-code: 1
           format: table
 
       - name: Scan latest-alpoine released image with trivy
-        uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
+        uses: aquasecurity/trivy-action@a20de5420d57c4102486cdd9578b45609c99d7eb # v0.26.0
         with:
           image-ref: "public.ecr.aws/datadog/lambda-extension:latest-alpine"
           ignore-unfixed: true

diff --git a/.gitlab/scripts/check_layer_size.sh b/.gitlab/scripts/check_layer_size.sh
@@ -15,7 +15,7 @@ if [ -z "$LAYER_FILE" ]; then
 fi
 
 MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 18 \* 1024) # 17 MB, amd64 is 17, while arm64 is 15
-MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 47 \* 1024) # 46 MB, amd is 46, while arm64 is 45
+MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 49 \* 1024) # 49 MB, amd is 49, while arm64 is 48
 
 LAYERS_DIR=".layers"