Skip to content

Commit c3d2d63

Browse files
libdatadog update to 7be7ac7f
Automated update by CI pipeline https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-php/-/pipelines/131137404 Full CI result: ❌ 1 job(s) failed
1 parent 018f212 commit c3d2d63

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

components-rs/remote_config.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ pub unsafe extern "C" fn ddog_init_remote_config_state(
218218
language: "php".to_string(),
219219
tracer_version: include_str!("../VERSION").trim().into(),
220220
endpoint: endpoint.clone(),
221+
// We always fetch remote config through the agent.
222+
agentless: None,
221223
}, registry),
222224
live_debugger: LiveDebuggerState {
223225
di_enabled,
@@ -389,12 +391,12 @@ pub extern "C" fn ddog_process_remote_configs(remote_config: &mut RemoteConfigSt
389391
limiter_index,
390392
} => {
391393
if let Some(data) = value.data {
392-
match value.product {
394+
match value.path.product() {
393395
RemoteConfigProduct::LiveDebugging => {
394396
let val = Box::new((data, MaybeShmLimiter::open(limiter_index)));
395397
let rc_ref: &mut RemoteConfigState = unsafe { mem::transmute(remote_config as *mut _) }; // sigh, borrow checker
396-
let config_id = value.config_id.clone();
397-
let entry = remote_config.live_debugger.active.entry(value.config_id);
398+
let config_id = value.path.config_id().to_string();
399+
let entry = remote_config.live_debugger.active.entry(config_id.clone());
398400
let (parsed, limiter) = match entry {
399401
Entry::Occupied(mut e) => {
400402
e.insert(val);
@@ -416,7 +418,7 @@ pub extern "C" fn ddog_process_remote_configs(remote_config: &mut RemoteConfigSt
416418
let configs: Vec<Configs> = config_data.lib_config.clone().into();
417419
if !configs.is_empty() {
418420
remote_config.dynamic_config.active_configs
419-
.insert(value.config_id, ActiveDynamicConfig { priority, configs });
421+
.insert(value.path.config_id().to_string(), ActiveDynamicConfig { priority, configs });
420422
let merged = compute_merged_configs(&remote_config.dynamic_config.active_configs);
421423
insert_new_configs(
422424
&mut remote_config.dynamic_config.old_config_values,
@@ -438,16 +440,16 @@ pub extern "C" fn ddog_process_remote_configs(remote_config: &mut RemoteConfigSt
438440
}
439441
}
440442
}
441-
RemoteConfigUpdate::Remove(path) => match path.product {
443+
RemoteConfigUpdate::Remove(path) => match path.product() {
442444
RemoteConfigProduct::LiveDebugging => {
443-
if let Some(boxed) = remote_config.live_debugger.active.remove(&path.config_id) {
445+
if let Some(boxed) = remote_config.live_debugger.active.remove(path.config_id()) {
444446
if let Some(debugger) = boxed.0.downcast::<LiveDebuggingData>() {
445-
remove_config(remote_config, &path.config_id, debugger);
447+
remove_config(remote_config, path.config_id(), debugger);
446448
}
447449
}
448450
}
449451
RemoteConfigProduct::ApmTracing => {
450-
if remote_config.dynamic_config.active_configs.remove(&path.config_id).is_some() {
452+
if remote_config.dynamic_config.active_configs.remove(path.config_id()).is_some() {
451453
if remote_config.dynamic_config.active_configs.is_empty() {
452454
remove_old_configs(remote_config);
453455
} else {

libdatadog

Submodule libdatadog updated 59 files

0 commit comments

Comments
 (0)