wip 5/x

Author: dmehala

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Configure
-        run: bin/with-toolchain llvm cmake . -B .build -DCMAKE_BUILD_TYPE=Debug -DDD_TRACE_BUILD_FUZZERS=1 -DDD_TRACE_ENABLE_SANITIZE=1
+        run: bin/with-toolchain llvm cmake . -B .build -DCMAKE_BUILD_TYPE=Debug -DDD_TRACE_BUILD_FUZZERS=1 -DDD_TRACE_ENABLE_SANITIZE=1 -DDD_TRACE_TRANSPORT=none
       - name: Build
         run: cmake --build .build -j --target dd_trace_cpp-fuzzers
       - name: Run W3C propagation fuzzer

CMakeLists.txt

@@ -198,12 +198,9 @@ if (BUILD_SHARED_LIBS)
     )
   endif ()
 
-  add_dependencies(dd_trace_cpp-shared dd_trace_cpp-objects CURL::libcurl_shared)
-
   target_link_libraries(dd_trace_cpp-shared
     PUBLIC
       dd_trace::obj
-      CURL::libcurl_shared
     PRIVATE
       dd_trace::specs
   )
@@ -221,6 +218,8 @@ if (BUILD_STATIC_LIBS)
   add_library(dd_trace_cpp-static STATIC $<TARGET_OBJECTS:dd_trace_cpp-objects>)
   add_library(dd_trace::static ALIAS dd_trace_cpp-static)
 
+  add_dependencies(dd_trace_cpp-static dd_trace_cpp-objects)
+
   if (DD_TRACE_TRANSPORT STREQUAL "curl")
     add_dependencies(dd_trace_cpp-static CURL::libcurl_static)
 
@@ -241,8 +240,6 @@ if (BUILD_STATIC_LIBS)
     ) 
   endif ()
 
-  add_dependencies(dd_trace_cpp-static dd_trace_cpp-objects)
-
   target_link_libraries(dd_trace_cpp-static 
     PUBLIC
       dd_trace::obj

CMakePresets.json

@@ -28,7 +28,8 @@
         "DD_TRACE_ENABLE_SANITIZE": "OFF",
         "DD_TRACE_BUILD_TESTING": "ON",
         "DD_TRACE_BUILD_EXAMPLES": "ON",
-        "DD_TRACE_BUILD_FUZZERS": "OFF"
+        "DD_TRACE_BUILD_FUZZERS": "OFF",
+        "DD_TRACE_TRANSPORT": "none"
       }
     }
   ]

fuzz/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(base64)
 add_subdirectory(tracing)
 add_subdirectory(w3c-propagation)
+add_subdirectory(remote-configuration)
 

test/CMakeLists.txt

@@ -24,7 +24,6 @@ add_executable(tests
     test_baggage.cpp
     test_base64.cpp
     test_cerr_logger.cpp
-    test_curl.cpp
     test_config_manager.cpp
     test_datadog_agent.cpp
     test_glob.cpp
@@ -62,10 +61,17 @@ target_compile_definitions(tests
 
 target_link_libraries(tests 
   PRIVATE
-    # TODO: Remove dependency on libcurl
-    CURL::libcurl_static
     dd_trace_cpp-static
     dd_trace::specs
 )
 
+if(DD_TRACE_TRANSPORT STREQUAL "curl")
+  target_sources(tests PRIVATE test_curl.cpp)
+  target_link_libraries(tests 
+    PRIVATE
+      # TODO: Remove dependency on libcurl
+      CURL::libcurl_static
+  )
+endif()
+
 add_subdirectory(system-tests)