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

Clean Integration configuration #2598

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Conversation

bwoebi
Copy link
Collaborator

@bwoebi bwoebi commented Mar 26, 2024

Description

Also avoid the extra Util\Common class and just stuff it into the global Integration.

Simplifies the code a bit I hope.

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

@bwoebi bwoebi requested a review from a team as a code owner March 26, 2024 17:15
@pr-commenter
Copy link

pr-commenter bot commented Mar 26, 2024

Benchmarks

Benchmark execution time: 2024-04-15 12:38:57

Comparing candidate commit 1694553 in PR branch bob/clean-integration-config with baseline commit bbd3a9c in branch master.

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

scenario:TraceSerializationBench/benchSerializeTrace

  • 🟥 execution_time [+7.243µs; +11.557µs] or [+4.041%; +6.447%]

@bwoebi bwoebi changed the base branch from ddtrace-1.0.0 to master April 12, 2024 14:17
@@ -454,7 +446,7 @@ public function setGenericTags(
$span->meta[Tag::MQ_PROTOCOL_VERSION] = $this->protocolVersion;

if ($exception) {
$this->setError($span, $exception);
$span->exception = $exception;
Copy link
Contributor

Choose a reason for hiding this comment

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

Coding style: there is an extra space for every $this->setError() conversion

@bwoebi bwoebi force-pushed the bob/clean-integration-config branch from 569c575 to 7296383 Compare April 12, 2024 14:56
@codecov-commenter
Copy link

codecov-commenter commented Apr 12, 2024

Codecov Report

Merging #2598 (49c8faa) into master (bbd3a9c) will increase coverage by 1.56%.
The diff coverage is 84.50%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2598      +/-   ##
============================================
+ Coverage     77.78%   79.35%   +1.56%     
+ Complexity     2240     2195      -45     
============================================
  Files           228      199      -29     
  Lines         26036    21942    -4094     
  Branches        986        0     -986     
============================================
- Hits          20253    17412    -2841     
+ Misses         5257     4530     -727     
+ Partials        526        0     -526     
Flag Coverage Δ
appsec-extension ?
tracer-extension 78.55% <ø> (ø)
tracer-php 80.49% <84.50%> (-0.06%) ⬇️

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

Files Coverage Δ
src/DDTrace/Integrations/AMQP/AMQPIntegration.php 98.24% <100.00%> (-0.02%) ⬇️
...DTrace/Integrations/CakePHP/CakePHPIntegration.php 87.80% <100.00%> (ø)
...grations/CodeIgniter/V2/CodeIgniterIntegration.php 50.00% <ø> (-0.65%) ⬇️
src/DDTrace/Integrations/Curl/CurlIntegration.php 92.48% <ø> (-0.09%) ⬇️
...ions/ElasticSearch/V1/ElasticSearchIntegration.php 90.44% <ø> (-0.14%) ⬇️
...ions/ElasticSearch/V8/ElasticSearchIntegration.php 99.13% <ø> (-0.02%) ⬇️
...race/Integrations/Eloquent/EloquentIntegration.php 100.00% <ø> (ø)
src/DDTrace/Integrations/Exec/ExecIntegration.php 50.78% <ø> (+0.31%) ⬆️
.../DDTrace/Integrations/Guzzle/GuzzleIntegration.php 94.36% <ø> (-0.16%) ⬇️
src/DDTrace/Integrations/Integration.php 75.92% <100.00%> (+9.82%) ⬆️
... and 27 more

... and 26 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 bbd3a9c...49c8faa. Read the comment docs.

@bwoebi bwoebi force-pushed the bob/clean-integration-config branch from 7296383 to 17cf76d Compare April 12, 2024 17:30
Copy link

github-actions bot commented Apr 12, 2024

Snapshots difference summary

The following differences have been observed in committed snapshots. It is meant to help the reviewer.
The diff is simplistic, so please check some files anyway while we improve it.

If you need to update snapshots, please refer to CONTRIBUTING.md

1 occurrences of :

- "parent_id": 14729891649013051183
+ "parent_id": 18234754190136783259

1 occurrences of :

- "runtime-id": "1b0e863a-39eb-40f0-8723-5446bc1f418b"
+ "_dd.p.tid": "66196c9000000000"
+ "runtime-id": "c8243154-ab37-45b8-8195-3a5c13730796"

1 occurrences of :

- "error.stack": "#0 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/Routing/AccessAwareRouter.php(90): Drupal\\Core\\Routing\\Router->matchRequest()\n#1 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/EventListener/RouterListener.php(105): Drupal\\Core\\Routing\\AccessAwareRouter->matchRequest()\n#2 [internal function]: Symfony\\Component\\HttpKernel\\EventListener\\RouterListener->onKernelRequest()\n#3 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(111): call_user_func()\n#4 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(158): Drupal\\Component\\EventDispatcher\\ContainerAwareEventDispatcher->dispatch()\n#5 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(76): Symfony\\Component\\HttpKernel\\HttpKernel->handleRaw()\n#6 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/Session.php(58): Symfony\\Component\\HttpKernel\\HttpKernel->handle()\n#7 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php(48): Drupal\\Core\\StackMiddleware\\Session->handle()\n#8 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php(48): Drupal\\Core\\StackMiddleware\\KernelPreHandle->handle()\n#9 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php(51): Drupal\\Core\\StackMiddleware\\ReverseProxyMiddleware->handle()\n#10 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php(51): Drupal\\Core\\StackMiddleware\\NegotiationMiddleware->handle()\n#11 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/DrupalKernel.php(704): Drupal\\Core\\StackMiddleware\\StackedHttpKernel->handle()\n#12 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/index.php(19): Drupal\\Core\\DrupalKernel->handle()\n#13 {main}\n\nNext Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException: No route found for \"GET http://localhost:9999/does_not_exist\" in /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/EventListener/RouterListener.php:127\nStack trace:\n#0 [internal function]: Symfony\\Component\\HttpKernel\\EventListener\\RouterListener->onKernelRequest()\n#1 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(111): call_user_func()\n#2 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(158): Drupal\\Component\\EventDispatcher\\ContainerAwareEventDispatcher->dispatch()\n#3 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(76): Symfony\\Component\\HttpKernel\\HttpKernel->handleRaw()\n#4 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/Session.php(58): Symfony\\Component\\HttpKernel\\HttpKernel->handle()\n#5 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php(48): Drupal\\Core\\StackMiddleware\\Session->handle()\n#6 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php(48): Drupal\\Core\\StackMiddleware\\KernelPreHandle->handle()\n#7 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php(51): Drupal\\Core\\StackMiddleware\\ReverseProxyMiddleware->handle()\n#8 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php(51): Drupal\\Core\\StackMiddleware\\NegotiationMiddleware->handle()\n#9 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/DrupalKernel.php(704): Drupal\\Core\\StackMiddleware\\StackedHttpKernel->handle()\n#10 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/index.php(19): Drupal\\Core\\DrupalKernel->handle()\n#11 {main}"
+ "_dd1.sr.eausr": 1.0
+ "error.stack": "#0 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/Routing/AccessAwareRouter.php(90): Drupal\\Core\\Routing\\Router->matchRequest()\n#1 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/EventListener/RouterListener.php(105): Drupal\\Core\\Routing\\AccessAwareRouter->matchRequest()\n#2 [internal function]: Symfony\\Component\\HttpKernel\\EventListener\\RouterListener->onKernelRequest()\n#3 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(111): call_user_func()\n#4 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(157): Drupal\\Component\\EventDispatcher\\ContainerAwareEventDispatcher->dispatch()\n#5 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(76): Symfony\\Component\\HttpKernel\\HttpKernel->handleRaw()\n#6 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/Session.php(58): Symfony\\Component\\HttpKernel\\HttpKernel->handle()\n#7 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php(48): Drupal\\Core\\StackMiddleware\\Session->handle()\n#8 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php(48): Drupal\\Core\\StackMiddleware\\KernelPreHandle->handle()\n#9 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php(51): Drupal\\Core\\StackMiddleware\\ReverseProxyMiddleware->handle()\n#10 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php(51): Drupal\\Core\\StackMiddleware\\NegotiationMiddleware->handle()\n#11 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/DrupalKernel.php(704): Drupal\\Core\\StackMiddleware\\StackedHttpKernel->handle()\n#12 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/index.php(19): Drupal\\Core\\DrupalKernel->handle()\n#13 {main}\n\nNext Symfony\\Component\\HttpKernel\\Exception\\NotFoundHttpException: No route found for \"GET http://localhost:9999/does_not_exist\" in /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/EventListener/RouterListener.php:127\nStack trace:\n#0 [internal function]: Symfony\\Component\\HttpKernel\\EventListener\\RouterListener->onKernelRequest()\n#1 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php(111): call_user_func()\n#2 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(157): Drupal\\Component\\EventDispatcher\\ContainerAwareEventDispatcher->dispatch()\n#3 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/vendor/symfony/http-kernel/HttpKernel.php(76): Symfony\\Component\\HttpKernel\\HttpKernel->handleRaw()\n#4 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/Session.php(58): Symfony\\Component\\HttpKernel\\HttpKernel->handle()\n#5 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/KernelPreHandle.php(48): Drupal\\Core\\StackMiddleware\\Session->handle()\n#6 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/ReverseProxyMiddleware.php(48): Drupal\\Core\\StackMiddleware\\KernelPreHandle->handle()\n#7 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/NegotiationMiddleware.php(51): Drupal\\Core\\StackMiddleware\\ReverseProxyMiddleware->handle()\n#8 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php(51): Drupal\\Core\\StackMiddleware\\NegotiationMiddleware->handle()\n#9 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/core/lib/Drupal/Core/DrupalKernel.php(704): Drupal\\Core\\StackMiddleware\\StackedHttpKernel->handle()\n#10 /home/circleci/datadog/tests/Frameworks/Drupal/Version_10_1/index.php(19): Drupal\\Core\\DrupalKernel->handle()\n#11 {main}"

1 occurrences of :

- "parent_id": 4458984828784253894
+ "parent_id": 1011645146387165012

1 occurrences of :

- "runtime-id": "9909a648-1886-44d2-b341-b1ddc0f62f34"
+ "_dd.p.tid": "66196c8f00000000"
+ "runtime-id": "c8243154-ab37-45b8-8195-3a5c13730796"

1 occurrences of :

- "parent_id": 16602002948505053039
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 15899644691888394517

1 occurrences of :

- "runtime-id": "cecb7d5b-eb5a-49f8-8374-29dce2d6fce6"
+ "_dd.p.tid": "66196c8d00000000"
+ "runtime-id": "c8243154-ab37-45b8-8195-3a5c13730796"

1 occurrences of :

- "parent_id": 8612363250016351856
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 8128476922872635117

1 occurrences of :

- "runtime-id": "692423cd-81b3-449e-a67e-43150df99f74"
+ "_dd.p.tid": "66196d5a00000000"
+ "runtime-id": "1fd18b54-8b5e-4ff6-8aa2-cd7356ba5bf6"

1 occurrences of :

- "parent_id": 10065802695341457060
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 6944474013131017888

1 occurrences of :

- "runtime-id": "692423cd-81b3-449e-a67e-43150df99f74"
+ "_dd.p.tid": "66196d5900000000"
+ "runtime-id": "1fd18b54-8b5e-4ff6-8aa2-cd7356ba5bf6"

1 occurrences of :

- "parent_id": 3272765232554916325
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 12358919399676608040

1 occurrences of :

- "runtime-id": "692423cd-81b3-449e-a67e-43150df99f74"
+ "_dd.p.tid": "66196d5700000000"
+ "runtime-id": "1fd18b54-8b5e-4ff6-8aa2-cd7356ba5bf6"

1 occurrences of :

- "parent_id": 3252206533936179831
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 3103709691901046446

1 occurrences of :

- "runtime-id": "7a7b1e1f-04e8-41dc-82bd-81f24ef6e0a4"
+ "_dd.p.tid": "66196d8700000000"
+ "runtime-id": "0c81a719-e9e9-42f6-b426-92236791f086"

1 occurrences of :

- "parent_id": 4278622301037098128
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 13887724427007327375

1 occurrences of :

- "runtime-id": "3afe4427-fcda-4ade-bdc5-572a8c5f8b12"
+ "_dd.p.tid": "66196d8700000000"
+ "runtime-id": "0c81a719-e9e9-42f6-b426-92236791f086"

1 occurrences of :

- "parent_id": 17928482264370609219
+ "_dd1.sr.eausr": 1.0
+ "parent_id": 9047586870474301699

1 occurrences of :

- "runtime-id": "7a7b1e1f-04e8-41dc-82bd-81f24ef6e0a4"
+ "_dd.p.tid": "66196d8500000000"
+ "runtime-id": "0c81a719-e9e9-42f6-b426-92236791f086"

@bwoebi bwoebi force-pushed the bob/clean-integration-config branch 5 times, most recently from 1694553 to 49c8faa Compare April 15, 2024 13:01
Copy link
Contributor

@PROFeNoM PROFeNoM left a comment

Choose a reason for hiding this comment

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

LGTM 🧹 🧹

Also avoid the extra Util\Common class and just stuff it into the global Integration.
@bwoebi bwoebi force-pushed the bob/clean-integration-config branch from 49c8faa to 742421d Compare April 15, 2024 20:07
@bwoebi bwoebi merged commit 95a0831 into master Apr 15, 2024
5 of 6 checks passed
@bwoebi bwoebi deleted the bob/clean-integration-config branch April 15, 2024 20:07
@github-actions github-actions bot added profiling Relates to the Continuous Profiler tracing area:asm labels Apr 15, 2024
@github-actions github-actions bot added this to the 0.99.0 milestone Apr 15, 2024
@bwoebi bwoebi modified the milestones: 0.99.0, 1.0.0beta1 Apr 15, 2024
morrisonlevi pushed a commit that referenced this pull request Apr 16, 2024
Also avoid the extra Util\Common class and just stuff it into the global Integration.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:asm profiling Relates to the Continuous Profiler tracing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants