Skip to content

Fix DBM service#3634

Merged
jbertran merged 4 commits into
masterfrom
jbertran/fix-dddbs
Sep 22, 2023
Merged

Fix DBM service#3634
jbertran merged 4 commits into
masterfrom
jbertran/fix-dddbs

Conversation

@jbertran

@jbertran jbertran commented Sep 14, 2023

Copy link
Copy Markdown
Contributor

What does this PR do?

Use peer service if available for DBM service computation. This repairs DBM issues that stem from the v1 naming schema.

Notes

As a drive-by, I simplified to _tracerConfig for all configuration access. There's no need to keep this at the tracer level.

Plugin Checklist

Additional Notes

@github-actions

github-actions Bot commented Sep 14, 2023

Copy link
Copy Markdown
Contributor

Overall package size

Self size: 5.21 MB
Deduped: 60.7 MB
No deduping: 60.87 MB

Dependency sizes

name version self size total size
@datadog/native-iast-taint-tracking 1.5.0 14.86 MB 14.86 MB
@datadog/native-appsec 4.0.0 14.83 MB 14.83 MB
@datadog/pprof 3.2.0 10.8 MB 11.64 MB
protobufjs 7.2.4 2.74 MB 6.52 MB
@datadog/native-iast-rewriter 2.1.3 2.23 MB 2.32 MB
@opentelemetry/core 1.14.0 872.87 kB 1.47 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.4.1 780.32 kB 780.32 kB
import-in-the-middle 1.4.2 41.4 kB 704.79 kB
msgpack-lite 0.1.26 201.16 kB 281.59 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.5.4 93.4 kB 123.8 kB
@datadog/sketches-js 2.1.0 109.9 kB 109.9 kB
lodash.sortby 4.7.0 75.76 kB 75.76 kB
lru-cache 7.14.0 74.95 kB 74.95 kB
ipaddr.js 2.1.0 60.23 kB 60.23 kB
ignore 5.2.4 51.22 kB 51.22 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
limiter 1.1.5 23.17 kB 23.17 kB
retry 0.13.1 18.85 kB 18.85 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
node-abort-controller 3.1.1 16.89 kB 16.89 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
diagnostics_channel 1.1.0 7.07 kB 7.07 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
methods 1.1.2 5.29 kB 5.29 kB
module-details-from-path 1.0.3 4.47 kB 4.47 kB

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@codecov

codecov Bot commented Sep 14, 2023

Copy link
Copy Markdown

Codecov Report

Merging #3634 (1bb3a0e) into master (8f145bf) will decrease coverage by 0.01%.
Report is 5 commits behind head on master.
The diff coverage is 100.00%.

❗ Current head 1bb3a0e differs from pull request most recent head 2bd4ca4. Consider uploading reports for the commit 2bd4ca4 to get more accurate results

@@            Coverage Diff             @@
##           master    #3634      +/-   ##
==========================================
- Coverage   84.78%   84.78%   -0.01%     
==========================================
  Files         219      219              
  Lines        8961     8960       -1     
  Branches       33       33              
==========================================
- Hits         7598     7597       -1     
  Misses       1363     1363              
Files Changed Coverage Δ
packages/dd-trace/src/opentracing/tracer.js 98.48% <ø> (-0.05%) ⬇️
packages/dd-trace/src/plugin_manager.js 98.57% <100.00%> (ø)
packages/dd-trace/src/plugins/outbound.js 73.33% <100.00%> (+0.91%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@pr-commenter

pr-commenter Bot commented Sep 14, 2023

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2023-09-15 14:49:46

Comparing candidate commit 1bb3a0ea2ad069506d6a739c1a091fe34dcd2364 in PR branch jbertran/fix-dddbs with baseline commit 8f145bf in branch master.

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

scenario:plugin-graphql-with-depth-and-collapse-on-18

  • 🟥 max_rss_usage [+119.726KB; +152.946KB] or [+14.522%; +18.552%]

scenario:plugin-graphql-with-depth-off-18

  • 🟥 max_rss_usage [+122.157KB; +143.391KB] or [+14.863%; +17.447%]

scenario:plugin-graphql-with-depth-on-max-18

  • 🟥 max_rss_usage [+124.165KB; +149.807KB] or [+15.058%; +18.167%]

@jbertran jbertran added bug Something isn't working semver-patch and removed bug Something isn't working labels Sep 15, 2023
@jbertran
jbertran marked this pull request as ready for review September 15, 2023 14:42
@jbertran
jbertran requested review from a team as code owners September 15, 2023 14:42

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This used to always call done but now it only calls done if there is an error. Does this change mean the previous behavior was incorrect?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes - we're done once the agent.use called by withPeerService is done, not before. IIRC this was causing some 'done called twice' output even in successful tests.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm surprised the unused done didn't throw a linter error before

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Indeed. I tried finding where in eslint this would trip up, no-unused-vars's doc seems to suggest it should, but it doesn't...

@jbertran
jbertran merged commit f0bc4cc into master Sep 22, 2023
@khanayan123 khanayan123 mentioned this pull request Sep 26, 2023
@khanayan123 khanayan123 mentioned this pull request Sep 26, 2023
khanayan123 pushed a commit that referenced this pull request Sep 26, 2023
* use peer service in DBM dddbs value if available
* switch to _tracerConfig for peer service config
* fix amqplib plugin load order in tests
* abort plugin load when tracer is uninitialized
khanayan123 pushed a commit that referenced this pull request Sep 26, 2023
* use peer service in DBM dddbs value if available
* switch to _tracerConfig for peer service config
* fix amqplib plugin load order in tests
* abort plugin load when tracer is uninitialized
khanayan123 pushed a commit that referenced this pull request Sep 27, 2023
* use peer service in DBM dddbs value if available
* switch to _tracerConfig for peer service config
* fix amqplib plugin load order in tests
* abort plugin load when tracer is uninitialized
khanayan123 pushed a commit that referenced this pull request Sep 27, 2023
* use peer service in DBM dddbs value if available
* switch to _tracerConfig for peer service config
* fix amqplib plugin load order in tests
* abort plugin load when tracer is uninitialized
@tlhunter
tlhunter deleted the jbertran/fix-dddbs branch January 19, 2024 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants