Update libdatadog and bump to 1.9.0 (#3229)

bwoebi · web-flow · commit eae6668e96ec · 2025-05-08T20:44:18.000+02:00
* Update libdatadog and bump to 1.9.0

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Bump the libdatadog version

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Fix profiling with v18

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Fix Windows VirtualProtect call

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Add alloc feature from allocator-api2

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

---------

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ RUN_TESTS_CMD := REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJECT_ROOT) USE_TRACKE
 
 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/{alloc,build-common,crashtracker,crashtracker-ffi,data-pipeline,ddcommon,ddcommon-ffi,ddsketch,ddtelemetry,ddtelemetry-ffi,dogstatsd-client,dynamic-configuration,ipc,library-config,library-config-ffi,live-debugger,live-debugger-ffi,remote-config,sidecar,sidecar-ffi,spawn_worker,tinybytes,tools/{cc_utils,sidecar_mockgen},trace-*,Cargo.toml} -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 "*/ipc/build.rs" -not -path "*/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/{datadog-alloc,build-common,datadog-crashtracker,datadog-crashtracker-ffi,data-pipeline,ddcommon,ddcommon-ffi,ddsketch,ddtelemetry,ddtelemetry-ffi,dogstatsd-client,datadog-dynamic-configuration,datadog-ipc,datadog-ipc-macros,datadog-library-config,datadog-library-config-ffi,datadog-live-debugger,datadog-live-debugger-ffi,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,spawn_worker,tinybytes,tools/{cc_utils,sidecar_mockgen},datadog-trace-*,Cargo.toml} -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
 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 }' )
@@ -419,19 +419,19 @@ generate_cbindgen: cbindgen_binary # Regenerate components-rs/ddtrace.h componen
 			--config ddcommon-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/common.h; \
 		$(command rustup && echo run nightly --) cbindgen --crate datadog-live-debugger-ffi  \
-			--config live-debugger-ffi/cbindgen.toml \
+			--config datadog-live-debugger-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/live-debugger.h; \
 		$(command rustup && echo run nightly --) cbindgen --crate ddtelemetry-ffi  \
 			--config ddtelemetry-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/telemetry.h; \
 		$(command rustup && echo run nightly --) cbindgen --crate datadog-sidecar-ffi  \
-			--config sidecar-ffi/cbindgen.toml \
+			--config datadog-sidecar-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/sidecar.h; \
 		$(command rustup && echo run nightly --) cbindgen --crate datadog-crashtracker-ffi  \
-			--config crashtracker-ffi/cbindgen.toml \
+			--config datadog-crashtracker-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/crashtracker.h; \
 		$(command rustup && echo run nightly --) cbindgen --crate datadog-library-config-ffi  \
-			--config library-config-ffi/cbindgen.toml \
+			--config datadog-library-config-ffi/cbindgen.toml \
 			--output $(PROJECT_ROOT)/components-rs/library-config.h; \
 		if test -d $(PROJECT_ROOT)/tmp; then \
 			mkdir -pv "$(BUILD_DIR)"; \
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.0
+1.9.0
diff --git a/components-rs/Cargo.toml b/components-rs/Cargo.toml
@@ -12,15 +12,15 @@ ddcommon = { path = "../libdatadog/ddcommon", features = ["cgroup_testing"] }
 ddcommon-ffi = { path = "../libdatadog/ddcommon-ffi", default-features = false }
 ddtelemetry = { path = "../libdatadog/ddtelemetry" }
 ddtelemetry-ffi = { path = "../libdatadog/ddtelemetry-ffi", default-features = false }
-datadog-dynamic-configuration = { path = "../libdatadog/dynamic-configuration" }
-datadog-live-debugger = { path = "../libdatadog/live-debugger" }
-datadog-live-debugger-ffi = { path = "../libdatadog/live-debugger-ffi", default-features = false }
-datadog-ipc = { path = "../libdatadog/ipc" }
-datadog-remote-config = { path = "../libdatadog/remote-config" }
-datadog-sidecar = { path = "../libdatadog/sidecar" }
-datadog-sidecar-ffi = { path = "../libdatadog/sidecar-ffi" }
-datadog-crashtracker-ffi = { path = "../libdatadog/crashtracker-ffi", default-features = false, features = ["collector"] }
-datadog-library-config-ffi = { path = "../libdatadog/library-config-ffi", default-features = false }
+datadog-dynamic-configuration = { path = "../libdatadog/datadog-dynamic-configuration" }
+datadog-live-debugger = { path = "../libdatadog/datadog-live-debugger" }
+datadog-live-debugger-ffi = { path = "../libdatadog/datadog-live-debugger-ffi", default-features = false }
+datadog-ipc = { path = "../libdatadog/datadog-ipc" }
+datadog-remote-config = { path = "../libdatadog/datadog-remote-config" }
+datadog-sidecar = { path = "../libdatadog/datadog-sidecar" }
+datadog-sidecar-ffi = { path = "../libdatadog/datadog-sidecar-ffi" }
+datadog-crashtracker-ffi = { path = "../libdatadog/datadog-crashtracker-ffi", default-features = false, features = ["collector"] }
+datadog-library-config-ffi = { path = "../libdatadog/datadog-library-config-ffi", default-features = false }
 spawn_worker = { path = "../libdatadog/spawn_worker" }
 anyhow = { version = "1.0" }
 const-str = "0.5.6"
diff --git a/components-rs/common.h b/components-rs/common.h
@@ -1334,23 +1334,6 @@ typedef struct ddog_StringWrapperResult {
   };
 } ddog_StringWrapperResult;
 
-typedef enum ddog_LibraryConfigName {
-  DDOG_LIBRARY_CONFIG_NAME_DD_APM_TRACING_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_RUNTIME_METRICS_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_LOGS_INJECTION,
-  DDOG_LIBRARY_CONFIG_NAME_DD_PROFILING_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_DATA_STREAMS_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_APPSEC_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_IAST_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_DYNAMIC_INSTRUMENTATION_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_DATA_JOBS_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_APPSEC_SCA_ENABLED,
-  DDOG_LIBRARY_CONFIG_NAME_DD_TRACE_DEBUG,
-  DDOG_LIBRARY_CONFIG_NAME_DD_SERVICE,
-  DDOG_LIBRARY_CONFIG_NAME_DD_ENV,
-  DDOG_LIBRARY_CONFIG_NAME_DD_VERSION,
-} ddog_LibraryConfigName;
-
 typedef enum ddog_LibraryConfigSource {
   DDOG_LIBRARY_CONFIG_SOURCE_LOCAL_STABLE_CONFIG = 0,
   DDOG_LIBRARY_CONFIG_SOURCE_FLEET_STABLE_CONFIG = 1,
@@ -1409,7 +1392,7 @@ typedef struct ddog_CString {
 } ddog_CString;
 
 typedef struct ddog_LibraryConfig {
-  enum ddog_LibraryConfigName name;
+  struct ddog_CString name;
   struct ddog_CString value;
   enum ddog_LibraryConfigSource source;
   struct ddog_CString config_id;
diff --git a/components-rs/crashtracker.h b/components-rs/crashtracker.h
@@ -822,7 +822,7 @@ struct ddog_StringWrapperResult ddog_crasht_demangle(ddog_CharSlice name,
  * signal handler is dangerous, so we fork a sidecar to do the stuff we aren't
  * allowed to do in the handler.
  *
- * See comments in [crashtracker/lib.rs] for a full architecture description.
+ * See comments in [datadog-crashtracker/lib.rs] for a full architecture description.
  * # Safety
  * No safety concerns
  */
@@ -836,7 +836,7 @@ DDOG_CHECK_RETURN struct ddog_VoidResult ddog_crasht_receiver_entry_point_stdin(
  * signal handler is dangerous, so we fork a sidecar to do the stuff we aren't
  * allowed to do in the handler.
  *
- * See comments in [profiling/crashtracker/mod.rs] for a full architecture
+ * See comments in [datadog-crashtracker/lib.rs] for a full architecture
  * description.
  * # Safety
  * No safety concerns
diff --git a/components-rs/library-config.h b/components-rs/library-config.h
@@ -30,12 +30,6 @@ void ddog_library_configurator_drop(struct ddog_Configurator*);
 
 struct ddog_Result_VecLibraryConfig ddog_library_configurator_get(const struct ddog_Configurator *configurator);
 
-/**
- * Returns a static null-terminated string, containing the name of the environment variable
- * associated with the library configuration
- */
-struct ddog_CStr ddog_library_config_name_to_env(enum ddog_LibraryConfigName name);
-
 /**
  * Returns a static null-terminated string, containing the name of the environment variable
  * associated with the library configuration
diff --git a/ddtrace.sym b/ddtrace.sym
@@ -25,7 +25,6 @@ ddog_library_configurator_with_local_path
 ddog_library_configurator_with_fleet_path
 ddog_library_configurator_with_detect_process_info
 ddog_library_configurator_get
-ddog_library_config_name_to_env
 ddog_library_config_source_to_string
 ddog_library_config_drop
 ddog_Error_drop
diff --git a/ext/ddtrace.c b/ext/ddtrace.c
@@ -257,7 +257,7 @@ static void dd_patch_zend_call_known_function(void) {
 
 #ifdef _WIN32
     DWORD old_protection;
-    if (VirtualProtect(page, page_size, PAGE_READWRITE, &old_protection))
+    if (!VirtualProtect(page, page_size, PAGE_READWRITE, &old_protection))
 #else
     if (mprotect(page, page_size, PROT_READ | PROT_WRITE) != 0)
 #endif
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit 8c826205d139554166a5175fbeb16f9fee6a1a28
+Subproject commit 60583218a8de6768f67d04fcd5bc6443f67f516b
diff --git a/package.xml b/package.xml
@@ -70,58 +70,44 @@
         <![CDATA[
 ## All products
 ### Added
-- Add support for file based configuration (library-config) #3068
+- Update config telemetry to support stable config #3198
 
 ## Tracer
 ### Added
-- Add DDTrace\try_drop_span() API #3136
-- Add support for PDO::connect #3125
-- Add span creation and close handlers #3123
-- API Gateway Tracing #3116
-- Add a Ratchet integration #3115
-- Baggage Header Propagation Support #3102
-- Crashtracking for windows #3099
+- Support DD_DOGSTATSD_HOST configuration #3167
+- Add referrer hostname as span tag #3196
 
 ### Changed
-- Enable 128 bit trace_id logging by default #3163
-- Allow whitespace as separator in DD_TAGS #3162
-- Implement Disable APM Tracing #3080
+- Capture key before first colon in DD_TAGS #3179
 
 ### Fixed
-- Support both ENOTSUP and ENOSYS in shm_open fallback Datadog/libdatadog#969
-- Handle flushing of multiple traces at once #3176
+- Check server first before accessing in ddtrace_ip_extraction_find #3216
+- Fix assumptions around interned strings on PHP 7.3 #3224
+- Fix initial double remote config reading #3225
+- Fix dropped trace payloads for the sidecar Datadog/libdatadog#1047
+- Fix Windows VirtualProtect call #3229
 
 ### Internal
-- Show actual file and line for occurrence of exceptions as well #3172
-- Support ZSTR_PARENT known_string #3106
+- Store debug symbols in the SSI archive #3217
 
 ## Profiling
 ### Added
-- Add profiling and appsec to SSI #3063
+- Configurable allocation sampling distance #3227
 
-### Fixed
-- FrankenPHP idle phase #3169
-- Add active span null check #3164
-- Avoid some OOM panics and avoid long strings #3151
-- Fix upscaling of I/O profiles #3146
+### Changed
+- Accept auto as valid value for DD_PROFILING_ENABLED #3166
 
-### Internal
-- Add 'tracing' features to capture time spent walking the stack #3094
+### Fixed
+- Fix empty internal metadata #3228
 
 ## Application Security Management
 ### Added
-- Implement API Security Sampling RFC #3117
-- Add authenticated user tracking #3114
-- Add profiling and appsec to SSI #3063
-
-### Changed
-- Upgrade libddwaf #3126
+- AppSec support for Frankenphp #3165
+- Detection/blocking of SQL injections through libddwaf #3186
+- Add RASP_SQLI remote config capability #3203
 
 ### Fixed
-- Emit asm event on user events #3170
-
-### Internal
-- Add more logging around stack generation #3096
+- Make Appsec blocking compatible with Laravel error handler #3110
 ]]></notes>
     <contents>
         <dir name="/">
diff --git a/profiling/Cargo.toml b/profiling/Cargo.toml
@@ -19,10 +19,10 @@ cfg-if = { version = "1.0" }
 cpu-time = { version = "1.0" }
 chrono = { version = "0.4" }
 crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
-datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v17.0.0" }
-datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v17.0.0" }
-ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v17.0.0" }
-datadog-library-config-ffi = { git = "https://github.com/DataDog/libdatadog", rev = "8c826205d139554166a5175fbeb16f9fee6a1a28" }
+datadog-alloc = { git = "https://github.com/DataDog/libdatadog", tag = "v18.0.0" }
+datadog-profiling = { git = "https://github.com/DataDog/libdatadog", tag = "v18.0.0" }
+ddcommon = { git = "https://github.com/DataDog/libdatadog", tag = "v18.0.0" }
+datadog-library-config-ffi = { git = "https://github.com/DataDog/libdatadog", tag = "v18.0.0" }
 env_logger = { version = "0.11", default-features = false }
 indexmap = { version = "2.2" }
 lazy_static = { version = "1.4" }
@@ -46,6 +46,7 @@ default-features = false
 features = ["env-filter", "fmt", "smallvec", "std"]
 
 [dev-dependencies]
+allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"] }
 criterion = { version = "0.5.1" }
 datadog-php-profiling = { path = ".", features = ["test"] }
 
diff --git a/profiling/src/profiling/mod.rs b/profiling/src/profiling/mod.rs
@@ -131,7 +131,7 @@ impl WallTime {
 #[derive(Debug, Clone)]
 pub enum LabelValue {
     Str(Cow<'static, str>),
-    Num(i64, Option<&'static str>),
+    Num(i64, &'static str),
 }
 
 #[derive(Debug, Clone)]
@@ -143,18 +143,18 @@ pub struct Label {
 impl<'a> From<&'a Label> for ApiLabel<'a> {
     fn from(label: &'a Label) -> Self {
         let key = label.key;
-        match &label.value {
-            LabelValue::Str(str) => Self {
+        match label.value {
+            LabelValue::Str(ref str) => Self {
                 key,
-                str: Some(str),
+                str,
                 num: 0,
-                num_unit: None,
+                num_unit: "",
             },
             LabelValue::Num(num, num_unit) => Self {
                 key,
-                str: None,
-                num: *num,
-                num_unit: num_unit.as_deref(),
+                str: "",
+                num,
+                num_unit,
             },
         }
     }
@@ -1329,11 +1329,11 @@ impl Profiler {
         #[cfg(php_gc_status)]
         labels.push(Label {
             key: "gc runs",
-            value: LabelValue::Num(runs, Some("count")),
+            value: LabelValue::Num(runs, "count"),
         });
         labels.push(Label {
             key: "gc collected",
-            value: LabelValue::Num(collected, Some("count")),
+            value: LabelValue::Num(collected, "count"),
         });
         let n_labels = labels.len();
 
@@ -1467,7 +1467,7 @@ impl Profiler {
         let mut labels = Vec::with_capacity(5 + n_extra_labels);
         labels.push(Label {
             key: "thread id",
-            value: LabelValue::Num(unsafe { libc::pthread_self() as i64 }, "id".into()),
+            value: LabelValue::Num(unsafe { libc::pthread_self() as i64 }, "id"),
         });
 
         labels.push(Label {
@@ -1488,12 +1488,12 @@ impl Profiler {
 
             labels.push(Label {
                 key: "local root span id",
-                value: LabelValue::Num(local_root_span_id, None),
+                value: LabelValue::Num(local_root_span_id, ""),
             });
 
             labels.push(Label {
                 key: "span id",
-                value: LabelValue::Num(span_id, None),
+                value: LabelValue::Num(span_id, ""),
             });
         }
 
diff --git a/zend_abstract_interface/config/config_stable_file.c b/zend_abstract_interface/config/config_stable_file.c
@@ -18,7 +18,6 @@ static void (*_ddog_library_configurator_with_fleet_path)(struct ddog_Configurat
 static void (*_ddog_library_configurator_with_detect_process_info)(struct ddog_Configurator *c);
 static struct ddog_Result_VecLibraryConfig (*_ddog_library_configurator_get)(const struct ddog_Configurator *configurator);
 static struct ddog_CStr (*_ddog_library_config_source_to_string)(enum ddog_LibraryConfigSource name);
-static struct ddog_CStr (*_ddog_library_config_name_to_env)(enum ddog_LibraryConfigName name);
 static void (*_ddog_library_config_drop)(struct ddog_Vec_LibraryConfig);
 static void (*_ddog_Error_drop)(struct ddog_Error *error);
 static void (*_ddog_library_configurator_drop)(struct ddog_Configurator*);
@@ -58,7 +57,6 @@ void zai_config_stable_file_minit(void) {
         RESOLVE_SYMBOL(ddog_library_configurator_with_fleet_path);
         RESOLVE_SYMBOL(ddog_library_configurator_with_detect_process_info);
         RESOLVE_SYMBOL(ddog_library_configurator_get);
-        RESOLVE_SYMBOL(ddog_library_config_name_to_env);
         RESOLVE_SYMBOL(ddog_library_config_source_to_string);
         RESOLVE_SYMBOL(ddog_library_config_drop);
         RESOLVE_SYMBOL(ddog_Error_drop);
@@ -94,8 +92,7 @@ void zai_config_stable_file_minit(void) {
             entry->source = cfg->source;
             entry->config_id = zend_string_init(cfg->config_id.ptr, cfg->config_id.length, 1);
 
-            ddog_CStr env_name = _ddog_library_config_name_to_env(cfg->name);
-            zend_hash_str_add_ptr(stable_config, env_name.ptr, env_name.length, entry);
+            zend_hash_str_add_ptr(stable_config, cfg->name.ptr, cfg->name.length, entry);
         }
         _ddog_library_config_drop(configs);
     } else {
