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(pymongo): use json for mongodb.query [backport 2.21] #12449

Open
wants to merge 2 commits into
base: 2.21
Choose a base branch
from

Conversation

ajgajg1134
Copy link
Contributor

@ajgajg1134 ajgajg1134 commented Feb 20, 2025

… (#12311)

Use JSON syntax for mongodb.query tags so that the agent can properly parse the field. This is necessary to avoid the agent failing to parse this field for obfuscation and thereby heavily redacting the actual query.

  • PR author has checked that all the criteria below are met

  • The PR description includes an overview of the change

  • The PR description articulates the motivation for the change

  • The change includes tests OR the PR description describes a testing strategy

  • The PR description notes risks associated with the change, if any

  • Newly-added code is easy to change

  • The change follows the library release note guidelines

  • The change includes or references documentation updates if necessary

  • Backport labels are set (if applicable)

  • Reviewer has checked that all the criteria below are met

  • Title is accurate

  • All changes are related to the pull request's stated goal

  • Avoids breaking API changes

  • Testing strategy adequately addresses listed risks

  • Newly-added code is easy to change

  • Release note makes sense to a user of the library

  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment

  • Backport labels are set in a manner that is consistent with the release branch maintenance
    policy


Co-authored-by: wan [email protected]
Co-authored-by: Emmett Butler [email protected]
(cherry picked from commit bc41007)

Checklist

  • PR author has checked that all the criteria below are met
  • The PR description includes an overview of the change
  • The PR description articulates the motivation for the change
  • The change includes tests OR the PR description describes a testing strategy
  • The PR description notes risks associated with the change, if any
  • Newly-added code is easy to change
  • The change follows the library release note guidelines
  • The change includes or references documentation updates if necessary
  • Backport labels are set (if applicable)

Reviewer Checklist

  • Reviewer has checked that all the criteria below are met
  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Avoids breaking API changes
  • Testing strategy adequately addresses listed risks
  • Newly-added code is easy to change
  • Release note makes sense to a user of the library
  • If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
  • Backport labels are set in a manner that is consistent with the release branch maintenance policy

…#12311)

Use JSON syntax for mongodb.query tags so that the agent can properly
parse the field. This is necessary to avoid the agent failing to parse
this field for obfuscation and thereby heavily redacting the actual
query.

- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

- [x] Reviewer has checked that all the criteria below are met
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

---------

Co-authored-by: wan <[email protected]>
Co-authored-by: Emmett Butler <[email protected]>
(cherry picked from commit bc41007)
@ajgajg1134 ajgajg1134 requested review from a team as code owners February 20, 2025 19:14
Copy link
Contributor

CODEOWNERS have been resolved as:

releasenotes/notes/fix-pymongo-mongodb-query-span-tag-for-agent-230c3205d683ffd2.yaml  @DataDog/apm-python
ddtrace/contrib/internal/pymongo/client.py                              @DataDog/apm-core-python @DataDog/apm-idm-python
tests/contrib/pymongo/test.py                                           @DataDog/apm-core-python @DataDog/apm-idm-python

@datadog-dd-trace-py-rkomorn
Copy link

Datadog Report

Branch report: backport-12311-to-2.21
Commit report: 48c7adc
Test service: dd-trace-py

✅ 0 Failed, 130 Passed, 1378 Skipped, 1m 30.52s Total Time

@pr-commenter
Copy link

pr-commenter bot commented Feb 20, 2025

Benchmarks

Benchmark execution time: 2025-02-20 19:57:53

Comparing candidate commit 48c7adc in PR branch backport-12311-to-2.21 with baseline commit 6a4347f in branch 2.21.

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

@emmettbutler emmettbutler changed the title fix(pymongo): use json for mongodb.query so it can be parsed by agent… fix(pymongo): use json for mongodb.query [backport 2.21] Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants