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

Fix backtraces 8.4 #2812

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Conversation

estringana
Copy link
Contributor

Description

PHP 8.4 changed the string version of a closure. This PR filters out ddtrace closures on 8.4.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

@estringana estringana changed the title Fix backtrace 8.4 Fix backtraces 8.4 Aug 26, 2024
@estringana estringana changed the base branch from master to florian/php-8.4 August 26, 2024 08:57
@realFlowControl realFlowControl self-assigned this Aug 26, 2024
@codecov-commenter
Copy link

codecov-commenter commented Aug 26, 2024

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 78.49%. Comparing base (81fae34) to head (79397be).
Report is 1 commits behind head on florian/php-8.4.

Files Patch % Lines
appsec/src/extension/backtrace.c 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@                  Coverage Diff                  @@
##             florian/php-8.4    #2812      +/-   ##
=====================================================
- Coverage              78.49%   78.49%   -0.01%     
  Complexity              2516     2516              
=====================================================
  Files                    173      173              
  Lines                  18677    18679       +2     
  Branches                 975      976       +1     
=====================================================
+ Hits                   14661    14662       +1     
  Misses                  3479     3479              
- Partials                 537      538       +1     
Flag Coverage Δ
appsec-extension 69.11% <66.66%> (-0.01%) ⬇️
tracer-extension 78.20% <ø> (ø)
tracer-php 82.27% <ø> (ø)

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

Files Coverage Δ
appsec/src/extension/backtrace.c 70.70% <66.66%> (-0.27%) ⬇️

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 81fae34...79397be. Read the comment docs.

@pr-commenter
Copy link

pr-commenter bot commented Aug 26, 2024

Benchmarks

Benchmark execution time: 2024-08-26 09:10:11

Comparing candidate commit 79397be in PR branch estringana/fix-backtrace-8.4 with baseline commit 81fae34 in branch florian/php-8.4.

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

@estringana estringana requested a review from cataphract August 26, 2024 10:09
@realFlowControl realFlowControl marked this pull request as ready for review August 26, 2024 10:44
@realFlowControl realFlowControl requested a review from a team as a code owner August 26, 2024 10:44
@realFlowControl realFlowControl merged commit 86afb44 into florian/php-8.4 Aug 26, 2024
502 of 593 checks passed
@realFlowControl realFlowControl deleted the estringana/fix-backtrace-8.4 branch August 26, 2024 10:44
bwoebi added a commit that referenced this pull request Oct 30, 2024
* add PHP 8.4

* PHP 8.4 interceptor compatibility

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Add missing dependencies in CircleCI jobs

* pecl php 8.4

* make appsec compile with PHP 8.4

* Add PHP 8.4 windows support

* run verify php 8.4 only on alpine

* update prof correctness to new closure frames

* Reduce visual studio parts needing to be installed

* fix prof correctness

* fix PHP 8.4 closure tests

* update PHP 8.4 to beta3

* fix xdebug

* fix circleci

* fix appsec

* Fix warning:

Warning: JIT on AArch64 doesn't support opcache.jit_buffer_size above 128M. in Unknown on line 0
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Fix closures on PHP 8.4 (#2812)

* update to RC1

* Fix cross-compile

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* update to RC1

* fix tests

* fix xdebug

* fix comment

* set xdebug for loader test

* Adapt to PHP 8.4 stuff

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* fix build extension

* update to llvm 17

* cmake

* add libltdl-dev for php 7

* add libltdl-dev for php 7

* asdf

* fix warning `as` vs `AS`

* use new asan

* bump llvm to 17

* fix xdebug php 8.3Ä

* Add missing libclang-rt-17-dev

* Include frameless functions in stack walk

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* fix php < 8.4 compile

* fix: warning about unused variable

* perf: PHP 8.4+ doesn't need zend_execute_internal

* add zts to buster php 7

* add tar

* Add clang ASAN handling

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* stuff

* Fix asan stuff

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* updates

* Use cc instead of gcc in CI

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* fix 8.1

* fix

* upadte 8.3 in other OS as well

* Fix compile issues

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* update 8.4 to rc3

* Try fix more compile issues

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* fix llvm vs gcc flags

* fix dns_check_record()

* Fix sidecar asan

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Update php 8.4 windows version

* Fix everything

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Make coverage jobs independent

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Skip ubsan tea tests for PHP 7.0-7.3

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Exclude some tests from running

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* fix cmake asan

* disable code coverage

* Fix tea tests

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* It's forbidden to use EG(uninitialized_zval) in ZTS in startup

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Fix stacktarget handling in zai_hook_safe_finish

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

---------

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Co-authored-by: Bob Weinand <bob.weinand@datadoghq.com>
Co-authored-by: Alejandro Estringana Ruiz <alejandro.estringanaruiz@datadoghq.com>
Co-authored-by: Levi Morrison <levi.morrison@datadoghq.com>
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