Skip to content
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.

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

Make ddtrace_disable a true global to avoid crashes in ZTS with unsupported SAPI/extensions #2545

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

bwoebi
Copy link
Collaborator

@bwoebi bwoebi commented Feb 29, 2024

Description

Simple bugfix, found with frankenphp zts.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

@bwoebi bwoebi requested a review from a team as a code owner February 29, 2024 10:31
@codecov-commenter
Copy link

codecov-commenter commented Feb 29, 2024

Codecov Report

Merging #2545 (a3caa32) into master (552b0ef) will increase coverage by 2.94%.
The diff coverage is 86.95%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2545      +/-   ##
============================================
+ Coverage     76.55%   79.49%   +2.94%     
+ Complexity      267      216      -51     
============================================
  Files           138      103      -35     
  Lines         17457    12740    -4717     
  Branches        976        0     -976     
============================================
- Hits          13364    10128    -3236     
+ Misses         3573     2612     -961     
+ Partials        520        0     -520     
Flag Coverage Δ
appsec-extension ?
tracer-extension 79.47% <86.95%> (+0.78%) ⬆️
tracer-integrations 79.86% <ø> (+0.37%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
ext/ddtrace.h 62.50% <ø> (ø)
ext/ddtrace.c 75.58% <86.95%> (+2.56%) ⬆️

... and 47 files 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 552b0ef...a3caa32. Read the comment docs.

…ported SAPI/extensions

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
@pr-commenter
Copy link

pr-commenter bot commented Feb 29, 2024

Benchmarks

Benchmark execution time: 2024-02-29 11:28:36

Comparing candidate commit 4d5be5b in PR branch bob/true-global-disable with baseline commit 552b0ef in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 182 metrics, 0 unstable metrics.

Copy link
Member

@realFlowControl realFlowControl left a comment

Choose a reason for hiding this comment

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

Tried with FrankenPHP and I can confirm that this is working! (we found another crash, but this is not related to this one)

@bwoebi bwoebi merged commit 40ea21c into master Feb 29, 2024
591 of 594 checks passed
@bwoebi bwoebi deleted the bob/true-global-disable branch February 29, 2024 13:07
@github-actions github-actions bot added this to the 0.99.0 milestone Feb 29, 2024
bwoebi added a commit that referenced this pull request Mar 4, 2024
…ported SAPI/extensions (#2545)

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
@bwoebi bwoebi modified the milestones: 0.99.0, 0.98.1 Mar 4, 2024
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.

3 participants