Fix cbindgen

bwoebi · bwoebi · commit b4360034cda1 · 2024-02-27T16:25:23.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cbindgen.toml b/cbindgen.toml
@@ -26,6 +26,3 @@ rename_variants = "ScreamingSnakeCase"
 [parse]
 parse_deps = true
 include = ["ddcommon", "ddtelemetry", "ddcommon-ffi", "ddtelemetry-ffi", "datadog-sidecar", "datadog-ipc", "uuid"]
-
-[parse.expand]
-crates = ["ddtrace-php"]
diff --git a/components-rs/Cargo.toml b/components-rs/Cargo.toml
@@ -9,9 +9,9 @@ path = "lib.rs"
 
 [dependencies]
 ddcommon = { path = "../libdatadog/ddcommon" }
-ddcommon-ffi = { path = "../libdatadog/ddcommon-ffi" }
+ddcommon-ffi = { path = "../libdatadog/ddcommon-ffi", default-features = false }
 ddtelemetry = { path = "../libdatadog/ddtelemetry" }
-ddtelemetry-ffi = { path = "../libdatadog/ddtelemetry-ffi" }
+ddtelemetry-ffi = { path = "../libdatadog/ddtelemetry-ffi", default-features = false }
 datadog-sidecar = { path = "../libdatadog/sidecar" }
 datadog-sidecar-ffi = { path = "../libdatadog/sidecar-ffi" }
 spawn_worker = { path = "../libdatadog/spawn_worker" }
@@ -33,4 +33,4 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
 ] }
 
 [build-dependencies]
-cbindgen = "0.24"
+cbindgen = "0.26"
diff --git a/components-rs/ddtrace.h b/components-rs/ddtrace.h
@@ -121,6 +121,8 @@ extern ddog_Uuid ddtrace_runtime_id;
 
 extern void (*ddog_log_callback)(ddog_CharSlice);
 
+extern const uint8_t *DDOG_PHP_FUNCTION;
+
 /**
  * # Safety
  * Must be called from a single-threaded context, such as MINIT.
diff --git a/ext/sidecar.c b/ext/sidecar.c
@@ -19,11 +19,6 @@ static void ddtrace_set_sidecar_globals(void) {
     ddtrace_sidecar_instance_id = ddog_sidecar_instanceId_build(session_id, runtime_id);
 }
 
-// Windows only defines do not appear in cbindgen
-#ifdef WIN32
-extern const uint8_t *DDOG_PHP_FUNCTION;
-#endif
-
 static bool dd_sidecar_connection_init(void) {
     if (get_global_DD_TRACE_AGENTLESS() && ZSTR_LEN(get_global_DD_API_KEY())) {
         ddtrace_endpoint = ddog_endpoint_from_api_key(dd_zend_string_to_CharSlice(get_global_DD_API_KEY()));
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit 291487c9e26996c422b64012a533d576afaa5d66
+Subproject commit ca32215210c089883d7f3e8015dd91c240d35217
