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(elasticsearch): Hook not being removed #2616

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Conversation

PROFeNoM
Copy link
Contributor

@PROFeNoM PROFeNoM commented Apr 5, 2024

Description

As mentioned in this GH comment from #2427, an elasticsearch hook wasn't removed

[ddtrace] [error] Could not add hook to Elastic\Elasticsearch\Endpoints\Indices::__construct with more than datadog.trace.hook_limit = 100 installed hooks in /opt/datadog-php/dd-trace-sources/bridge/_generated_integrations.php on line 5437; This message is only displayed once. Specify DD_TRACE_ONCE_LOGS=0 to show all messages.

dd_untrace was called on the Trait while it should have been called on the hooked class. With this PR, the installed hook is removed on the correct class.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

@PROFeNoM PROFeNoM requested a review from a team as a code owner April 5, 2024 14:19
@PROFeNoM PROFeNoM self-assigned this Apr 5, 2024
@PROFeNoM PROFeNoM added 🐛 bug Something isn't working cat:integration labels Apr 5, 2024
@codecov-commenter
Copy link

codecov-commenter commented Apr 5, 2024

Codecov Report

Merging #2616 (d8ba1ab) into master (0d08bf6) will decrease coverage by 12.14%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##             master    #2616       +/-   ##
=============================================
- Coverage     76.53%   64.39%   -12.14%     
  Complexity     2609     2609               
=============================================
  Files           217      217               
  Lines         23318    23319        +1     
=============================================
- Hits          17846    15016     -2830     
- Misses         5472     8303     +2831     
Flag Coverage Δ
tracer-extension 78.70% <ø> (ø)
tracer-php 46.83% <100.00%> (-27.03%) ⬇️

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

Files Coverage Δ
...ions/ElasticSearch/V8/ElasticSearchIntegration.php 99.14% <100.00%> (+<0.01%) ⬆️

... and 19 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 0d08bf6...d8ba1ab. Read the comment docs.

@pr-commenter
Copy link

pr-commenter bot commented Apr 5, 2024

Benchmarks

Benchmark execution time: 2024-04-05 14:50:46

Comparing candidate commit d8ba1ab in PR branch alex/issue/gh2427-ter with baseline commit 0d08bf6 in branch master.

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

scenario:ComposerTelemetryBench/benchTelemetryParsing-opcache

  • 🟥 execution_time [+1.276µs; +3.124µs] or [+2.271%; +5.559%]

scenario:PDOBench/benchPDOBaseline

  • 🟥 execution_time [+5.469µs; +12.953µs] or [+3.067%; +7.263%]

scenario:PDOBench/benchPDOBaseline-opcache

  • 🟩 execution_time [-14.216µs; -6.178µs] or [-7.704%; -3.348%]

Copy link
Collaborator

@bwoebi bwoebi left a comment

Choose a reason for hiding this comment

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

Looks good, thanks for tracking this down :-)

@PROFeNoM PROFeNoM merged commit f244736 into master Apr 5, 2024
543 of 557 checks passed
@PROFeNoM PROFeNoM deleted the alex/issue/gh2427-ter branch April 5, 2024 15:14
@github-actions github-actions bot added this to the 0.100.0 milestone Apr 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛 bug Something isn't working cat:integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants