Skip to content

Commit bf528c4

Browse files
libdatadog update to fb65e461 [no-ci-feedback]
Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/125858319 Full CI result: ❌ 176 job(s) failed
1 parent ee86254 commit bf528c4

3 files changed

Lines changed: 19 additions & 9 deletions

File tree

components-rs/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ libdd-data-pipeline = { path = "../libdatadog/libdd-data-pipeline" }
2323
libdd-tinybytes = { path = "../libdatadog/libdd-tinybytes" }
2424
libdd-trace-utils = { path = "../libdatadog/libdd-trace-utils" }
2525
libdd-trace-stats = { path = "../libdatadog/libdd-trace-stats" }
26+
libdd-trace-protobuf = { path = "../libdatadog/libdd-trace-protobuf" }
2627
libdd-crashtracker-ffi = { path = "../libdatadog/libdd-crashtracker-ffi", default-features = false, features = ["collector"] }
2728
libdd-library-config-ffi = { path = "../libdatadog/libdd-library-config-ffi", default-features = false }
2829
spawn_worker = { path = "../libdatadog/spawn_worker" }

components-rs/remote_config.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -650,13 +650,17 @@ pub extern "C" fn ddog_remote_configs_service_env_change(
650650
tags: &libdd_common_ffi::Vec<Tag>,
651651
process_tags: &libdd_common_ffi::Vec<Tag>,
652652
) -> bool {
653-
let new_target = Target {
654-
service: service.to_utf8_lossy().to_string(),
655-
env: env.to_utf8_lossy().to_string(),
656-
app_version: version.to_utf8_lossy().to_string(),
657-
tags: tags.as_slice().to_vec(),
658-
process_tags: process_tags.as_slice().to_vec(),
659-
};
653+
let new_target = Target::new(
654+
service.to_utf8_lossy().to_string(),
655+
env.to_utf8_lossy().to_string(),
656+
version.to_utf8_lossy().to_string(),
657+
tags.as_slice().iter().map(|t| t.to_string()).collect(),
658+
process_tags
659+
.as_slice()
660+
.iter()
661+
.map(|t| t.to_string())
662+
.collect(),
663+
);
660664

661665
if let Some(target) = remote_config.manager.get_target() {
662666
if **target == new_target {
@@ -798,7 +802,7 @@ pub unsafe extern "C" fn ddog_send_debugger_diagnostics<'a>(
798802
remote_config_state
799803
.manager
800804
.get_target()
801-
.map_or("", |t| t.service.as_str()),
805+
.map_or("", |t| t.service()),
802806
);
803807
let mut payload = ddog_debugger_diagnostics_create_unboxed(
804808
probe,

components-rs/stats.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use crate::trace_filter;
1111
use datadog_ipc::shm_stats::{OwnedShmSpanInput, ShmSpanConcentrator, ShmSpanInput, MAX_PEER_TAGS};
1212
use datadog_sidecar::service::blocking::{add_span_to_concentrator, SidecarTransport};
1313
use libdd_trace_stats::span_concentrator::FixedAggregationKey;
14+
use libdd_trace_protobuf::pb::Trilean;
1415
use libdd_common_ffi::slice::{AsBytes, CharSlice};
1516
use std::collections::HashMap;
1617
use std::ffi::{c_char, c_void};
@@ -148,7 +149,11 @@ fn build_fixed_key<'a>(span: &'a PhpSpanStats<'a>) -> FixedAggregationKey<&'a st
148149
http_endpoint: extract_http_endpoint(span),
149150
http_status_code: extract_http_status_code(span),
150151
is_synthetics_request: is_synthetics_request(span),
151-
is_trace_root: span.is_trace_root,
152+
is_trace_root: if span.is_trace_root {
153+
Trilean::True
154+
} else {
155+
Trilean::False
156+
},
152157
grpc_status_code: extract_grpc_status_code(span),
153158
service_source: char_slice_str(span.service_source),
154159
}

0 commit comments

Comments
 (0)