Merge branch 'main' into levi/profiles_dictionary

Author: morrisonlevi

.github/actions/cache/action.yaml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
     steps:
       - name: Free Disk Space
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
@@ -29,14 +30,19 @@ jobs:
         uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
           tool: cargo-llvm-cov@0.6.13,nextest@0.9.96
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - name: Generate code coverage (including doc tests)
         run: |
           cargo llvm-cov --all-features --workspace --no-report nextest
           cargo llvm-cov --all-features --workspace --no-report --doc
           cargo llvm-cov report --doctests --lcov --output-path lcov.info
           cargo clean
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # 4.6.0
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # 5.5.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: lcov.info

.github/workflows/coverage.yml

@@ -1,7 +1,6 @@
 name: Fuzz test
 on:
   push:
-
 jobs:
   run-fuzz:
     runs-on: ubuntu-latest
@@ -10,6 +9,7 @@ jobs:
         directory: [libdd-alloc, libdd-profiling, libdd-common-ffi, libdd-trace-utils]
     env:
       CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
     - name: Set up Rust
@@ -21,6 +21,11 @@ jobs:
     - uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
       with:
         tool: cargo-bolero
+    - name: Cache [rust]
+      uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+      with:
+        cache-targets: true # cache build artifacts
+        cache-bin: true # cache the ~/.cargo/bin directory
     - run: |
         set -e
         # cargo bolero list outputs {"package":"package-name","test":"test-name"}

.github/workflows/fuzz.yml

@@ -16,13 +16,19 @@ jobs:
           shellcheck_opts: '-e SC2086'
   rustfmt:
     runs-on: ubuntu-latest
+    env:
+      CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      - name: Cache
-        uses: ./.github/actions/cache
       - name: Install nightly-2024-12-16 toolchain and rustfmt
         run: rustup install nightly-2024-12-16 && rustup default nightly-2024-12-16 && rustup component add rustfmt
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - run: cargo fmt --all -- --check
   clippy:
     name: "clippy #${{ matrix.platform }} ${{ matrix.rust_version }}"
@@ -35,12 +41,13 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      - name: Cache
-        uses: ./.github/actions/cache
-        with:
-          rust_version: ${{ matrix.rust_version }}
       - name: Install ${{ matrix.rust_version }} toolchain and clippy
         run: rustup install ${{ matrix.rust_version }} && rustup default ${{ matrix.rust_version }} && rustup component add clippy
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - name: Run clippy on ${{ matrix.platform }} ${{ matrix.rust_version }}
         shell: bash
         run: |

.github/workflows/lint.yml

@@ -10,6 +10,7 @@ jobs:
         partition: [1, 2, 3, 4, 5]
     env:
       CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
       PROPTEST_CASES: 1
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
@@ -22,6 +23,11 @@ jobs:
       - uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
           tool: nextest@0.9.96
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - run: MIRIFLAGS="-Zmiri-disable-isolation" cargo miri nextest run --partition count:${{ matrix.partition }}/5
       # We need to disable isolation because
       # "unsupported operation: `clock_gettime` with `REALTIME` clocks not available when isolation is enabled"

.github/workflows/miri.yml

@@ -8,6 +8,9 @@ jobs:
   test:
     name: "cargo test --workspace #${{ matrix.platform }} ${{ matrix.rust_version }}"
     runs-on: ${{ matrix.platform }}
+    env:
+      CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
     strategy:
       matrix:
         platform: [windows-latest, ubuntu-latest, macos-15]
@@ -28,13 +31,8 @@ jobs:
           large-packages: true
           docker-images: false
           swap-storage: true
-
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      - name: Cache
-        uses: ./.github/actions/cache
-        with:
-          rust_version: ${{ matrix.rust_version }}
       - name: Install Rust ${{ matrix.rust_version }}
         if: matrix.rust_version != ''
         run: rustup install ${{ matrix.rust_version }} && rustup default ${{ matrix.rust_version }}
@@ -45,6 +43,11 @@ jobs:
         uses: taiki-e/install-action@2c41309d51ede152b6f2ee6bf3b71e6dc9a8b7df # 2.49.27
         with:
           tool: nextest@0.9.96
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - name: "Remove nextest CI report"
         shell: bash
         run: rm -rf target/nextest/ci/junit.xml
@@ -90,6 +93,9 @@ jobs:
   ffi:
     name: "FFI #${{ matrix.platform }} ${{ matrix.rust_version }}"
     runs-on: ${{ matrix.platform }}
+    env:
+      CARGO_TERM_COLOR: always
+      CARGO_INCREMENTAL: 0
     strategy:
       matrix:
         platform: [windows-latest, ubuntu-latest, macos-15]
@@ -106,7 +112,6 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-
       - name: Setup output dir
         shell: bash
         run: |
@@ -115,7 +120,6 @@ jobs:
              WORKSPACE_PATH=$(cygpath -ua '${{ github.workspace }}')
           fi
           echo "LIBDD_OUTPUT_FOLDER=$WORKSPACE_PATH/artifacts" >> $GITHUB_ENV
-
       - name: Free Disk Space (Ubuntu only)
         if: runner.os == 'Linux' && matrix.platform == 'ubuntu-latest'
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # 1.3.1
@@ -127,14 +131,6 @@ jobs:
           large-packages: false
           docker-images: false
           swap-storage: true
-
-
-      - name: Cache
-        uses: ./.github/actions/cache
-        with:
-          rust_version: ${{ matrix.rust_version }}
-          build_profile: "release"
-
       - name: Install Rust ${{ matrix.rust_version }}
         if: matrix.rust_version != ''
         run: rustup install ${{ matrix.rust_version }} && rustup default ${{ matrix.rust_version }}
@@ -143,13 +139,19 @@ jobs:
         # On Windows run happens in a PowerShell, so start bash explicitly
         run: bash -c 'echo "version=$(rustc --version)" >> $GITHUB_OUTPUT'
 
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        env:
+          RUSTFLAGS: "${{ matrix.flags }}"
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - name: "Generate profiling FFI"
         shell: bash
         env:
           RUSTFLAGS: "${{ matrix.flags }}"
         run: |
-          cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker,library-config,log,ddsketch --release -- --out $LIBDD_OUTPUT_FOLDER
-
+          cargo run --bin release --release -- --out $LIBDD_OUTPUT_FOLDER
       - name: 'Publish libdatadog'
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # 4.6.1
         # Only upload the artifacts built with the default Rust version
@@ -159,7 +161,6 @@ jobs:
           name: libdatadog.${{ matrix.platform }}
           path: ${{ github.workspace }}/artifacts
           retention-days: 1
-
       - name: "(Windows) Test building Profiling C bindings - dynamic link vc runtime"
         if: matrix.platform == 'windows-latest'
         shell: bash
@@ -170,7 +171,6 @@ jobs:
           cd examples/ffi/build_dll
           cmake -S .. -DDatadog_ROOT=$LIBDD_OUTPUT_FOLDER -DVCRUNTIME_LINK_TYPE=DLL
           cmake --build .
-
       - name: "(Windows) Test building Profiling C bindings - static link vc runtime"
         if: matrix.platform == 'windows-latest'
         shell: bash
@@ -181,7 +181,6 @@ jobs:
           cd examples/ffi/build_static
           cmake -S .. -DDatadog_ROOT=$LIBDD_OUTPUT_FOLDER -DVCRUNTIME_LINK_TYPE=STATIC
           cmake --build .
-
       - name: "Test building Profiling C bindings"
         shell: bash
         if: matrix.platform != 'windows-latest'
@@ -219,10 +218,11 @@ jobs:
           swap-storage: true
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      - name: Cache
-        uses: ./.github/actions/cache
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
         with:
-          rust_version: cross-centos7
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - run: cargo install cross || true
       - run: cross build --workspace --target x86_64-unknown-linux-gnu --exclude builder
       - run: cross test --workspace --features libdd-crashtracker/generate-unit-test-files --target x86_64-unknown-linux-gnu --exclude builder  -- --skip "::single_threaded_tests::" --skip "tracing_integration_tests::"
@@ -233,25 +233,20 @@ jobs:
       matrix:
         target: [alpine-build] # debian-build-aarch64 is oom killed at the moment
     name: "FFI ${{ matrix.target }} via docker bake"
-
     concurrency:
       group: ci-${{ github.ref }}-${{ matrix.target }}
       cancel-in-progress: true
-
     runs-on:
       labels: ubuntu-latest-16-cores
       group: APM Larger Runners
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # 3.10.0
         with:
           buildkitd-config: .github/buildkitd-16-cores.toml
-      -
-        name: Build and Generate FFI
+      - name: Build and Generate FFI
         uses: docker/bake-action@4ba453fbc2db7735392b93edf935aaf9b1e8f747 # 6.5.0
         with:
           targets: ${{ matrix.target }}

.github/workflows/test.yml

@@ -2,11 +2,11 @@ name: 'Verify trace-protobuf'
 on:
   pull_request:
     types: [ opened, synchronize, reopened ]
-
 env:
   DATADOG_AGENT_TAG: "7f6d07c93ba087f23f80a3f0c2da4b1f3dc664d7"
   rust_version: "1.84.1"
-
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
 jobs:
   verify-proto-files:
     name: "Verify trace-protobuf .proto files are in sync with datadog-agent"
@@ -45,12 +45,13 @@ jobs:
         working-directory: libdd-trace-protobuf/src/pb
         run: |
           ../../../.github/workflows/diff-proto-files.sh --file idx/span.proto --tag ${{ env.DATADOG_AGENT_TAG }}
-      - name: Cache
-        uses: ./.github/actions/cache
-        with:
-          rust_version: ${{ env.rust_version }}
       - name: Install ${{ env.rust_version }} toolchain
         run: rustup install ${{ env.rust_version }} && rustup default ${{ env.rust_version }}
+      - name: Cache [rust]
+        uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # 2.8.1
+        with:
+          cache-targets: true # cache build artifacts
+          cache-bin: true # cache the ~/.cargo/bin directory
       - name: diff pb.rs
         working-directory: libdd-trace-protobuf
         run: |

.github/workflows/verify-proto-files.yml

@@ -8,7 +8,10 @@ benchmarks:
   needs: []
   image:
     name: $BASE_CI_IMAGE
-  interruptible: true
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      interruptible: false
+    - interruptible: true
   timeout: 1h
   script:
     - export ARTIFACTS_DIR="$(pwd)/reports" && (mkdir "${ARTIFACTS_DIR}" || :)