Skip to content

Fix possible race condition leading to a crash upon sidecar reconnect in ZTS#3655

Merged
bwoebi merged 1 commit intomasterfrom
bob/sidecar-di-race-condition
Feb 17, 2026
Merged

Fix possible race condition leading to a crash upon sidecar reconnect in ZTS#3655
bwoebi merged 1 commit intomasterfrom
bob/sidecar-di-race-condition

Conversation

@bwoebi
Copy link
Copy Markdown
Collaborator

@bwoebi bwoebi commented Feb 17, 2026

See also comment added to the code.

@bwoebi bwoebi requested a review from a team as a code owner February 17, 2026 12:30
@datadog-datadog-prod-us1
Copy link
Copy Markdown

datadog-datadog-prod-us1 Bot commented Feb 17, 2026

⚠️ Tests

Fix all issues with BitsAI or with Cursor

⚠️ Warnings

🧪 1026 Tests failed

    testSearchPhpBinaries from integration.DDTrace\Tests\Integration\PHPInstallerTest (Fix with Cursor)

testSimplePushAndProcess from laravel-58-test.DDTrace\Tests\Integrations\Laravel\V5_8\QueueTest (Datadog) (Fix with Cursor)
Risky Test
phpvfscomposer://tests/vendor/phpunit/phpunit/phpunit:97

    testSimplePushAndProcess from laravel-8x-test.DDTrace\Tests\Integrations\Laravel\V8_x\QueueTest (Fix with Cursor)

View all

ℹ️ Info

❄️ No new flaky tests detected

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 9b0511e | Docs | Datadog PR Page | Was this helpful? Give us feedback!

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 62.20%. Comparing base (72a021a) to head (9b0511e).

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3655      +/-   ##
==========================================
- Coverage   62.21%   62.20%   -0.02%     
==========================================
  Files         141      141              
  Lines       13387    13387              
  Branches     1753     1753              
==========================================
- Hits         8329     8327       -2     
- Misses       4260     4263       +3     
+ Partials      798      797       -1     

see 1 file with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 72a021a...9b0511e. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Comment thread ext/sidecar.c
#if ZTS
// With the current architecture of config it's not accessible via the TSRMLS_CACHE and thus may be actually invalid on the current thread.
// This is a known issue and will be fixed with refactor of the module_globals usage of config. The current behaviour is not perfect, but has to be considered acceptable.
if (zai_config_memoized_entries[DDTRACE_CONFIG_DD_DYNAMIC_INSTRUMENTATION_ENABLED].name_index >= 0) {
Copy link
Copy Markdown
Collaborator

@morrisonlevi morrisonlevi Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make name_index atomic? I'm not sure exactly when/how this field is updated. The minit and first config things should be fine, not sure about how remote config works.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That value is not supposed to be touched after first rinit anyway. So doesn't matter.

@bwoebi bwoebi merged commit 38115f9 into master Feb 17, 2026
2067 of 2069 checks passed
@bwoebi bwoebi deleted the bob/sidecar-di-race-condition branch February 17, 2026 18:20
@github-actions github-actions Bot added this to the 1.17.0 milestone Feb 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants