From 3013687540c4a06430e554fd446f77aa6b57b367 Mon Sep 17 00:00:00 2001
From: Gregory LEOCADIE <gregory.leocadie@datadoghq.com>
Date: Wed, 5 Jul 2023 09:58:16 +0200
Subject: [PATCH] Bump libdatadog to 3.0.0

---
 build/cmake/FindLibdatadog.cmake                       | 10 +++++-----
 .../Datadog.Profiler.Native.Windows.vcxproj            |  4 ++--
 .../Datadog.Profiler.Native.Windows/packages.config    |  2 +-
 .../Datadog.Profiler.Native.vcxproj                    |  6 +++---
 .../Datadog.Profiler.Native/LibddprofExporter.cpp      |  2 +-
 .../Datadog.Profiler.Native/packages.config            |  2 +-
 .../Datadog.Profiler.Native.Tests.vcxproj              |  4 ++--
 .../test/Datadog.Profiler.Native.Tests/packages.config |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/cmake/FindLibdatadog.cmake b/build/cmake/FindLibdatadog.cmake
index 420458e8f442..f1e79d408dfe 100644
--- a/build/cmake/FindLibdatadog.cmake
+++ b/build/cmake/FindLibdatadog.cmake
@@ -1,21 +1,21 @@
 include(FetchContent)
 
-set(LIBDATADOG_VERSION "v2.2.0" CACHE STRING "libdatadog version")
+set(LIBDATADOG_VERSION "v3.0.0" CACHE STRING "libdatadog version")
 
 if (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
     if (DEFINED ENV{IsAlpine} AND "$ENV{IsAlpine}" MATCHES "true")
-        set(SHA256_LIBDATADOG "4aa1d318db21bce4b1a8246fe7bb46320bacc95a3b62901e770e25559118438e" CACHE STRING "libdatadog sha256")
+        set(SHA256_LIBDATADOG "d9774bd28600fdc7c931146637d6410884d67a5e443486f1d2bfa320c4f00cb0" CACHE STRING "libdatadog sha256")
         set(FILE_TO_DOWNLOAD libdatadog-aarch64-alpine-linux-musl.tar.gz)
     else()
-        set(SHA256_LIBDATADOG "51da1b019aa129822f3b2553298c6921c0a787b2129c548d6c284a89971e1438" CACHE STRING "libdatadog sha256")
+        set(SHA256_LIBDATADOG "71b89626f585ebf385482fb9d000c71f91721b395df8d352ce04a825c1f1776a" CACHE STRING "libdatadog sha256")
         set(FILE_TO_DOWNLOAD libdatadog-aarch64-unknown-linux-gnu.tar.gz)
     endif()
 else()
     if (DEFINED ENV{IsAlpine} AND "$ENV{IsAlpine}" MATCHES "true")
-        set(SHA256_LIBDATADOG "832bad9cd949870e586bb3cd5681d3e89e6280265520cba2c707e01028d534e0" CACHE STRING "libdatadog sha256")
+        set(SHA256_LIBDATADOG "3fba3b542cbdd44bfb9fde09c5a65aabb34a92e56904dc6c6f3f53a0beb8ccef" CACHE STRING "libdatadog sha256")
         set(FILE_TO_DOWNLOAD libdatadog-${CMAKE_SYSTEM_PROCESSOR}-alpine-linux-musl.tar.gz)
     else()
-        set(SHA256_LIBDATADOG "3200041f79c1d44987370db0b8768662f8bbc611d3de10389a58d90bc56e8a45" CACHE STRING "libdatadog sha256")
+        set(SHA256_LIBDATADOG "39418275058a5ba96d6284bb6add0e9fbf6a59d7de0755d10184a0223f21c3ed" CACHE STRING "libdatadog sha256")
         set(FILE_TO_DOWNLOAD libdatadog-${CMAKE_SYSTEM_PROCESSOR}-unknown-linux-gnu.tar.gz)
     endif()
 endif()
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Datadog.Profiler.Native.Windows.vcxproj b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Datadog.Profiler.Native.Windows.vcxproj
index 49e365ee9230..a20a4a093d6c 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Datadog.Profiler.Native.Windows.vcxproj
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Datadog.Profiler.Native.Windows.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props" Condition="Exists('..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" />
+  <Import Project="..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props" Condition="Exists('..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -248,6 +248,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/packages.config b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/packages.config
index bdc4fc1b0c86..149080370cbd 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/packages.config
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="libdatadog" version="2.2.0" targetFramework="native" />
+  <package id="libdatadog" version="3.0.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/Datadog.Profiler.Native.vcxproj b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/Datadog.Profiler.Native.vcxproj
index d67e9b792c17..eda87d74d3eb 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/Datadog.Profiler.Native.vcxproj
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/Datadog.Profiler.Native.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props" Condition="Exists('..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" />
+  <Import Project="..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props" Condition="Exists('..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -408,6 +408,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/LibddprofExporter.cpp b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/LibddprofExporter.cpp
index 135be88d4628..9e0fa6f918ab 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/LibddprofExporter.cpp
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/LibddprofExporter.cpp
@@ -802,7 +802,7 @@ ddog_prof_Exporter_Request* LibddprofExporter::CreateRequest(SerializedProfile c
         files.len = 2;
     }
 
-    auto result = ddog_prof_Exporter_Request_build(exporter, start, end, files, additionalTags.GetFfiTags(), endpointsStats, RequestTimeOutMs);
+    auto result = ddog_prof_Exporter_Request_build(exporter, start, end, files, additionalTags.GetFfiTags(), endpointsStats, nullptr, RequestTimeOutMs);
     if (result.tag == DDOG_PROF_EXPORTER_REQUEST_BUILD_RESULT_ERR)
     {
         auto errorMessage = ddog_Error_message(&result.err);
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/packages.config b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/packages.config
index bdc4fc1b0c86..149080370cbd 100644
--- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/packages.config
+++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="libdatadog" version="2.2.0" targetFramework="native" />
+  <package id="libdatadog" version="3.0.0" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/profiler/test/Datadog.Profiler.Native.Tests/Datadog.Profiler.Native.Tests.vcxproj b/profiler/test/Datadog.Profiler.Native.Tests/Datadog.Profiler.Native.Tests.vcxproj
index 9e54bf4170b3..baaaa90e0b12 100644
--- a/profiler/test/Datadog.Profiler.Native.Tests/Datadog.Profiler.Native.Tests.vcxproj
+++ b/profiler/test/Datadog.Profiler.Native.Tests/Datadog.Profiler.Native.Tests.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props" Condition="Exists('..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" />
+  <Import Project="..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props" Condition="Exists('..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -184,6 +184,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(PackagesDir)\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
     <Error Condition="!Exists('..\..\..\packages\gmock.1.11.0\build\native\gmock.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\gmock.1.11.0\build\native\gmock.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\libdatadog.2.2.0\build\native\libdatadog.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\libdatadog.3.0.0\build\native\libdatadog.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/profiler/test/Datadog.Profiler.Native.Tests/packages.config b/profiler/test/Datadog.Profiler.Native.Tests/packages.config
index 29917ac77c76..aded5eab705b 100644
--- a/profiler/test/Datadog.Profiler.Native.Tests/packages.config
+++ b/profiler/test/Datadog.Profiler.Native.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gmock" version="1.11.0" targetFramework="native" />
-  <package id="libdatadog" version="2.2.0" targetFramework="native" />
+  <package id="libdatadog" version="3.0.0" targetFramework="native" />
   <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.7" targetFramework="native" />
 </packages>
\ No newline at end of file