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

--------- Co-authored-by: Bryan Huhta <[email protected]>
grafana · Nov 9, 2023 · 0471ec1 · 0471ec1
1 parent a6714ed
commit 0471ec1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
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
+2 −2		.github/workflows/test.yaml
+53 −36		CMakeLists.txt
+44 −7		README.md
+8 −1		example/Makefile
+1 −1		example/ssesvr.cc
+1,362 −488		httplib.h
+17 −8		httplibConfig.cmake.in
+7 −0		meson.build
+1 −0		meson_options.txt
+104 −0		test/CMakeLists.txt
+7 −0		test/Makefile
+ −		test/fuzzing/corpus/clusterfuzz-testcase-minimized-server_fuzzer-5042094968537088
+5 −2		test/fuzzing/server_fuzzer.cc
+1 −1		test/fuzzing/standalone_fuzz_target_runner.cpp
+8 −1		test/meson.build
+1,664 −398		test/test.cc
+1 −1		test/test_proxy.cc
+8,192 −0		test/www/dir/1MB.txt