Merge branch 'main' into dd/fix-span-overflow-check

Author: edznux-dd

.codecov.yml

@@ -76,9 +76,9 @@ component_management:
       paths:
         - libdd-trace-normalization
     - component_id: trace-obfuscation  # this is an identifier that should not be changed
-      name: datadog-trace-obfuscation  # this is a display name, and can be changed freely
+      name: libdd-trace-obfuscation  # this is a display name, and can be changed freely
       paths:
-        - datadog-trace-obfuscation
+        - libdd-trace-obfuscation
     - component_id: trace-protobuf  # this is an identifier that should not be changed
       name: libdd-trace-protobuf  # this is a display name, and can be changed freely
       paths:

.github/CODEOWNERS

@@ -11,6 +11,7 @@
 .gitignore                           @Datadog/libdatadog
 .gitlab-ci.yml                       @Datadog/apm-common-components-core
 .gitlab/benchmarks.yml               @Datadog/apm-common-components-core
+.gitlab/fuzz.yml                     @Datadog/chaos-platform
 benchmark/                           @Datadog/apm-common-components-core
 bin_tests/                           @Datadog/libdatadog-profiling
 build-common/                        @Datadog/apm-common-components-core
@@ -28,7 +29,6 @@ datadog-remote-config                @Datadog/libdatadog-php @Datadog/libdatadog
 datadog-sidecar                      @Datadog/libdatadog-php @Datadog/libdatadog-apm
 datadog-sidecar-ffi                  @Datadog/libdatadog-php @Datadog/libdatadog-apm
 datadog-sidecar-macros               @Datadog/libdatadog-php
-datadog-trace-obfuscation            @Datadog/serverless @Datadog/libdatadog-apm
 datadog-tracer-flare                 @Datadog/libdatadog-apm
 docker-bake.hcl                      @Datadog/apm-common-components-core
 docs                                 @Datadog/libdatadog
@@ -45,6 +45,7 @@ libdd-profiling*/                    @Datadog/libdatadog-profiling
 libdd-telemetry*/                    @Datadog/apm-common-components-core
 libdd-tinybytes                      @Datadog/apm-common-components-core
 libdd-trace-normalization            @Datadog/serverless @Datadog/libdatadog-apm
+libdd-trace-obfuscation              @Datadog/serverless @Datadog/libdatadog-apm
 libdd-trace-protobuf                 @Datadog/serverless @Datadog/libdatadog-apm
 libdd-trace-stats                    @Datadog/apm-common-components-core
 libdd-trace-utils                    @Datadog/serverless @Datadog/libdatadog-apm
@@ -64,6 +65,7 @@ tests/spawn_from_lib/                @Datadog/libdatadog-php @Datadog/libdatadog
 tests/windows_package/               @Datadog/apm-common-components-core
 tools/                               @Datadog/apm-common-components-core
 windows/                             @Datadog/libdatadog-core
+fuzz/                                @Datadog/chaos-platform
 
 # Specific overrides (must come after their general patterns above)
 bin_tests/tests/test_the_tests.rs    @Datadog/libdatadog-core

.github/labeler.yml

@@ -25,7 +25,7 @@ mini-agent:
 - changed-files:
   - any-glob-to-any-file: [
       'datadog-trace-normalization/**/*',
-      'datadog-trace-obfuscation/**/*',
+      'libdd-trace-obfuscation/**/*',
       'libdd-trace-utils/**/*',
     ]
 

.github/workflows/test.yml

@@ -81,14 +81,50 @@ jobs:
           include_passed: true
       - name: Upload test results to Datadog
         if: success() || failure()
-        uses: datadog/junit-upload-github-action@762867566348d59ac9bcf479ebb4ec040db8940a
-        with:
-          api_key: ${{ secrets.DATADOG_API_KEY }}
-          env: ci
-          service: libdatadog
-          files: target/nextest/ci/junit.xml
-          logs: true
-          tags: rustc:${{ matrix.rust_version }},arch:${{ runner.arch }},os:${{ runner.os }},platform:${{ matrix.platform }}
+        shell: bash
+        run: |
+          # Download datadog-ci binary
+          if [ "${{ runner.os }}" == "Linux" ]; then
+            URL="https://github.com/DataDog/datadog-ci/releases/download/v4.2.2/datadog-ci_linux-x64"
+            OUTPUT="datadog-ci"
+            CHECKSUM_CMD="sha256sum"
+            EXPECTED_CHECKSUM="3e1e9649d15d3feacced89ec90de66151046a58c7844217e4112362ad8dbf8d1"
+          elif [ "${{ runner.os }}" == "Windows" ]; then
+            URL="https://github.com/DataDog/datadog-ci/releases/download/v4.2.2/datadog-ci_win-x64"
+            OUTPUT="datadog-ci.exe"
+            CHECKSUM_CMD="sha256sum"
+            EXPECTED_CHECKSUM="13313279cb884fe098e2f80ca21d23e67b78a090a12e891e8e35be653ee2bbd0"
+          elif [ "${{ runner.os }}" == "macOS" ]; then
+            URL="https://github.com/DataDog/datadog-ci/releases/download/v4.2.2/datadog-ci_darwin-x64"
+            OUTPUT="datadog-ci"
+            CHECKSUM_CMD="shasum -a 256"
+            EXPECTED_CHECKSUM="071a6140b17438b3f9dd6c65da48b48ea03fc310034fa624ce874fdb6c325da4"
+          fi
+                    
+          echo "Downloading datadog-ci from $URL"
+          curl -L --fail --retry 3 -o "$OUTPUT" "$URL"
+          chmod +x "$OUTPUT"
+          
+          # Verify checksum
+          ACTUAL_CHECKSUM=$($CHECKSUM_CMD "$OUTPUT" | cut -d' ' -f1)
+          echo "Expected checksum: $EXPECTED_CHECKSUM"
+          echo "Actual checksum: $ACTUAL_CHECKSUM"
+          
+          if [ "$ACTUAL_CHECKSUM" != "$EXPECTED_CHECKSUM" ]; then
+            echo "Checksum verification failed!"
+            exit 1
+          fi
+          echo "Checksum verification passed"
+          
+          # Upload test results
+          ./"$OUTPUT" junit upload \
+            --service libdatadog \
+            --env ci \
+            --logs \
+            --tags rustc:${{ matrix.rust_version }},arch:${{ runner.arch }},os:${{ runner.os }},platform:${{ matrix.platform }} \
+            target/nextest/ci/junit.xml
+        env:
+          DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
 
   ffi:
     name: "FFI #${{ matrix.platform }} ${{ matrix.rust_version }}"
@@ -198,6 +234,35 @@ jobs:
             cmake -S .. -DDatadog_ROOT=$LIBDD_OUTPUT_FOLDER
             cmake --build .
           fi
+      - name: "Test building CXX bindings - Crashinfo (Unix)"
+        shell: bash
+        if: matrix.platform != 'windows-latest'
+        run: |
+          set -e
+          cd examples/cxx
+          ./build-and-run-crashinfo.sh
+      - name: "Test building CXX bindings - Profiling (Unix)"
+        shell: bash
+        if: matrix.platform != 'windows-latest'
+        run: |
+          set -e
+          cd examples/cxx
+          ./build-profiling.sh
+      - name: "Setup MSVC (Windows)"
+        if: matrix.platform == 'windows-latest'
+        uses: ilammy/msvc-dev-cmd@v1
+      - name: "Test building CXX bindings - Crashinfo (Windows)"
+        shell: pwsh
+        if: matrix.platform == 'windows-latest'
+        run: |
+          cd examples/cxx
+          .\build-and-run-crashinfo.ps1
+      - name: "Test building CXX bindings - Profiling (Windows)"
+        shell: pwsh
+        if: matrix.platform == 'windows-latest'
+        run: |
+          cd examples/cxx
+          .\build-profiling.ps1
 
   cross-centos7:
     name: build and test using cross - on centos7

.gitignore

@@ -11,6 +11,7 @@ build/
 cmake-build-debug
 deliverables
 docker-linux-target
+release
 target
 tmp
 __fuzz__
@@ -24,3 +25,8 @@ Cargo.lock # this is ignored so you don't update by accident, but is committed.
 docker-sync.yml
 libtest.so
 libtest_cpp.so
+examples/cxx/crashinfo
+examples/cxx/crashinfo.exe
+examples/cxx/profiling
+examples/cxx/profiling.exe
+profile.pprof

.gitlab-ci.yml

@@ -7,6 +7,7 @@ variables:
 
 include:
   - local: .gitlab/benchmarks.yml
+  - local: .gitlab/fuzz.yml
 
 trigger_internal_build:
   variables:

.gitlab/fuzz.yml

@@ -0,0 +1,31 @@
+# Fuzzing job configuration
+# This job discovers, builds, and uploads all cargo-fuzz targets to the internal fuzzing infrastructure
+# See ci/README_FUZZING.md for more information
+
+variables:
+  BASE_CI_IMAGE: registry.ddbuild.io/ci/benchmarking-platform:libdatadog-benchmarks
+
+fuzz:
+  tags: ["arch:amd64"]
+  needs: []
+  image:
+    name: $BASE_CI_IMAGE
+  rules:
+    # runs on gitlab schedule and on merge to main.
+    # Also allow manual run in branches for ease of debug / testing
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "schedule"'
+      allow_failure: true
+    - if: $CI_COMMIT_BRANCH == "main"
+      allow_failure: true
+    - when: manual
+      allow_failure: true
+  timeout: 1h
+  script:
+    - VAULT_VERSION=1.15.4 && curl -fsSL "https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip" -o vault.zip && unzip vault.zip && mv vault /usr/local/bin/vault && rm vault.zip && chmod +x /usr/local/bin/vault
+    - rustup default nightly
+    - cargo install cargo-fuzz
+    - pip3 install requests toml
+    - python3 fuzz/fuzz_infra.py
+  allow_failure: true
+  variables:
+    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: libdatadog