Skip to content

Fix ordering condition in sidecar request start #3805

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

Merged
bwoebi merged 1 commit into from
Apr 20, 2026
Merged

Fix ordering condition in sidecar request start #3805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions ext/sidecar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,11 +776,6 @@ void ddtrace_sidecar_submit_root_span_data_direct(ddog_SidecarTransport **transp
bool changed = true;
if (DDTRACE_G(remote_config_state)) {
changed = ddog_remote_configs_service_env_change(DDTRACE_G(remote_config_state), service_slice, env_slice, version_slice, &DDTRACE_G(active_global_tags), process_tags);
if (!changed && root) {
// ddog_remote_configs_service_env_change() generally only processes configs if they changed. However, upon request initialization it may be identical to the previous request.
// However, at request shutdown some configs are unloaded. Explicitly forcing a processing step ensures these are re-loaded.
ddog_process_remote_configs(DDTRACE_G(remote_config_state));
}
}

// Force resend on reconnect
Expand Down Expand Up @@ -813,6 +808,12 @@ void ddtrace_sidecar_submit_root_span_data_direct(ddog_SidecarTransport **transp
ddtrace_ffi_try("Failed flushing filtered telemetry buffer",
ddog_sidecar_telemetry_filter_flush(transport, ddtrace_sidecar_instance_id, &DDTRACE_G(sidecar_queue_id), ddtrace_telemetry_buffer(), ddtrace_telemetry_cache(), service_slice, env_slice));
}

if (!changed && DDTRACE_G(remote_config_state)) {
// ddog_remote_configs_service_env_change() generally only processes configs if they changed. However, upon request initialization it may be identical to the previous request.
// However, at request shutdown some configs are unloaded. Explicitly forcing a processing step ensures these are re-loaded.
ddog_process_remote_configs(DDTRACE_G(remote_config_state));
}
}

void ddtrace_sidecar_submit_root_span_data(void) {
Expand Down
Loading