From 9657e99c254770e1505209a7481a2712d37fdb56 Mon Sep 17 00:00:00 2001
From: Gregory LEOCADIE <gregory.leocadie@datadoghq.com>
Date: Sat, 7 Sep 2024 00:26:16 +0200
Subject: [PATCH 1/2] update powershell script

---
 windows/build-artifacts.ps1 | 11 ++++++-----
 windows/libdatadog.csproj   |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/windows/build-artifacts.ps1 b/windows/build-artifacts.ps1
index a827c91e0..b82e113bf 100644
--- a/windows/build-artifacts.ps1
+++ b/windows/build-artifacts.ps1
@@ -22,10 +22,10 @@ Write-Host "Building project into $($output_dir)" -ForegroundColor Magenta
 
 # build inside the crate to use the config.toml file
 pushd profiling-ffi
-Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi --target i686-pc-windows-msvc --release --target-dir $output_dir }
-Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi --target i686-pc-windows-msvc --target-dir $output_dir }
-Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi --target x86_64-pc-windows-msvc --release --target-dir $output_dir }
-Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi --target x86_64-pc-windows-msvc --target-dir $output_dir }
+Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target i686-pc-windows-msvc --release --target-dir $output_dir }
+Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target i686-pc-windows-msvc --target-dir $output_dir }
+Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target x86_64-pc-windows-msvc --release --target-dir $output_dir }
+Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target x86_64-pc-windows-msvc --target-dir $output_dir }
 popd
 
 Write-Host "Building tools" -ForegroundColor Magenta
@@ -38,6 +38,7 @@ Invoke-Call -ScriptBlock { cbindgen --crate ddcommon-ffi --config ddcommon-ffi/c
 Invoke-Call -ScriptBlock { cbindgen --crate datadog-profiling-ffi --config profiling-ffi/cbindgen.toml --output $output_dir\profiling.h }
 Invoke-Call -ScriptBlock { cbindgen --crate ddtelemetry-ffi --config ddtelemetry-ffi/cbindgen.toml --output $output_dir\telemetry.h }
 Invoke-Call -ScriptBlock { cbindgen --crate data-pipeline-ffi --config data-pipeline-ffi/cbindgen.toml --output $output_dir"\data-pipeline.h" }
-Invoke-Call -ScriptBlock { .\target\release\dedup_headers $output_dir"\common.h"  $output_dir"\profiling.h" $output_dir"\telemetry.h" $output_dir"\data-pipeline.h" }
+Invoke-Call -ScriptBlock { cbindgen --crate datadog-crashtracker-ffi --config crashtracker-ffi/cbindgen.toml --output $output_dir"\crashtracker.h" }
+Invoke-Call -ScriptBlock { .\target\release\dedup_headers $output_dir"\common.h"  $output_dir"\profiling.h" $output_dir"\telemetry.h" $output_dir"\data-pipeline.h" $output_dir"\crashtracker.h"}
 
 Write-Host "Build finished"  -ForegroundColor Magenta
\ No newline at end of file
diff --git a/windows/libdatadog.csproj b/windows/libdatadog.csproj
index 15ab7c62c..f32a91aa4 100644
--- a/windows/libdatadog.csproj
+++ b/windows/libdatadog.csproj
@@ -33,6 +33,8 @@
       PackagePath="include\native\datadog\profiling.h" />
     <None Include="$(LibDatadogBinariesOutputDir)\telemetry.h" Pack="true"
       PackagePath="include\native\datadog\telemetry.h" />
+    <None Include="$(LibDatadogBinariesOutputDir)\crashtracker.h" Pack="true"
+      PackagePath="include\native\datadog\crashtracker.h" />
 
     <None Include="$(LibDatadogBinariesOutputDir)\x86_64-pc-windows-msvc\debug\datadog_profiling_ffi.lib"
       Pack="true" PackagePath="build\native\lib\x64\debug\datadog_profiling_ffi.lib" />

From 302f2572ff67faa16d85fcba6c7816b31d91046e Mon Sep 17 00:00:00 2001
From: Gregory LEOCADIE <gregory.leocadie@datadoghq.com>
Date: Wed, 11 Sep 2024 12:48:33 +0200
Subject: [PATCH 2/2] Clean up examples build folder

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 492d1a47e..3186d2496 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -161,6 +161,7 @@ jobs:
         shell: bash
         run: |
           set -e
+          rm -rf examples/ffi/build_dll
           mkdir examples/ffi/build_dll
           cd examples/ffi/build_dll
           cmake -S .. -DDatadog_ROOT=$LIBDD_OUTPUT_FOLDER -DVCRUNTIME_LINK_TYPE=DLL
@@ -171,6 +172,7 @@ jobs:
         shell: bash
         run: |
           set -e
+          rm -rf examples/ffi/build_static
           mkdir examples/ffi/build_static
           cd examples/ffi/build_static
           cmake -S .. -DDatadog_ROOT=$LIBDD_OUTPUT_FOLDER -DVCRUNTIME_LINK_TYPE=STATIC
@@ -181,6 +183,7 @@ jobs:
         if: matrix.platform != 'windows-latest'
         run: |
           set -e
+          rm -rf examples/ffi/build
           mkdir examples/ffi/build
           cd examples/ffi/build
           # Add BUILD_SYMBOLIZER variable only for Linux platforms