Fix build

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Author: bwoebi

Makefile

@@ -48,7 +48,7 @@ RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJ
 
 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 }' )
 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-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-libunwind-sys,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")
+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-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-libunwind-sys,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 "*/libunwind*" -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
 TEST_OPCACHE_FILES = $(shell find tests/opcache -name '*.php*' -o -name '.gitkeep' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_STUB_FILES = $(shell find tests/ext -type d -name 'stubs' -exec find '{}' -type f \; | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
@@ -500,7 +500,9 @@ $(PACKAGES_BUILD_DIR)/datadog-setup.php: $(PACKAGES_BUILD_DIR)
 		$(PACKAGES_BUILD_DIR)
 
 build_pecl_package:
-	echo $(subst $(BUILD_DIR)/,,$(C_FILES) $(RUST_FILES) $(TEST_FILES) $(TEST_STUB_FILES) $(M4_FILES) Cargo.lock) | tooling/bin/pecl-build
+	$(file >.pecl-files,$(subst $(BUILD_DIR)/,,$(C_FILES) $(RUST_FILES) $(TEST_FILES) $(TEST_STUB_FILES) $(M4_FILES) Cargo.lock))
+	tooling/bin/pecl-build < .pecl-files
+	@rm -f .pecl-files
 
 dbgsym.tar.gz: $(PACKAGES_BUILD_DIR)
 	$(if $(DDTRACE_MAKE_PACKAGES_ASAN), , tar -zcf $(PACKAGES_BUILD_DIR)/dd-library-php-$(VERSION)_windows_debugsymbols.tar.gz ./extensions_x86_64_debugsymbols --owner=0 --group=0)

cbindgen.toml

@@ -23,6 +23,7 @@ rename_types = "PascalCase"
 "PushTagResult" = "ddog_Vec_Tag_PushResult"
 "ZendString" = "_zend_string"
 "FILE" = "FILE"
+"EndpointConfig" = "ddog_crasht_EndpointConfig"
 
 [enum]
 prefix_with_name = true

components-rs/common.h

@@ -39,6 +39,12 @@
 #  define DDOG_CHECK_RETURN
 #endif
 
+#ifdef _WIN32
+#define LIBDD_DLLIMPORT __declspec(dllimport)
+#else
+#define LIBDD_DLLIMPORT
+#endif
+
 /**
  * Default value for the timeout field in milliseconds.
  */
@@ -1283,6 +1289,14 @@ typedef struct ddog_crasht_Slice_CharSlice {
   uintptr_t len;
 } ddog_crasht_Slice_CharSlice;
 
+typedef struct ddog_crasht_EndpointConfig {
+  ddog_CharSlice url;
+  ddog_CharSlice api_key;
+  ddog_CharSlice test_token;
+  uint64_t timeout;
+  bool use_system_resolver;
+} ddog_crasht_EndpointConfig;
+
 typedef struct ddog_crasht_Slice_I32 {
   /**
    * Should be non-null and suitably aligned for the underlying type. It is
@@ -1305,7 +1319,7 @@ typedef struct ddog_crasht_Config {
    * The endpoint to send the crash report to (can be a file://).
    * If None, the crashtracker will infer the agent host from env variables.
    */
-  ddog_CharSlice endpoint;
+  struct ddog_crasht_EndpointConfig endpoint;
   /**
    * Optional filename for a unix domain socket if the receiver is used asynchonously
    */

components-rs/ddtrace.h

@@ -39,6 +39,10 @@ void ddtrace_drop_rust_string(char *input, uintptr_t len);
 
 struct ddog_Endpoint *ddtrace_parse_agent_url(ddog_CharSlice url);
 
+void ddtrace_endpoint_as_crashtracker_config(const struct ddog_Endpoint *endpoint,
+                                             void (*callback)(ddog_crasht_EndpointConfig, void*),
+                                             void *userdata);
+
 ddog_Configurator *ddog_library_configurator_new_dummy(bool debug_logs, ddog_CharSlice language);
 
 int posix_spawn_file_actions_addchdir_np(void *file_actions, const char *path);

components-rs/lib.rs

@@ -101,6 +101,28 @@ pub unsafe extern "C" fn ddtrace_parse_agent_url(
         })
 }
 
+#[no_mangle]
+#[cfg(unix)]
+pub unsafe extern "C" fn ddtrace_endpoint_as_crashtracker_config(
+    endpoint: &Endpoint,
+    callback: unsafe extern "C" fn(EndpointConfig<'_>, *mut std::ffi::c_void),
+    userdata: *mut std::ffi::c_void,
+) {
+    let url_str = endpoint.url.to_string();
+    unsafe {
+        callback(
+            EndpointConfig {
+                url: CharSlice::from(url_str.as_str()),
+                api_key: CharSlice::from(endpoint.api_key.as_deref().unwrap_or("")),
+                test_token: CharSlice::from(endpoint.test_token.as_deref().unwrap_or("")),
+                timeout: endpoint.timeout_ms,
+                use_system_resolver: endpoint.use_system_resolver,
+            },
+            userdata,
+        );
+    }
+}
+
 // Hack: Without this, the PECL build of the tracer does not contain the ddog_library_* functions
 // It works well without in the "normal" build
 #[no_mangle]

components-rs/sidecar.rs

@@ -4,8 +4,6 @@ use std::ops::DerefMut;
 use std::os::unix::ffi::OsStrExt;
 use lazy_static::{lazy_static, LazyStatic};
 use tracing::warn;
-#[cfg(windows)]
-use std::os::windows::ffi::OsStrExt;
 use std::sync::Mutex;
 use std::time::Duration;
 use datadog_sidecar::config::{self, AppSecConfig, LogMethod};

components-rs/telemetry.rs

@@ -5,7 +5,7 @@ use hashbrown::{Equivalent, HashMap};
 use std::collections::HashSet;
 use std::ffi::CString;
 use std::path::PathBuf;
-use std::time::{Duration, Instant, SystemTime};
+use std::time::{Duration, SystemTime};
 
 use datadog_ipc::platform::NamedShmHandle;
 use datadog_sidecar::one_way_shared_memory::{open_named_shm, OneWayShmReader};

ext/signals.c

@@ -242,6 +242,20 @@ static void dd_crasht_add_opcache_inis(ddog_Vec_Tag *tags) {
 #endif
 }
 
+typedef struct {
+    ddog_crasht_Config config;
+    ddog_crasht_Metadata metadata;
+} dd_crasht_init_args;
+
+static void dd_crasht_do_init(ddog_crasht_EndpointConfig endpoint_config, void *userdata) {
+    dd_crasht_init_args *args = (dd_crasht_init_args *)userdata;
+    args->config.endpoint = endpoint_config;
+    dd_crashtracker_check_result(
+            ddog_crasht_init_without_receiver(args->config, args->metadata),
+            "Cannot initialize CrashTracker"
+    );
+}
+
 static void dd_init_crashtracker() {
     ddog_CharSlice socket_path = ddog_sidecar_get_crashtracker_unix_socket_path();
     if (socket_path.len > sizeof(crashtracker_socket_path) - 1) {
@@ -256,32 +270,24 @@ static void dd_init_crashtracker() {
     free((void *) socket_path.ptr);
     socket_path.ptr = crashtracker_socket_path;
 
-    char *agent_url = ddtrace_agent_url();
-    if (!agent_url) {
+    if (!ddtrace_endpoint) {
         return;
     }
 
-    ddog_crasht_Config config = {
-        .endpoint = {.ptr = agent_url, .len = strlen(agent_url)},
-        .timeout_ms = 5000,
-        .resolve_frames = DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_INPROCESS_SYMBOLS,
-        .optional_unix_socket_filename = socket_path,
-        .additional_files = {0},
-    };
-
     ddog_Vec_Tag tags = ddog_Vec_Tag_new();
     dd_crasht_add_opcache_inis(&tags);
 
-    const ddog_crasht_Metadata metadata = ddtrace_setup_crashtracking_metadata(&tags);
+    dd_crasht_init_args args = {
+        .config = {
+            .timeout_ms = 5000,
+            .resolve_frames = DDOG_CRASHT_STACKTRACE_COLLECTION_ENABLED_WITH_INPROCESS_SYMBOLS,
+            .optional_unix_socket_filename = socket_path,
+            .additional_files = {0},
+        },
+        .metadata = ddtrace_setup_crashtracking_metadata(&tags),
+    };
 
-    dd_crashtracker_check_result(
-            ddog_crasht_init_without_receiver(
-                    config,
-                    metadata
-            ),
-            "Cannot initialize CrashTracker"
-    );
-    free(agent_url);
+    ddtrace_endpoint_as_crashtracker_config(ddtrace_endpoint, dd_crasht_do_init, &args);
 
     ddtrace_register_crashtracking_frames_collection();