Skip to content

Commit 8df55f0

Browse files
joeyzhao2018joeyzhao2018
authored
Merge branch 'main' into joey/handle_msk
2 parents 79fe393 + 07e4bb5 commit 8df55f0

54 files changed

Lines changed: 1654 additions & 2508 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v6.0.2
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v4
32+
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
3333
with:
3434
languages: ${{ matrix.language }}
3535
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -38,7 +38,7 @@ jobs:
3838
# queries: ./path/to/local/query, your-org/your-repo/queries@main
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@v4
41+
uses: github/codeql-action/autobuild@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@v4
44+
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0

‎.github/workflows/publish-serverless-init-to-ghcr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
crane version
4444
4545
- name: Login to GHCR
46-
uses: docker/login-action@v4
46+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
4747
with:
4848
registry: ghcr.io
4949
username: ${{ github.actor }}

‎.github/workflows/release-serverless-init.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ jobs:
4545
]
4646
name: "Release Serverless Init (isAlpine: ${{ matrix.arrays.isAlpine }})"
4747
steps:
48-
- uses: actions/checkout@v6.0.2
48+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949

50-
- uses: actions/checkout@v6.0.2
50+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5151
with:
5252
repository: DataDog/datadog-agent
5353
ref: ${{ github.event.inputs.agentBranch }}
@@ -66,7 +66,7 @@ jobs:
6666
image: tonistiigi/binfmt:qemu-v10.1.3
6767

6868
- name: Set up Docker Buildx
69-
uses: docker/setup-buildx-action@v4
69+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
7070

7171
- name: Build binaries
7272
working-directory: ./scripts
@@ -87,15 +87,15 @@ jobs:
8787
cp ./scripts/serverless_init_dotnet.sh ./scripts/bin/
8888
8989
- name: Login to GHCR
90-
uses: docker/login-action@v4
90+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
9191
with:
9292
registry: ${{ env.REGISTRY }}
9393
username: ${{ github.actor }}
9494
password: ${{ secrets.GITHUB_TOKEN }}
9595

9696
- name: Build and push
9797
id: docker_build
98-
uses: docker/build-push-action@v7
98+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
9999
with:
100100
context: ./scripts
101101
file: ./scripts/${{ matrix.arrays.dockerFile }}
@@ -106,7 +106,7 @@ jobs:
106106

107107
- name: Build and push latest
108108
id: docker_build_latest
109-
uses: docker/build-push-action@v7
109+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
110110
if: ${{ github.event.inputs.latestTag == 'yes' }}
111111
with:
112112
context: ./scripts

‎.github/workflows/rs_ci.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-22.04
1919
timeout-minutes: 3
2020
steps:
21-
- uses: styfle/cancel-workflow-action@0.13.0
21+
- uses: styfle/cancel-workflow-action@d07a454dad7609a92316b57b23c9ccfd4f59af66 # v0.13.1
2222
with:
2323
access_token: ${{ secrets.GITHUB_TOKEN }}
2424
all_but_latest: true # can cancel workflows scheduled later
@@ -31,7 +31,7 @@ jobs:
3131
SCCACHE_GHA_ENABLED: "true"
3232
RUSTC_WRAPPER: "sccache"
3333
steps:
34-
- uses: actions/checkout@v6.0.2
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535

3636
# Install protobuf compiler for linux. The versions bundled with Ubuntu
3737
# 20.04 and 22.04 are too old -- our messages require protobuf >= 3.15 --
@@ -44,10 +44,10 @@ jobs:
4444
unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
4545
export PATH="$PATH:$HOME/.local/bin"
4646
47-
- uses: actions-rust-lang/setup-rust-toolchain@v1.15.3
47+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
4848
with:
4949
cache: false
50-
- uses: mozilla-actions/sccache-action@v0.0.9
50+
- uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
5151
- working-directory: bottlecap
5252
run: cargo check --workspace
5353

@@ -59,7 +59,7 @@ jobs:
5959
SCCACHE_GHA_ENABLED: "true"
6060
RUSTC_WRAPPER: "sccache"
6161
steps:
62-
- uses: actions/checkout@v6.0.2
62+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6363

6464
# Install protobuf compiler for linux. The versions bundled with Ubuntu
6565
# 20.04 and 22.04 are too old -- our messages require protobuf >= 3.15 --
@@ -72,11 +72,11 @@ jobs:
7272
unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
7373
export PATH="$PATH:$HOME/.local/bin"
7474
75-
- uses: actions-rust-lang/setup-rust-toolchain@v1.15.3
75+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
7676
with:
7777
components: clippy
7878
cache: false
79-
- uses: mozilla-actions/sccache-action@v0.0.9
79+
- uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
8080
# We need to do these separately because the fips feature is incompatible with the default feature.
8181
- working-directory: bottlecap
8282
run: cargo clippy --workspace --all-targets --features default
@@ -91,7 +91,7 @@ jobs:
9191
SCCACHE_GHA_ENABLED: "true"
9292
RUSTC_WRAPPER: "sccache"
9393
steps:
94-
- uses: actions/checkout@v6.0.2
94+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9595

9696
# Install protobuf compiler for linux. The versions bundled with Ubuntu
9797
# 20.04 and 22.04 are too old -- our messages require protobuf >= 3.15 --
@@ -104,10 +104,10 @@ jobs:
104104
unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
105105
export PATH="$PATH:$HOME/.local/bin"
106106
107-
- uses: actions-rust-lang/setup-rust-toolchain@v1.15.3
107+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
108108
with:
109109
cache: false
110-
- uses: mozilla-actions/sccache-action@v0.0.9
110+
- uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
111111
- working-directory: bottlecap
112112
run: cargo build --all
113113

@@ -119,7 +119,7 @@ jobs:
119119
SCCACHE_GHA_ENABLED: "true"
120120
RUSTC_WRAPPER: "sccache"
121121
steps:
122-
- uses: actions/checkout@v6.0.2
122+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
123123

124124
# Install protobuf compiler for linux. The versions bundled with Ubuntu
125125
# 20.04 and 22.04 are too old -- our messages require protobuf >= 3.15 --
@@ -132,13 +132,13 @@ jobs:
132132
unzip "protoc-${{ env.PB_VERSION }}-${{ env.PB_TARGET }}.zip" -d "$HOME/.local"
133133
export PATH="$PATH:$HOME/.local/bin"
134134
135-
- uses: actions-rust-lang/setup-rust-toolchain@v1.15.3
135+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
136136
with:
137137
cache: false
138-
- uses: taiki-e/install-action@v2
138+
- uses: taiki-e/install-action@cbb1dcaa26e1459e2876c39f61c1e22a1258aac5 # v2.68.33
139139
with:
140140
tool: nextest@0.9
141-
- uses: mozilla-actions/sccache-action@v0.0.9
141+
- uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
142142
- working-directory: bottlecap
143143
run: cargo nextest run --workspace
144144

@@ -149,8 +149,8 @@ jobs:
149149
matrix:
150150
os: [ubuntu-22.04, macos-latest]
151151
steps:
152-
- uses: actions/checkout@v6.0.2
153-
- uses: actions-rust-lang/setup-rust-toolchain@v1.15.3
152+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
153+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
154154
with:
155155
components: rustfmt
156156
cache: false
@@ -163,7 +163,7 @@ jobs:
163163
name: "Valid LICENSE-3rdparty.csv"
164164
steps:
165165
- name: Checkout sources
166-
uses: actions/checkout@v6.0.2
166+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
167167
- run: cargo install dd-rust-license-tool --locked
168168
- run: dd-rust-license-tool check
169169
working-directory: bottlecap
@@ -176,7 +176,7 @@ jobs:
176176
checks: write
177177
steps:
178178
- name: Checkout repository
179-
uses: actions/checkout@v6.0.2
179+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
180180
- name: Scan Rust dependencies with cargo-audit
181181
uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
182182
with:

‎.github/workflows/test-qemu-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- "tonistiigi/binfmt:qemu-v7.0.0-28"
8484
name: "QEMU ${{ matrix.qemu_image }}"
8585
steps:
86-
- uses: actions/checkout@v6.0.2
86+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8787

8888
- name: Set up QEMU
8989
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a #v4.0.0
@@ -94,7 +94,7 @@ jobs:
9494
run: docker run --rm --privileged ${{ matrix.qemu_image }} --version
9595

9696
- name: Set up Docker Buildx
97-
uses: docker/setup-buildx-action@v4
97+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
9898

9999
# Simple docker run tests — catches deterministically broken versions
100100
# (v9.2.0 and v8.1.5 consistently fail here; v8.1.4 is flaky).

‎.gitlab/datasources/test-suites.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test_suites:
2-
- name: base
2+
- name: on-demand
33
- name: otlp
44
- name: snapstart
55
- name: lmi

‎bottlecap/LICENSE-3rdparty.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ anyhow,https://github.com/dtolnay/anyhow,MIT OR Apache-2.0,David Tolnay <dtolnay
77
async-trait,https://github.com/dtolnay/async-trait,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
88
atomic,https://github.com/Amanieu/atomic-rs,Apache-2.0 OR MIT,Amanieu d'Antras <amanieu@gmail.com>
99
atomic-waker,https://github.com/smol-rs/atomic-waker,Apache-2.0 OR MIT,"Stjepan Glavina <stjepang@gmail.com>, Contributors to futures-rs"
10+
aws-lc-fips-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND OpenSSL,AWS-LC
1011
aws-lc-rs,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC),AWS-LibCrypto
1112
aws-lc-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND OpenSSL,AWS-LC
1213
axum,https://github.com/tokio-rs/axum,MIT,The axum Authors

‎integration-tests/bin/app.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22
import 'source-map-support/register';
33
import * as cdk from 'aws-cdk-lib';
4-
import {Base} from '../lib/stacks/base';
4+
import {OnDemand} from '../lib/stacks/on-demand';
55
import {Otlp} from '../lib/stacks/otlp';
66
import {Snapstart} from '../lib/stacks/snapstart';
77
import {LambdaManagedInstancesStack} from '../lib/stacks/lmi';
@@ -22,7 +22,7 @@ const identifier = getIdentifier();
2222
new CapacityProviderStack(app, `integ-default-capacity-provider`, {env});
2323

2424
const stacks = [
25-
new Base(app, `integ-${identifier}-base`, {
25+
new OnDemand(app, `integ-${identifier}-on-demand`, {
2626
env,
2727
}),
2828
new Otlp(app, `integ-${identifier}-otlp`, {

‎integration-tests/config.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ import * as os from 'os';
33
export const ACCOUNT = process.env.CDK_DEFAULT_ACCOUNT || process.env.AWS_ACCOUNT_ID;
44
export const REGION = process.env.CDK_DEFAULT_REGION || process.env.AWS_REGION || 'us-east-1';
55

6+
// Default wait time for Datadog to index logs and traces after Lambda invocation
7+
export const DEFAULT_DATADOG_INDEXING_WAIT_MS = 5 * 60 * 1000; // 5 minutes
8+
9+
// Extended wait time for async invocations (SQS, SNS) - need more time for message processing
10+
export const ASYNC_DATADOG_INDEXING_WAIT_MS = 90 * 1000; // 90 seconds
11+
12+
// Extended wait time for tests that need more time (e.g., OTLP tests)
13+
export const DATADOG_INDEXING_WAIT_5_MIN_MS = 5 * 60 * 1000; // 5 minutes
14+
615

716
export function getIdentifier(): string {
817
if (process.env.IDENTIFIER) {

‎integration-tests/lambda/base-dotnet/Function.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)