libdatadog update to 3da894a0 [no-ci-feedback]

Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/130642899

Full CI result: ❌ 233 job(s) failed

Author: github-actions[bot]

Cargo.toml

@@ -36,13 +36,29 @@ inherits = "release"
 #
 # Every dependency that a libdatadog crate inherits via `{ workspace = true }`
 # must be declared here, because those crates resolve their workspace
-# inheritance against this manifest when built as path dependencies. Keep this
-# list in sync with libdatadog's own `[workspace.dependencies]`; libdatadog
-# #2253 consolidated `anyhow`, `serde`, `tokio` and `tracing` to the workspace
-# level, so they are mirrored here too.
+# inheritance against this manifest when built as path dependencies. Note that
+# manifest parsing resolves inheritance for *every* dependency table, including
+# `dev-dependencies` of crates we never build, so this has to be a full mirror
+# of libdatadog's `[workspace.dependencies]` rather than only the subset we
+# link against. libdatadog #2253/#2270/#2283/#2296 ("migrate to workspace
+# dependencies", phases 1-4) moved the bulk of its dependencies to the
+# workspace level, so keep this list in sync with libdatadog's own
+# `[workspace.dependencies]` on every submodule bump.
+#
+# Only deviations from libdatadog: `hyper`/`hyper-util` additionally enable the
+# client/http1 features that our own build needs. Extra features are additive,
+# so libdatadog crates inheriting them still get at least what they asked for.
 [workspace.dependencies]
+allocator-api2 = { version = "0.2.21", default-features = false }
 anyhow = { version = "1.0", default-features = false }
 arc-swap = "1.7.1"
+bolero = { version = "0.13.4", default-features = false }
+chrono = { version = "0.4.38", default-features = false }
+clap = { version = "4.3.21", default-features = false }
+criterion = { version = "0.5.1", default-features = true }
+cxx-build = { version = "1.0", default-features = false }
+elf = { version = "0.7", default-features = false }
+futures = { version = "0.3", default-features = false }
 hyper = { version = "1.6", features = [
   "http1",
   "client",
@@ -52,12 +68,20 @@ hyper-util = { version = "0.1.10", features = [
   "client",
   "client-legacy",
 ] }
+io-lifetimes = { version = "1.0", default-features = false }
+libc = { version = "0.2", default-features = true }
 prost-build = { version = "0.14.1", default-features = false }
 protoc-bin-vendored = { version = "3.0.0", default-features = false }
+rustls = { version = "0.23", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
+syn = { version = "^2", default-features = false }
+tempfile = { version = "3.13", default-features = false, features = [
+  "getrandom",
+] }
 tokio = { version = "1.36", default-features = false }
 tracing = { version = "0.1", default-features = false }
+uuid = { version = "1.7.0", default-features = false }
 
 [workspace.lints]
 # empty for compat with libdatadog

appsec/src/helper/service.hpp

@@ -379,6 +379,8 @@ template <> struct fmt::formatter<ddog_MetricType> {
             return fmt::format_to(ctx.out(), "COUNT");
         case DDOG_METRIC_TYPE_DISTRIBUTION:
             return fmt::format_to(ctx.out(), "DISTRIBUTION");
+        case DDOG_METRIC_TYPE_RATE:
+            return fmt::format_to(ctx.out(), "RATE");
         }
         return fmt::format_to(ctx.out(), "UNKNOWN");
     }

components-rs/common.h

@@ -283,6 +283,9 @@ typedef enum ddog_ConfigurationOrigin {
   DDOG_CONFIGURATION_ORIGIN_LOCAL_STABLE_CONFIG,
   DDOG_CONFIGURATION_ORIGIN_FLEET_STABLE_CONFIG,
   DDOG_CONFIGURATION_ORIGIN_CALCULATED,
+  DDOG_CONFIGURATION_ORIGIN_OTEL_ENV_VAR,
+  DDOG_CONFIGURATION_ORIGIN_INI,
+  DDOG_CONFIGURATION_ORIGIN_UNKNOWN,
 } ddog_ConfigurationOrigin;
 
 typedef enum ddog_DynamicConfigUpdateMode {
@@ -349,12 +352,17 @@ typedef enum ddog_MetricNamespace {
   DDOG_METRIC_NAMESPACE_TELEMETRY,
   DDOG_METRIC_NAMESPACE_APM,
   DDOG_METRIC_NAMESPACE_SIDECAR,
+  DDOG_METRIC_NAMESPACE_CIVISIBILITY,
+  DDOG_METRIC_NAMESPACE_MLOBS,
+  DDOG_METRIC_NAMESPACE_DDTRACEAPI,
+  DDOG_METRIC_NAMESPACE_AI_GUARD,
 } ddog_MetricNamespace;
 
 typedef enum ddog_MetricType {
   DDOG_METRIC_TYPE_GAUGE,
   DDOG_METRIC_TYPE_COUNT,
   DDOG_METRIC_TYPE_DISTRIBUTION,
+  DDOG_METRIC_TYPE_RATE,
 } ddog_MetricType;
 
 typedef enum ddog_ProbeStatus {
@@ -427,8 +435,8 @@ typedef enum ddog_RemoteConfigProduct {
   DDOG_REMOTE_CONFIG_PRODUCT_ASM_DD,
   DDOG_REMOTE_CONFIG_PRODUCT_ASM_FEATURES,
   DDOG_REMOTE_CONFIG_PRODUCT_FFE_FLAGS,
-  DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGER,
-  DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGER_SYMBOL_DB,
+  DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGING,
+  DDOG_REMOTE_CONFIG_PRODUCT_LIVE_DEBUGGING_SYMBOL_DB,
 } ddog_RemoteConfigProduct;
 
 typedef enum ddog_SpanProbeTarget {
@@ -1206,6 +1214,7 @@ typedef struct ddog_NativeFile {
 
 typedef struct ddog_SidecarFlushOptions {
   bool traces_and_stats;
+  bool flag_evaluations;
   bool telemetry;
 } ddog_SidecarFlushOptions;
 

components-rs/remote_config.rs

@@ -164,12 +164,12 @@ pub unsafe extern "C" fn ddog_init_remote_config(flags: RemoteConfigFlags) {
     }
 
     if live_debugging_enabled {
-        DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::LiveDebugger)
+        DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::LiveDebugging)
     }
 
     if appsec_config {
         DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::AsmData);
-        DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::AsmDD);
+        DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::AsmDd);
         DATADOG_REMOTE_CONFIG_PRODUCTS.push(RemoteConfigProduct::Asm);
         [
             RemoteConfigCapabilities::AsmIpBlocking,
@@ -390,7 +390,7 @@ pub extern "C" fn ddog_process_remote_configs(remote_config: &mut RemoteConfigSt
             } => {
                 if let Some(data) = value.data {
                     match value.product {
-                        RemoteConfigProduct::LiveDebugger => {
+                        RemoteConfigProduct::LiveDebugging => {
                             let val = Box::new((data, MaybeShmLimiter::open(limiter_index)));
                             let rc_ref: &mut RemoteConfigState = unsafe { mem::transmute(remote_config as *mut _) }; // sigh, borrow checker
                             let config_id = value.config_id.clone();
@@ -439,7 +439,7 @@ pub extern "C" fn ddog_process_remote_configs(remote_config: &mut RemoteConfigSt
                 }
             }
             RemoteConfigUpdate::Remove(path) => match path.product {
-                RemoteConfigProduct::LiveDebugger => {
+                RemoteConfigProduct::LiveDebugging => {
                     if let Some(boxed) = remote_config.live_debugger.active.remove(&path.config_id) {
                         if let Some(debugger) = boxed.0.downcast::<LiveDebuggingData>() {
                             remove_config(remote_config, &path.config_id, debugger);
@@ -755,7 +755,7 @@ pub extern "C" fn ddog_rshutdown_remote_config(remote_config: &mut RemoteConfigS
     remote_config.dynamic_config.merged_configs.clear();
     remote_config.manager.unload_configs(&[
         RemoteConfigProduct::ApmTracing,
-        RemoteConfigProduct::LiveDebugger,
+        RemoteConfigProduct::LiveDebugging,
     ]);
 }
 

components-rs/telemetry.rs

@@ -105,6 +105,7 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_addIntegration_buffer(
         version,
         compatible: None,
         auto_enabled: None,
+        error: None,
     });
     buffer.buffer.push(SidecarAction::Telemetry(action));
 }
@@ -121,6 +122,10 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_addDependency_buffer(
     let action = TelemetryActions::AddDependency(Dependency {
         name: dependency_name.to_utf8_lossy().into_owned(),
         version,
+        // Not reported by the PHP tracer: the SCA hash and metadata are not
+        // available from Composer's autoloader at the point we enqueue this.
+        hash: None,
+        metadata: None,
     });
     buffer.buffer.push(SidecarAction::Telemetry(action));
 }
@@ -139,6 +144,11 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_addEndpoint_buffer(
         path: Some(path.to_utf8_lossy().into_owned()),
         operation_name: operation_name.to_utf8_lossy().into_owned(),
         resource_name: resource_name.to_utf8_lossy().into_owned(),
+        // The API-schema fields added in libdatadog 41 are not collected by the
+        // PHP endpoint discovery yet; leave them absent from the payload.
+        request_body_type: None,
+        response_body_type: None,
+        response_code: None,
     });
     buffer.buffer.push(SidecarAction::Telemetry(action));
 }
@@ -158,7 +168,11 @@ pub unsafe extern "C" fn ddog_sidecar_telemetry_enqueueConfig_buffer(
     };
     let action = TelemetryActions::AddConfig(data::Configuration {
         name: config_key.to_utf8_lossy().into_owned(),
-        value: config_value.to_utf8_lossy().into_owned(),
+        // `value` became `Option<String>` so that libdatadog can distinguish a
+        // null value from an empty one. The PHP side has no null: every config
+        // key we enqueue has a (possibly empty) string value, and an empty
+        // `DD_*` value is meaningful, so it stays `Some("")` rather than `None`.
+        value: Some(config_value.to_utf8_lossy().into_owned()),
         origin,
         config_id,
         seq_id: None,