fix(httplib): bump httplib version to 14, use epoll (#47)

korniltsev · bryanhuhta · web-flow · commit 0471ec1f81f0 · 2023-11-09T09:49:06.000+07:00
---------

Co-authored-by: Bryan Huhta &lt;bryan.huhta@grafana.com&gt;
diff --git a/Pyroscope/Pyroscope/Pyroscope.csproj b/Pyroscope/Pyroscope/Pyroscope.csproj
@@ -5,9 +5,9 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>0.8.12</PackageVersion>
-        <AssemblyVersion>0.8.12</AssemblyVersion>
-        <FileVersion>0.8.12</FileVersion>
+        <PackageVersion>0.8.14</PackageVersion>
+        <AssemblyVersion>0.8.14</AssemblyVersion>
+        <FileVersion>0.8.14</FileVersion>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
 
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CMakeLists.txt
@@ -128,10 +128,9 @@ target_link_libraries(${PROFILER_STATIC_LIB_NAME}
     -ldl
 )
 
-
 target_include_directories(${PROFILER_STATIC_LIB_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/../../../../profiler/third_party/cpp-httplib)
 target_compile_options(${PROFILER_STATIC_LIB_NAME} PUBLIC -isystem${PROJECT_SOURCE_DIR}/../../../../profiler/third_party/boringssl/include)
-target_compile_definitions(${PROFILER_STATIC_LIB_NAME} PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT)
+target_compile_definitions(${PROFILER_STATIC_LIB_NAME} PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT -DCPPHTTPLIB_USE_POLL)
 
 add_dependencies(${PROFILER_STATIC_LIB_NAME} fmt-lib libdatadog-lib libunwind-lib coreclr spdlog-headers PPDB)
 
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/PyroscopePprofSink.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/PyroscopePprofSink.h
@@ -10,7 +10,7 @@
 #include "httplib.h"
 #include "url.hpp"
 
-#define PYROSCOPE_SPY_VERSION "0.8.12"
+#define PYROSCOPE_SPY_VERSION "0.8.14"
 
 class PyroscopePprofSink : public PProfExportSink
 {
diff --git a/profiler/third_party/cpp-httplib b/profiler/third_party/cpp-httplib
@@ -1 +1 @@
-Subproject commit 27cd4e6ffeca2c9978ec1df7de3d22b9303a71b4
+Subproject commit a609330e4c6374f741d3b369269f7848255e1954

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,9 @@ target_link_libraries(${PROFILER_STATIC_LIB_NAME}`
`128`	`128`	`-ldl`
`129`	`129`	`)`
`130`	`130`
`131`		`-`
`132`	`131`	`target_include_directories(${PROFILER_STATIC_LIB_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/../../../../profiler/third_party/cpp-httplib)`
`133`	`132`	`target_compile_options(${PROFILER_STATIC_LIB_NAME} PUBLIC -isystem${PROJECT_SOURCE_DIR}/../../../../profiler/third_party/boringssl/include)`
`134`		`-target_compile_definitions(${PROFILER_STATIC_LIB_NAME} PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT)`
	`133`	`+target_compile_definitions(${PROFILER_STATIC_LIB_NAME} PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT -DCPPHTTPLIB_USE_POLL)`
`135`	`134`
`136`	`135`	`add_dependencies(${PROFILER_STATIC_LIB_NAME} fmt-lib libdatadog-lib libunwind-lib coreclr spdlog-headers PPDB)`
`137`	`136`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#include "httplib.h"`
`11`	`11`	`#include "url.hpp"`
`12`	`12`
`13`		`-#define PYROSCOPE_SPY_VERSION "0.8.12"`
	`13`	`+#define PYROSCOPE_SPY_VERSION "0.8.14"`
`14`	`14`
`15`	`15`	`class PyroscopePprofSink : public PProfExportSink`
`16`	`16`	`{`