Merge branch 'master' of github.com:DataDog/dd-trace-php into bob/win…

…dows Signed-off-by: Bob Weinand <[email protected]>
DataDog · Feb 16, 2024 · 8d6e29f · 8d6e29f
2 parents f5ca02d + bf53bdf
commit 8d6e29f
Show file tree

Hide file tree

Showing 75 changed files with 990 additions and 605 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
diff --git a/.github/workflows/prof_correctness.yml b/.github/workflows/prof_correctness.yml
@@ -93,6 +93,7 @@ jobs:
           done
 
       - name: Check profiler correctness for allocations
+        if: matrix.phpts != 'zts'
         uses: Datadog/prof-correctness/analyze@main
         with:
           expected_json: profiling/tests/correctness/allocations.json

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["components-rs", "profiling"]
+members = ["components-rs", "components-rs/php_sidecar_mockgen", "profiling"]
 resolver = "2"
 
 [workspace.package]