Skip to content

fix(ci): restore RC write-mode NULL-swap; fix usleep(float) in agent-env test #3849

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

Draft
Leiyks wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Draft

fix(ci): restore RC write-mode NULL-swap; fix usleep(float) in agent-env test #3849

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions ext/remote_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ static zend_string *dd_dynamic_configuration_update(ddog_CharSlice config, zend_
}
} else {
ZEND_ASSERT(mode == DDOG_DYNAMIC_CONFIG_UPDATE_MODE_WRITE);
DDTRACE_G(remote_config_writing) = true;
ddog_RemoteConfigState *saved = DDTRACE_G(remote_config_state);
DDTRACE_G(remote_config_state) = NULL;
zend_alter_ini_entry(name, value, ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME);
DDTRACE_G(remote_config_writing) = false;
DDTRACE_G(remote_config_state) = saved;
zend_string_release(value);
}
zend_string_release(name);
Expand Down
3 changes: 1 addition & 2 deletions tests/ext/request-replayer/dd_trace_agent_env.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ $rr = new RequestReplayer();
$span = \DDTrace\start_span();

// make sure sidecar keeps up with us
$start = microtime(true);
\DDTrace\start_trace_span();
\DDTrace\close_span();
$rr->waitForDataAndReplay();
usleep(floor(microtime(true) - $start) * 100000);
dd_trace_internal_fn('await_agent_info', 15000);

\DDTrace\close_span();
var_dump($span->env);
Expand Down
Loading