-
Notifications
You must be signed in to change notification settings - Fork 318
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
base: master
Are you sure you want to change the base?
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 21716 +278
==========================================
+ Hits 17386 17646 +260
- Misses 4052 4070 +18 ☔ View full report in Codecov by Sentry. |
Datadog ReportBranch report: ✅ 0 Failed, 628 Passed, 0 Skipped, 14m 56.72s Total Time |
BenchmarksBenchmark execution time: 2025-02-12 22:44:05 Comparing candidate commit 470722f in PR branch Found 0 performance improvements and 0 performance regressions! Performance is the same for 907 metrics, 26 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.
if (command.comment) { | ||
// if the command already has a comment, append the dbm trace comment | ||
if (typeof command.comment === 'string') { | ||
command.comment += `,${dbmTraceComment}` |
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.
Just because of curiosity, why are we appending the DBM comment to the end of the command? As opposed to previous MySQL injection where we prepend it to the beginning of the comment.
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.
This is due the how MongoDB handles database operations as compared to relational database like mysql. MongoDB database commands are sent as object instead of SQL string. In mysql we chose to prepend comment to the beginning of the SQL statement because we want to avoid appending comment after optional trailing ;
. We don't have such edge cases for MongoDB because comment
is an attribute in the command object. I chose append so that the tracer comment appears after user comment.
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.
Can you add a test that ensures we still work even when the user provides a comment? It looks like the comments can be a string or an array. Can you create a test for both situations? It should be sufficient to add this to only one of the two test files.
Is whatever DBM doing on the backend compatible with both string and array approaches? I'm sure it is but just want to make sure.
Also, with the comment concatenation approach is there any user-supplied comment pattern that can break parsing of the DBM comment? E.g. if the user sets a comment to foo=
or ,,,
or asdf"
?
Does the backend only consider the first or last occurrence of DBM comment fields? If it's just the first then the comment should be prepended, and if it's the last it should be appended like you're doing here. E.g. if the user comment is ddpv=fooboar
does the real ddpv=1.2.3
appended by the tracer still work as expected?
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.
Test cases updated to cover command with str or array comments.
Regarding prepend vs. append, DBM extracts tags from raw comments. The last key:value pair wins when it comes to duplicate keys.
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.
with the comment concatenation approach is there any user-supplied comment pattern that can break parsing of the DBM comment? E.g. if the user sets a comment to foo= or ,,, or asdf"
Any user supplied comments that do not follow the key='value'
style will be safely ignored. DBM backend extracts the key='value' pair from the comment and leaves the comment untouched.
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.
Is whatever DBM doing on the backend compatible with both string and array approaches?
DBM backend unmarshals both string and array into an array.
e3015f5
to
145b3bc
Compare
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.
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:
![image](https://private-user-images.githubusercontent.com/4964070/411071026-27530ebd-8016-4639-ab6b-4ad71acefff4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk1MTg5MzgsIm5iZiI6MTczOTUxODYzOCwicGF0aCI6Ii80OTY0MDcwLzQxMTA3MTAyNi0yNzUzMGViZC04MDE2LTQ2MzktYWI2Yi00YWQ3MWFjZWZmZjQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTRUMDczNzE4WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmU3Nzg1MjFjYzFiMjBmM2YxZDg3N2Y5Yjk0YzI5YjRiN2YxOGE1ODMyYmYwYTNhNGQxMjUyNGE1NmRhMjM1NSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.BRx94qviZbYFCZdSfM2MSQnckCYKW94AqpoBVg3VeD8)
![Screenshot 2025-02-07 at 2 49 38 PM](https://private-user-images.githubusercontent.com/4964070/411728576-8ca7f56a-360c-4442-943f-509596236de5.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk1MTg5MzgsIm5iZiI6MTczOTUxODYzOCwicGF0aCI6Ii80OTY0MDcwLzQxMTcyODU3Ni04Y2E3ZjU2YS0zNjBjLTQ0NDItOTQzZi01MDk1OTYyMzZkZTUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTRUMDczNzE4WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YmJiZDg0NDUzYzI4ZTdlMzY1NjBkMjgyNTExNGUzMzRhZjFlYzc0MjBhZTIzYmI5NWQ0NTAyYjRjOTQyOTc3YSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.knAwPQp8xb7B5g-X4K_JB38KA8gvDnMrtvpN1nfSVQs)
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