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(tracing): lazy importing asyncio should not reset existing trace context [backport 2.7] #9334

Merged
merged 4 commits into from
May 28, 2024

Commits on May 21, 2024

  1. fix(tracing) lazy importing asyncio should not reset existing trace c…

    …ontext (#9272)
    
    This PR introduces two main changes:
    
    1. Do not reset `_DD_CONTEXTVAR` when initializing a
    `DefaultContextProvider`
    2. Explicitly clear `_DD_CONTEXTVAR` after every test in dd-trace-py CI
      1. We also emit a warning, so pytest will show them to us
    
    ## Motivation
    Currently, when
    1. asyncio auto instrumentation is patched
    5. and there's an existing trace context
    6. and `asyncio` is imported
    Then the existing trace context will be reset to None.
    The expected behavior is that the existing trace context should not be
    reset for this kind of lazy imports
    
    ## Checklist
    
    - [x] Change(s) are motivated and described in the PR description
    - [x] Testing strategy is described if automated tests are not included
    in the PR
    - [x] Risks are described (performance impact, potential for breakage,
    maintainability)
    - [x] Change is maintainable (easy to change, telemetry, documentation)
    - [x] [Library release note
    guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
    are followed or label `changelog/no-changelog` is set
    - [x] Documentation is included (in-code, generated user docs, [public
    corp docs](https://github.com/DataDog/documentation/))
    - [x] Backport labels are set (if
    [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
    - [x] If this PR changes the public interface, I've notified
    `@DataDog/apm-tees`.
    
    ## Reviewer Checklist
    
    - [ ] Title is accurate
    - [ ] All changes are related to the pull request's stated goal
    - [ ] Description motivates each change
    - [ ] Avoids breaking
    [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
    changes
    - [ ] Testing strategy adequately addresses listed risks
    - [ ] Change is maintainable (easy to change, telemetry, documentation)
    - [ ] Release note makes sense to a user of the library
    - [ ] 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: Brett Langdon <[email protected]>
    (cherry picked from commit 06b8494)
    joeyzhao2018 authored and github-actions[bot] committed May 21, 2024
    Configuration menu
    Copy the full SHA
    a8a46d3 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    83eb19f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ffecbec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b05e334 View commit details
    Browse the repository at this point in the history