Skip to content

fix(live-debugger): skip probe installation when sidecar is unavailable #3824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Leiyks wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix(live-debugger): skip probe installation when sidecar is unavailable #3824

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14dd0cc
fix(live-debugger): guard against NULL sidecar in diagnostics calls
Leiyks Apr 24, 2026
1f7e2be
fix(live-debugger): skip probe installation when sidecar is unavailable
Leiyks Apr 28, 2026
b71f4b9
fix(live-debugger): remove null guards from async probe callbacks
Leiyks Apr 28, 2026
a907174
fix: remove stray semicolon after error label
Leiyks Apr 28, 2026
d2eb7cb
fix(live-debugger): deduplicate probe installation from RC retries
Leiyks Apr 28, 2026
ce1afd7
fix(live-debugger): remove NULL sidecar guard — sidecar is available …
Leiyks Apr 28, 2026
299b215
fix(live-debugger): remove stale active_rc_hooks entry on probe removal
Leiyks Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ext/live_debugger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,22 @@ static int64_t dd_init_live_debugger_probe(const ddog_Probe *probe, dd_probe_def
def->scope = NULL;
def->removed = false;

// Deduplicate: the RC state machine retries pending (RECEIVED-but-not-INSTALLED) probes on
// every ddog_process_remote_configs() call. Skip re-installation if already in active_rc_hooks.
{
zend_ulong existing_id;
zend_string *key_str;
dd_probe_def *existing;
ZEND_HASH_FOREACH_KEY_PTR(&DDTRACE_G(active_rc_hooks), existing_id, key_str, existing) {
(void)key_str;
if (ZSTR_LEN(existing->probe_id) == probe->id.len
&& memcmp(ZSTR_VAL(existing->probe_id), probe->id.ptr, probe->id.len) == 0) {
def_dtor(def);
return (int64_t)existing_id;
}
} ZEND_HASH_FOREACH_END();
}

const ddog_ProbeTarget *target = &probe->target;
if (target->type_name.len) {
if (!ddog_type_can_be_instrumented(DDTRACE_G(remote_config_state), target->type_name)) {
Expand Down Expand Up @@ -852,6 +868,7 @@ static void dd_remove_live_debugger_probe(int64_t id) {
def->scope ? (zai_str)ZAI_STR_FROM_ZSTR(def->scope) : (zai_str)ZAI_STR_EMPTY,
def->function ? (zai_str)ZAI_STR_FROM_ZSTR(def->function) : (zai_str)ZAI_STR_EMPTY,
id);
zend_hash_index_del(&DDTRACE_G(active_rc_hooks), (zend_ulong)id);
if (scope) {
zend_string_release(scope);
}
Expand Down
Loading