From 273b1490eef198fb7c3df1cc799ae903de808832 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Mon, 5 May 2025 21:26:48 -0400 Subject: [PATCH 1/5] enable default features for datadog-fips from dogstatsd --- crates/dogstatsd/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/dogstatsd/Cargo.toml b/crates/dogstatsd/Cargo.toml index 73e07d3a..16674abb 100644 --- a/crates/dogstatsd/Cargo.toml +++ b/crates/dogstatsd/Cargo.toml @@ -24,7 +24,7 @@ tokio-util = { version = "0.7.11", default-features = false } tracing = { version = "0.1.40", default-features = false } regex = { version = "1.10.6", default-features = false } zstd = { version = "0.13.3", default-features = false } -datadog-fips = { path = "../datadog-fips", default-features = false } +datadog-fips = { path = "../datadog-fips", default-features = true } [dev-dependencies] mockito = { version = "1.5.0", default-features = false } From 0826e489713259f89f82e5a7f933638370d0d29a Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Mon, 5 May 2025 21:34:36 -0400 Subject: [PATCH 2/5] build datadog-serverless-compat in ci --- .github/workflows/cargo.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 910e72e8..e5150b9a 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -74,6 +74,26 @@ jobs: - shell: bash run: cargo build --all + build-datadog-serverless-compat: + name: Build Datadog Serverless Compat + if: ${{ inputs.runner != 'ubuntu-24.04-arm' }} + needs: setup + runs-on: ${{ inputs.runner }} + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Install Protoc Binary + shell: bash + run: chmod +x ./scripts/install-protoc.sh && ./scripts/install-protoc.sh $HOME + - if: ${{ inputs.runner == 'ubuntu-24.04' }} + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y musl-tools + cargo build --release -p datadog-serverless-compat --target x86_64-unknown-linux-musl + - if: ${{ inputs.runner == 'windows-2022' }} + shell: bash + run: cargo build --release -p datadog-serverless-compat + test: name: Test needs: setup From 3541cece5620f48eaef1de03d54aa8ccfde2746e Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Mon, 5 May 2025 21:41:23 -0400 Subject: [PATCH 3/5] add linux-musl target --- .github/workflows/cargo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index e5150b9a..86580043 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -88,7 +88,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install -y musl-tools + rustup target add x86_64-unknown-linux-musl && sudo apt-get install -y musl-tools cargo build --release -p datadog-serverless-compat --target x86_64-unknown-linux-musl - if: ${{ inputs.runner == 'windows-2022' }} shell: bash From c54b7ed543ed8f8189e75155374553fe475a3784 Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Mon, 5 May 2025 21:45:07 -0400 Subject: [PATCH 4/5] set fail fast strategy to false --- .github/workflows/checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 163d2aa9..db9cc3cb 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -9,6 +9,7 @@ on: jobs: cargo: strategy: + fail-fast: false matrix: runner: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022] uses: ./.github/workflows/cargo.yml From 72d066e44adf0ea6bf502016df2794f7b1dd3f0b Mon Sep 17 00:00:00 2001 From: Duncan Harvey Date: Tue, 6 May 2025 11:02:38 -0400 Subject: [PATCH 5/5] select default features from datadog-serverless-compat instead of from dogstatsd --- crates/datadog-serverless-compat/Cargo.toml | 2 +- crates/dogstatsd/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/datadog-serverless-compat/Cargo.toml b/crates/datadog-serverless-compat/Cargo.toml index 0996127d..669f9d3b 100644 --- a/crates/datadog-serverless-compat/Cargo.toml +++ b/crates/datadog-serverless-compat/Cargo.toml @@ -11,7 +11,7 @@ env_logger = "0.10.0" datadog-trace-agent = { path = "../datadog-trace-agent" } datadog-trace-protobuf = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } datadog-trace-utils = { git = "https://github.com/DataDog/libdatadog/", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae" } -dogstatsd = { path = "../dogstatsd", default-features = false } +dogstatsd = { path = "../dogstatsd", default-features = true } tokio = { version = "1", features = ["macros", "rt-multi-thread"]} tokio-util = { version = "0.7", default-features = false } tracing = { version = "0.1", default-features = false } diff --git a/crates/dogstatsd/Cargo.toml b/crates/dogstatsd/Cargo.toml index 16674abb..73e07d3a 100644 --- a/crates/dogstatsd/Cargo.toml +++ b/crates/dogstatsd/Cargo.toml @@ -24,7 +24,7 @@ tokio-util = { version = "0.7.11", default-features = false } tracing = { version = "0.1.40", default-features = false } regex = { version = "1.10.6", default-features = false } zstd = { version = "0.13.3", default-features = false } -datadog-fips = { path = "../datadog-fips", default-features = true } +datadog-fips = { path = "../datadog-fips", default-features = false } [dev-dependencies] mockito = { version = "1.5.0", default-features = false }