Split the tracer parts off from ext directory

.claude/ci/compile-artifacts.md

@@ -191,10 +191,10 @@ prepare code          cache cargo deps: [{arch}, {triplet}]
   `GIT_STRATEGY: none` variable means the runner does not clone the repo -- instead the
   job script manually clones via `git clone` + `git checkout`.
 
-- `ddtrace.sym` (repo root) is the export list for the final `ddtrace.so`. All symbols
+- `datadog.sym` (repo root) is the export list for the final `ddtrace.so`. All symbols
   not listed are hidden via `--retain-symbols-file` + `-fvisibility=hidden`. If you add
   a new function that must be callable from appsec, profiler, or the SSI loader, add it
-  to `ddtrace.sym` or the linker will drop it.
+  to `datadog.sym` or the linker will drop it.
 
 - `CARGO_TARGET_DIR` must not be set explicitly for `compile_rust.sh`. The default
   (`target`) is resolved relative to the workspace root by Cargo. An explicit value

.gitignore

@@ -1,5 +1,5 @@
 **/vendor
-!/ext/vendor
+!/tracer/vendor
 tmp/
 composer.lock*
 **/core*

.gitlab/compile_extension.sh

@@ -25,5 +25,5 @@ make -j static &
 wait
 
 # Link extension
-sed -i 's/-export-symbols .*\/ddtrace\.sym/-Wl,--retain-symbols-file=ddtrace.sym/g' ${EXTENSION_DIR}/ddtrace.ldflags
+sed -i 's/-export-symbols .*\/datadog\.sym/-Wl,--retain-symbols-file=datadog.sym/g' ${EXTENSION_DIR}/ddtrace.ldflags
 cc -shared -Wl,-whole-archive ${MODULES_DIR}/ddtrace.a -Wl,-no-whole-archive $(cat ${EXTENSION_DIR}/ddtrace.ldflags) ${CARGO_TARGET_DIR}/debug/libddtrace_php.a -Wl,-soname -Wl,ddtrace.so -o ${MODULES_DIR}/ddtrace.so

.gitlab/link-tracing-extension.sh

@@ -3,7 +3,7 @@ set -e -o pipefail
 
 suffix="${1:-}"
 
-sed -i 's/-export-symbols .*\/ddtrace\.sym/-Wl,--retain-symbols-file=ddtrace.sym/g' "ddtrace_$(uname -m)${suffix}.ldflags"
+sed -i 's/-export-symbols .*\/datadog\.sym/-Wl,--retain-symbols-file=datadog.sym/g' "ddtrace_$(uname -m)${suffix}.ldflags"
 pids=()
 for archive in extensions_$(uname -m)/*.a; do
   (

Makefile

@@ -46,7 +46,7 @@ RUN_TESTS_IS_PARALLEL ?= $(shell test $(PHP_MAJOR_MINOR) -ge 74 && echo 1)
 # shuffle parallel tests to evenly distribute test load, avoiding a batch of 32 tests being request-replayer tests
 RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJECT_ROOT) USE_TRACKED_ALLOC=1 php -n -d 'memory_limit=-1' $(BUILD_DIR)/run-tests.php $(if $(QUIET_TESTS),,-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP) $(if $(ASAN), --asan) --show-diff -n -p $(shell which php) -q $(if $(RUN_TESTS_IS_PARALLEL), --shuffle -j$(MAX_TEST_PARALLELISM))
 
-C_FILES = $(shell find components components-rs ext src/dogstatsd zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
+C_FILES = $(shell find components components-rs ext src/dogstatsd tracer zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{build-common,datadog-ffe,datadog-ipc,datadog-ipc-macros,datadog-live-debugger,datadog-live-debugger-ffi,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,libdd-alloc,libdd-capabilities,libdd-capabilities-impl,libdd-common,libdd-common-ffi,libdd-crashtracker,libdd-crashtracker-ffi,libdd-data-pipeline,libdd-ddsketch,libdd-dogstatsd-client,libdd-library-config,libdd-library-config-ffi,libdd-log,libdd-shared-runtime,libdd-telemetry,libdd-telemetry-ffi,libdd-tinybytes,libdd-trace-*,spawn_worker,tools/{cc_utils,sidecar_mockgen},libdd-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
 ALL_OBJECT_FILES = $(C_FILES) $(RUST_FILES) $(BUILD_DIR)/Makefile
@@ -106,7 +106,7 @@ JUNIT_RESULTS_DIR := $(shell pwd)
 
 all: $(BUILD_DIR)/configure $(SO_FILE)
 
-$(BUILD_DIR)/configure: $(M4_FILES) $(BUILD_DIR)/ddtrace.sym $(BUILD_DIR)/VERSION
+$(BUILD_DIR)/configure: $(M4_FILES) $(BUILD_DIR)/datadog.sym $(BUILD_DIR)/VERSION
 	$(Q) (cd $(BUILD_DIR); phpize && $(SED_I) 's/\/FAILED/\/\\bFAILED/' $(BUILD_DIR)/run-tests.php) # Fix PHP 5.4 exit code bug when running selected tests (FAILED vs XFAILED)
 
 $(BUILD_DIR)/run-tests.php: $(if $(ASSUME_COMPILED),, $(BUILD_DIR)/configure)

appsec/cmake/ddtrace.cmake

@@ -26,17 +26,17 @@ add_custom_target(libdatadog_stamp
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 set(EXPORTS_FILE "${CMAKE_BINARY_DIR}/ddtrace_exports.version")
 add_custom_target(ddtrace_exports
-    COMMAND bash -c "{ echo -e '{\\nglobal:'; sed 's/$/;/' '${CMAKE_SOURCE_DIR}'/../ddtrace.sym; echo -e 'local:\\n*;\\n};'; } > '${EXPORTS_FILE}'"
+    COMMAND bash -c "{ echo -e '{\\nglobal:'; sed 's/$/;/' '${CMAKE_SOURCE_DIR}'/../datadog.sym; echo -e 'local:\\n*;\\n};'; } > '${EXPORTS_FILE}'"
     BYPRODUCT ${EXPORTS_FILE}
-    DEPENDS ${CMAKE_SOURCE_DIR}/../ddtrace.sym
+    DEPENDS ${CMAKE_SOURCE_DIR}/../datadog.sym
     VERBATIM
 )
 elseif(APPLE)
-set(EXPORTS_FILE "${CMAKE_BINARY_DIR}/ddtrace_exports.sym")
+set(EXPORTS_FILE "${CMAKE_BINARY_DIR}/datadog_exports.sym")
 add_custom_target(ddtrace_exports
-    COMMAND sed "s/^/_/" "${CMAKE_SOURCE_DIR}/../ddtrace.sym" > "${EXPORTS_FILE}"
+    COMMAND sed "s/^/_/" "${CMAKE_SOURCE_DIR}/../datadog.sym" > "${EXPORTS_FILE}"
     BYPRODUCT ${EXPORTS_FILE}
-    DEPENDS ${CMAKE_SOURCE_DIR}/../ddtrace.sym
+    DEPENDS ${CMAKE_SOURCE_DIR}/../datadog.sym
 )
 endif()
 
@@ -98,7 +98,6 @@ file(GLOB_RECURSE FILES_DDTRACE
 
 list(APPEND FILES_DDTRACE
     "${CMAKE_SOURCE_DIR}/../src/dogstatsd/client.c"
-    "${CMAKE_SOURCE_DIR}/../components/container_id/container_id.c"
     "${CMAKE_SOURCE_DIR}/../components/log/log.c"
     "${CMAKE_SOURCE_DIR}/../components/sapi/sapi.c"
     "${CMAKE_SOURCE_DIR}/../components/string_view/string_view.c"

appsec/src/extension/ddtrace.c

@@ -17,9 +17,9 @@
 #include "string_helpers.h"
 #include <Zend/zend_extensions.h>
 
-void (*nullable ddtrace_metric_register_buffer)(
+void (*nullable datadog_metric_register_buffer)(
     zend_string *nonnull name, ddtrace_metric_type type, ddtrace_metric_ns ns);
-bool (*nullable ddtrace_metric_add_point)(
+bool (*nullable datadog_metric_add_point)(
     zend_string *nonnull name, double value, zend_string *nonnull tags);
 
 static int (*_orig_ddtrace_shutdown)(SHUTDOWN_FUNC_ARGS);
@@ -32,16 +32,16 @@ static zend_string *_meta_propname;
 static zend_string *_metrics_propname;
 static zend_string *_meta_struct_propname;
 static THREAD_LOCAL_ON_ZTS bool _suppress_ddtrace_rshutdown;
-static uint8_t *_ddtrace_runtime_id;
+static uint8_t *_datadog_runtime_id;
 static THREAD_LOCAL_ON_ZTS bool _asm_event_emitted;
 
 static void _setup_testing_telemetry_functions(void);
 static zend_module_entry *_find_ddtrace_module(void);
 static int _ddtrace_rshutdown_testing(SHUTDOWN_FUNC_ARGS);
 static void _register_testing_objects(void);
 
-static const uint8_t *(*nullable _ddtrace_get_formatted_session_id)(void);
-static uint64_t (*nullable _ddtrace_get_sidecar_queue_id)(void);
+static const uint8_t *(*nullable _datadog_get_formatted_session_id)(void);
+static uint64_t (*nullable _datadog_get_sidecar_queue_id)(void);
 static zend_object *(*nullable _ddtrace_get_root_span)(void);
 static void (*nullable _ddtrace_close_all_spans_and_flush)(void);
 static void (*nullable _ddtrace_set_priority_sampling_on_span_zobj)(
@@ -57,14 +57,14 @@ static bool (*nullable _ddtrace_user_req_add_listeners)(
 
 static zend_string *(*_ddtrace_ip_extraction_find)(zval *server);
 
-static struct telemetry_rc_info (*_ddtrace_get_telemetry_rc_info)(void);
+static struct telemetry_rc_info (*_datadog_get_telemetry_rc_info)(void);
 static void *(*nullable _ddtrace_emit_asm_event)(void);
 static zend_string *(*nullable _ddtrace_guess_endpoint_from_url)(
     const char *nonnull url, size_t url_len);
 
-static void _test_ddtrace_metric_register_buffer(
+static void _test_datadog_metric_register_buffer(
     zend_string *nonnull name, ddtrace_metric_type type, ddtrace_metric_ns ns);
-static bool _test_ddtrace_metric_add_point(
+static bool _test_datadog_metric_add_point(
     zend_string *nonnull name, double value, zend_string *nonnull tags);
 
 static void dd_trace_load_symbols(zend_module_entry *module)
@@ -89,10 +89,10 @@ static void dd_trace_load_symbols(zend_module_entry *module)
     ASSIGN_DLSYM(_ddtrace_close_all_spans_and_flush,
         "ddtrace_close_all_spans_and_flush");
     ASSIGN_DLSYM(_ddtrace_get_root_span, "ddtrace_get_root_span");
-    ASSIGN_DLSYM(_ddtrace_runtime_id, "ddtrace_runtime_id");
+    ASSIGN_DLSYM(_datadog_runtime_id, "datadog_runtime_id");
     ASSIGN_DLSYM(
-        _ddtrace_get_formatted_session_id, "ddtrace_get_formatted_session_id");
-    ASSIGN_DLSYM(_ddtrace_get_sidecar_queue_id, "ddtrace_get_sidecar_queue_id");
+        _datadog_get_formatted_session_id, "datadog_get_formatted_session_id");
+    ASSIGN_DLSYM(_datadog_get_sidecar_queue_id, "datadog_get_sidecar_queue_id");
     ASSIGN_DLSYM(_ddtrace_set_priority_sampling_on_span_zobj,
         "ddtrace_set_priority_sampling_on_span_zobj");
     ASSIGN_DLSYM(_ddtrace_get_priority_sampling_on_span_zobj,
@@ -103,10 +103,10 @@ static void dd_trace_load_symbols(zend_module_entry *module)
         _ddtrace_user_req_add_listeners, "ddtrace_user_req_add_listeners");
     ASSIGN_DLSYM(_ddtrace_ip_extraction_find, "ddtrace_ip_extraction_find");
     ASSIGN_DLSYM(
-        _ddtrace_get_telemetry_rc_info, "ddtrace_get_telemetry_rc_info");
+        _datadog_get_telemetry_rc_info, "datadog_get_telemetry_rc_info");
     ASSIGN_DLSYM(
-        ddtrace_metric_register_buffer, "ddtrace_metric_register_buffer");
-    ASSIGN_DLSYM(ddtrace_metric_add_point, "ddtrace_metric_add_point");
+        datadog_metric_register_buffer, "datadog_metric_register_buffer");
+    ASSIGN_DLSYM(datadog_metric_add_point, "datadog_metric_add_point");
     ASSIGN_DLSYM(_ddtrace_emit_asm_event, "ddtrace_emit_asm_event");
     ASSIGN_DLSYM(
         _ddtrace_guess_endpoint_from_url, "ddtrace_guess_endpoint_from_url");
@@ -150,11 +150,11 @@ void dd_trace_rinit(void) { _asm_event_emitted = false; }
 
 static void _setup_testing_telemetry_functions(void)
 {
-    if (ddtrace_metric_register_buffer == NULL) {
-        ddtrace_metric_register_buffer = _test_ddtrace_metric_register_buffer;
+    if (datadog_metric_register_buffer == NULL) {
+        datadog_metric_register_buffer = _test_datadog_metric_register_buffer;
     }
-    if (ddtrace_metric_add_point == NULL) {
-        ddtrace_metric_add_point = _test_ddtrace_metric_add_point;
+    if (datadog_metric_add_point == NULL) {
+        datadog_metric_add_point = _test_datadog_metric_add_point;
     }
 }
 
@@ -323,21 +323,21 @@ zval *nullable dd_trace_span_get_meta_struct(zend_object *nonnull zobj)
 // NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
 zend_string *nullable dd_trace_get_formatted_runtime_id(bool persistent)
 {
-    if (_ddtrace_runtime_id == NULL) {
+    if (_datadog_runtime_id == NULL) {
         return NULL;
     }
 
     zend_string *encoded_id = zend_string_alloc(36, persistent);
 
     size_t length = sprintf(ZSTR_VAL(encoded_id),
         "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-        _ddtrace_runtime_id[0], _ddtrace_runtime_id[1], _ddtrace_runtime_id[2],
-        _ddtrace_runtime_id[3], _ddtrace_runtime_id[4], _ddtrace_runtime_id[5],
-        _ddtrace_runtime_id[6], _ddtrace_runtime_id[7], _ddtrace_runtime_id[8],
-        _ddtrace_runtime_id[9], _ddtrace_runtime_id[10],
-        _ddtrace_runtime_id[11], _ddtrace_runtime_id[12],
-        _ddtrace_runtime_id[13], _ddtrace_runtime_id[14],
-        _ddtrace_runtime_id[15]);
+        _datadog_runtime_id[0], _datadog_runtime_id[1], _datadog_runtime_id[2],
+        _datadog_runtime_id[3], _datadog_runtime_id[4], _datadog_runtime_id[5],
+        _datadog_runtime_id[6], _datadog_runtime_id[7], _datadog_runtime_id[8],
+        _datadog_runtime_id[9], _datadog_runtime_id[10],
+        _datadog_runtime_id[11], _datadog_runtime_id[12],
+        _datadog_runtime_id[13], _datadog_runtime_id[14],
+        _datadog_runtime_id[15]);
 
     if (length != 36) {
         zend_string_free(encoded_id);
@@ -350,18 +350,18 @@ zend_string *nullable dd_trace_get_formatted_runtime_id(bool persistent)
 
 const uint8_t *nullable dd_trace_get_formatted_session_id(void)
 {
-    if (_ddtrace_get_formatted_session_id == NULL) {
+    if (_datadog_get_formatted_session_id == NULL) {
         return NULL;
     }
-    return _ddtrace_get_formatted_session_id();
+    return _datadog_get_formatted_session_id();
 }
 
 uint64_t dd_trace_get_sidecar_queue_id(void)
 {
-    if (_ddtrace_get_sidecar_queue_id == NULL) {
+    if (_datadog_get_sidecar_queue_id == NULL) {
         return 0;
     }
-    return _ddtrace_get_sidecar_queue_id();
+    return _datadog_get_sidecar_queue_id();
 }
 
 void dd_trace_set_priority_sampling_on_span_zobj(zend_object *nonnull root_span,
@@ -413,10 +413,10 @@ zend_string *nullable dd_ip_extraction_find(zval *nonnull server)
 
 struct telemetry_rc_info dd_trace_get_telemetry_rc_info(void)
 {
-    if (!_ddtrace_get_telemetry_rc_info) {
+    if (!_datadog_get_telemetry_rc_info) {
         return (struct telemetry_rc_info){0};
     }
-    __auto_type tel_rc_info = _ddtrace_get_telemetry_rc_info();
+    __auto_type tel_rc_info = _datadog_get_telemetry_rc_info();
 
     mlog(dd_log_trace,
         "Remote config path: %s, service name: %.*s, env name: %.*s",
@@ -601,19 +601,19 @@ static const zend_function_entry functions[] = {
 
 static void _register_testing_objects(void) { dd_phpobj_reg_funcs(functions); }
 
-static void _test_ddtrace_metric_register_buffer(
+static void _test_datadog_metric_register_buffer(
     zend_string *nonnull name, ddtrace_metric_type type, ddtrace_metric_ns ns)
 {
     php_error_docref(NULL, E_NOTICE,
-        "Would call ddtrace_metric_register_buffer with name=%.*s "
+        "Would call datadog_metric_register_buffer with name=%.*s "
         "type=%d ns=%d",
         (int)ZSTR_LEN(name), ZSTR_VAL(name), type, ns);
 }
-static bool _test_ddtrace_metric_add_point(
+static bool _test_datadog_metric_add_point(
     zend_string *nonnull name, double value, zend_string *nonnull tags)
 {
     php_error_docref(NULL, E_NOTICE,
-        "Would call to ddtrace_metric_add_point with name=%.*s value=%f "
+        "Would call to datadog_metric_add_point with name=%.*s value=%f "
         "tags=%.*s",
         (int)ZSTR_LEN(name), ZSTR_VAL(name), value, (int)ZSTR_LEN(tags),
         ZSTR_VAL(tags));

appsec/src/extension/ddtrace.h

@@ -121,7 +121,7 @@ typedef enum {
     DDTRACE_METRIC_NAMESPACE_SIDECAR,
 } ddtrace_metric_ns;
 
-extern void (*nullable ddtrace_metric_register_buffer)(
+extern void (*nullable datadog_metric_register_buffer)(
     zend_string *nonnull name, ddtrace_metric_type type, ddtrace_metric_ns ns);
-extern bool (*nullable ddtrace_metric_add_point)(zend_string *nonnull name,
+extern bool (*nullable datadog_metric_add_point)(zend_string *nonnull name,
     double value, zend_string *nonnull tags);

appsec/src/extension/telemetry.c

@@ -74,9 +74,9 @@ void dd_telemetry_note_helper_string_meta(const char *nonnull key,
 void dd_telemetry_add_metric(zend_string *nonnull name_zstr, double value,
     zend_string *nonnull tags_zstr, ddtrace_metric_type type)
 {
-    ddtrace_metric_register_buffer(
+    datadog_metric_register_buffer(
         name_zstr, type, DDTRACE_METRIC_NAMESPACE_APPSEC);
-    ddtrace_metric_add_point(name_zstr, value, tags_zstr);
+    datadog_metric_add_point(name_zstr, value, tags_zstr);
     mlog_g(dd_log_debug,
         "Telemetry metric %.*s added with tags %.*s and value %f",
         (int)ZSTR_LEN(name_zstr), ZSTR_VAL(name_zstr), (int)ZSTR_LEN(tags_zstr),
@@ -162,8 +162,8 @@ void dd_telemetry_helper_conn_close(void)
 // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
 void dd_telemetry_submit_duration_ext(double waf_ext_us, double rasp_ext_us)
 {
-    if (!dd_trace_loaded() || ddtrace_metric_register_buffer == NULL ||
-        ddtrace_metric_add_point == NULL) {
+    if (!dd_trace_loaded() || datadog_metric_register_buffer == NULL ||
+        datadog_metric_add_point == NULL) {
         return;
     }
 
@@ -173,16 +173,16 @@ void dd_telemetry_submit_duration_ext(double waf_ext_us, double rasp_ext_us)
     }
 
     if (waf_ext_us > 0.0) {
-        ddtrace_metric_register_buffer(_waf_duration_ext_tel_zstr,
+        datadog_metric_register_buffer(_waf_duration_ext_tel_zstr,
             DDTRACE_METRIC_TYPE_DISTRIBUTION, DDTRACE_METRIC_NAMESPACE_APPSEC);
-        ddtrace_metric_add_point(
+        datadog_metric_add_point(
             _waf_duration_ext_tel_zstr, waf_ext_us, tags_zstr);
     }
 
     if (rasp_ext_us > 0.0) {
-        ddtrace_metric_register_buffer(_rasp_duration_ext_tel_zstr,
+        datadog_metric_register_buffer(_rasp_duration_ext_tel_zstr,
             DDTRACE_METRIC_TYPE_DISTRIBUTION, DDTRACE_METRIC_NAMESPACE_APPSEC);
-        ddtrace_metric_add_point(
+        datadog_metric_add_point(
             _rasp_duration_ext_tel_zstr, rasp_ext_us, tags_zstr);
     }
 

appsec/tests/integration/build.gradle

@@ -345,7 +345,7 @@ def buildTracerTask = { String version, String variant, altBaseTag = null ->
                             '../../../ext',
                             '../../../zend_abstract_interface',
                             '../../../libdatadog',
-                            '../../../ddtrace.sym',
+                            '../../../datadog.sym',
                     ],
             ],
             outputs: [
@@ -378,7 +378,7 @@ def buildTracerCmakeTask = { String version, String variant, altBaseTag = null -
                             '../../../zend_abstract_interface',
                             '../../../components-rs',
                             '../../../libdatadog',
-                            '../../../ddtrace.sym',
+                            '../../../datadog.sym',
                             '../../cmake',
                     ],
                     files: ['../../CMakeLists.txt', '../../cmake/ddtrace.cmake'],
@@ -427,7 +427,7 @@ def buildTracerSsiTask = { String version, String variant ->
                             '../../../zend_abstract_interface',
                             '../../../components-rs',
                             '../../../libdatadog',
-                            '../../../ddtrace.sym',
+                            '../../../datadog.sym',
                     ],
             ],
             outputs: [
@@ -474,7 +474,7 @@ def buildTracerSsiCmakeTask = { String version, String variant ->
                             '../../../zend_abstract_interface',
                             '../../../components-rs',
                             '../../../libdatadog',
-                            '../../../ddtrace.sym',
+                            '../../../datadog.sym',
                             '../../cmake',
                     ],
                     files: ['../../CMakeLists.txt', '../../cmake/ddtrace.cmake'],