libdatadog update to 15899dfe [no-ci-feedback]

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

Full CI result: ❌ 248 job(s) failed

Author: github-actions[bot]

Cargo.toml

@@ -33,7 +33,15 @@ inherits = "release"
 # These are to satistfy the build with libdatadog as a path dependency inside
 # components-rs. There may be a better way to fix this, but I'm alreday two
 # tasks removed from what I'm trying to do, so pushing forward.
+#
+# 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.
 [workspace.dependencies]
+anyhow = { version = "1.0", default-features = false }
 arc-swap = "1.7.1"
 hyper = { version = "1.6", features = [
   "http1",
@@ -44,6 +52,9 @@ hyper-util = { version = "0.1.10", features = [
   "client",
   "client-legacy",
 ] }
+serde = { version = "1.0", default-features = false }
+tokio = { version = "1.36", default-features = false }
+tracing = { version = "0.1", default-features = false }
 
 [workspace.lints]
 # empty for compat with libdatadog

components-rs/Cargo.toml

@@ -23,6 +23,7 @@ libdd-data-pipeline = { path = "../libdatadog/libdd-data-pipeline" }
 libdd-tinybytes = { path = "../libdatadog/libdd-tinybytes" }
 libdd-trace-utils = { path = "../libdatadog/libdd-trace-utils" }
 libdd-trace-stats = { path = "../libdatadog/libdd-trace-stats" }
+libdd-trace-protobuf = { path = "../libdatadog/libdd-trace-protobuf" }
 libdd-crashtracker-ffi = { path = "../libdatadog/libdd-crashtracker-ffi", default-features = false, features = ["collector"] }
 libdd-library-config-ffi = { path = "../libdatadog/libdd-library-config-ffi", default-features = false }
 spawn_worker = { path = "../libdatadog/spawn_worker" }

components-rs/remote_config.rs

@@ -650,13 +650,16 @@ pub extern "C" fn ddog_remote_configs_service_env_change(
     tags: &libdd_common_ffi::Vec<Tag>,
     process_tags: &libdd_common_ffi::Vec<Tag>,
 ) -> bool {
-    let new_target = Target {
-        service: service.to_utf8_lossy().to_string(),
-        env: env.to_utf8_lossy().to_string(),
-        app_version: version.to_utf8_lossy().to_string(),
-        tags: tags.as_slice().to_vec(),
-        process_tags: process_tags.as_slice().to_vec(),
-    };
+    // libdatadog now hides `Target`'s fields and exposes a constructor. `tags`
+    // and `process_tags` are stored as already-formatted "key:value" strings,
+    // so convert the incoming `Tag`s via their `Display` impl.
+    let new_target = Target::new(
+        service.to_utf8_lossy().to_string(),
+        env.to_utf8_lossy().to_string(),
+        version.to_utf8_lossy().to_string(),
+        tags.as_slice().iter().map(|t| t.to_string()).collect(),
+        process_tags.as_slice().iter().map(|t| t.to_string()).collect(),
+    );
 
     if let Some(target) = remote_config.manager.get_target() {
         if **target == new_target {
@@ -798,7 +801,7 @@ pub unsafe extern "C" fn ddog_send_debugger_diagnostics<'a>(
         remote_config_state
             .manager
             .get_target()
-            .map_or("", |t| t.service.as_str()),
+            .map_or("", |t| t.service()),
     );
     let mut payload = ddog_debugger_diagnostics_create_unboxed(
         probe,

components-rs/stats.rs

@@ -11,6 +11,7 @@ use crate::trace_filter;
 use datadog_ipc::shm_stats::{OwnedShmSpanInput, ShmSpanConcentrator, ShmSpanInput, MAX_PEER_TAGS};
 use datadog_sidecar::service::blocking::{add_span_to_concentrator, SidecarTransport};
 use libdd_trace_stats::span_concentrator::FixedAggregationKey;
+use libdd_trace_protobuf::pb::Trilean;
 use libdd_common_ffi::slice::{AsBytes, CharSlice};
 use std::collections::HashMap;
 use std::ffi::{c_char, c_void};
@@ -148,7 +149,13 @@ fn build_fixed_key<'a>(span: &'a PhpSpanStats<'a>) -> FixedAggregationKey<&'a st
         http_endpoint: extract_http_endpoint(span),
         http_status_code: extract_http_status_code(span),
         is_synthetics_request: is_synthetics_request(span),
-        is_trace_root: span.is_trace_root,
+        // `is_trace_root` became a three-valued `Trilean` in libdatadog; the PHP
+        // side only ever knows true/false, so map the bool onto True/False.
+        is_trace_root: if span.is_trace_root {
+            Trilean::True
+        } else {
+            Trilean::False
+        },
         grpc_status_code: extract_grpc_status_code(span),
         service_source: char_slice_str(span.service_source),
     }