-
Notifications
You must be signed in to change notification settings - Fork 323
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
Inject trace info as comment to MongoDB operation when dbm propagation is enabled. #5230
Conversation
Overall package sizeSelf size: 8.69 MB Dependency sizes| name | version | self size | total size | |------|---------|-----------|------------| | @datadog/libdatadog | 0.4.0 | 29.44 MB | 29.44 MB | | @datadog/native-appsec | 8.4.0 | 19.25 MB | 19.26 MB | | @datadog/native-iast-taint-tracking | 3.3.0 | 13.77 MB | 13.78 MB | | @datadog/pprof | 5.5.1 | 9.79 MB | 10.17 MB | | protobufjs | 7.2.5 | 2.77 MB | 5.16 MB | | @datadog/native-iast-rewriter | 2.8.0 | 2.6 MB | 2.74 MB | | @opentelemetry/core | 1.14.0 | 872.87 kB | 1.47 MB | | @datadog/native-metrics | 3.1.0 | 1.06 MB | 1.46 MB | | @opentelemetry/api | 1.8.0 | 1.21 MB | 1.21 MB | | import-in-the-middle | 1.11.2 | 112.74 kB | 835.4 kB | | source-map | 0.7.4 | 226 kB | 226 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | lru-cache | 7.18.3 | 133.92 kB | 133.92 kB | | pprof-format | 2.1.0 | 111.69 kB | 111.69 kB | | @datadog/sketches-js | 2.1.0 | 109.9 kB | 109.9 kB | | lodash.sortby | 4.7.0 | 75.76 kB | 75.76 kB | | ignore | 5.3.2 | 53.63 kB | 53.63 kB | | shell-quote | 1.8.1 | 44.96 kB | 44.96 kB | | istanbul-lib-coverage | 3.2.0 | 29.34 kB | 29.34 kB | | rfdc | 1.3.1 | 25.21 kB | 25.21 kB | | @isaacs/ttlcache | 1.4.1 | 25.2 kB | 25.2 kB | | tlhunter-sorted-set | 0.1.0 | 24.94 kB | 24.94 kB | | limiter | 1.1.5 | 23.17 kB | 23.17 kB | | dc-polyfill | 0.1.4 | 23.1 kB | 23.1 kB | | retry | 0.13.1 | 18.85 kB | 18.85 kB | | semifies | 1.0.0 | 15.84 kB | 15.84 kB | | jest-docblock | 29.7.0 | 8.99 kB | 12.76 kB | | crypto-randomuuid | 1.0.0 | 11.18 kB | 11.18 kB | | ttl-set | 1.0.0 | 4.61 kB | 9.69 kB | | path-to-regexp | 0.1.12 | 6.6 kB | 6.6 kB | | koalas | 1.0.2 | 6.47 kB | 6.47 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 ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5230 +/- ##
==========================================
+ Coverage 81.09% 81.25% +0.15%
==========================================
Files 480 487 +7
Lines 21438 21715 +277
==========================================
+ Hits 17386 17645 +259
- Misses 4052 4070 +18 ☔ View full report in Codecov by Sentry. |
Datadog ReportBranch report: ✅ 0 Failed, 625 Passed, 0 Skipped, 12m 29.29s Total Time |
BenchmarksBenchmark execution time: 2025-02-14 17:10:26 Comparing candidate commit 5f8d92d in PR branch Found 0 performance improvements and 0 performance regressions! Performance is the same for 915 metrics, 18 unstable metrics. |
Co-authored-by: Bryan English <bryan.english@datadoghq.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tests and plugin change looks good to me. But we should put the injection functionality within the same function as the existing DBM propagation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left some comments requesting changes
@@ -37,7 +37,7 @@ services: | |||
ports: | |||
- "127.0.0.1:6379:6379" | |||
mongo: | |||
image: circleci/mongo:3.6 | |||
image: circleci/mongo:4.4 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bump mongo image to 4.4 because prior to 4.4 only str comments are allowed. newer mongo version allows us to test array comments.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks for making those changes!
Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
…n is enabled. (#5230) * inject dbm trace comment * add service mode test * add unit test to verify both full and service mode * update test * fix lint * use find query * fix timeout * remove done * add tests to mongodb-core * fix service mode full * remove custom timeout * Update packages/dd-trace/src/plugins/database.js Co-authored-by: Bryan English <bryan.english@datadoghq.com> * merge duplicate code * add tests * add tests to verify command with comments * fix lint * Update index.js Co-authored-by: Thomas Hunter II <tlhunter@datadog.com> --------- Co-authored-by: Bryan English <bryan.english@datadoghq.com> Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
…n is enabled. (#5230) * inject dbm trace comment * add service mode test * add unit test to verify both full and service mode * update test * fix lint * use find query * fix timeout * remove done * add tests to mongodb-core * fix service mode full * remove custom timeout * Update packages/dd-trace/src/plugins/database.js Co-authored-by: Bryan English <bryan.english@datadoghq.com> * merge duplicate code * add tests * add tests to verify command with comments * fix lint * Update index.js Co-authored-by: Thomas Hunter II <tlhunter@datadog.com> --------- Co-authored-by: Bryan English <bryan.english@datadoghq.com> Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
What does this PR do?
This PR introduces
DBM propagation mode
support for MongoDB operations, aligning with the existing functionality in relational database such as PostgreSQL and MySQL. DBM propagation enables linking APM traces with DBM samples through trace comment injection, providing enhanced observability into database operations.Key Features:
The tracer now supports injecting trace metadata into MongoDB commands using the comment field.
Users can configure the behavior via the dbmPropagationMode setting:
disabled
– No trace metadata is injected.service
– Injects only service-level information.full
– Injects both service and span-level information.Example Usage:
Set
dbmPropagationMode
in tracer configWith DBM propagation enabled, MongoDB commands will include a trace comment similar to:


Motivation
Improved Traceability:
With trace information attached, MongoDB operation samples in DBM can now be linked to APM traces, allowing users to analyze query performance in the context of distributed tracing.
https://datadoghq.atlassian.net/browse/DBMON-4990
Plugin Checklist
Additional Notes