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(structlog): ensures processor injection is not duplicated [backport 2.7] #8760

Merged
merged 2 commits into from
Mar 26, 2024

Conversation

github-actions[bot]
Copy link

Backport 6f1ecfd from #8713 to 2.7.

Fixes #8699

Note that when the user has a configuration with no processors, the instrumentation does not inject any processors since there must be a rendered processor for a valid configuration

Checklist

  • Change(s) are motivated and described in the PR description
  • Testing strategy is described if automated tests are not included in the PR
  • Risks are described (performance impact, potential for breakage, maintainability)
  • Change is maintainable (easy to change, telemetry, documentation)
  • Library release note guidelines are followed or label changelog/no-changelog is set
  • Documentation is included (in-code, generated user docs, public corp docs)
  • Backport labels are set (if applicable)
  • If this PR changes the public interface, I've notified @DataDog/apm-tees.
  • If change touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from @DataDog/security-design-and-guidance.

Reviewer Checklist

  • Title is accurate
  • All changes are related to the pull request's stated goal
  • Description motivates each change
  • Avoids breaking API 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

Fixes #8699

Note that when the user has a configuration with no processors, the
instrumentation _does not_ inject any processors since there must be a
rendered processor for a valid configuration

## 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`.
- [x] If change touches code that signs or publishes builds or packages,
or handles credentials of any kind, I've requested a review from
`@DataDog/security-design-and-guidance`.

## Reviewer Checklist

- [x] Title is accurate
- [x] All changes are related to the pull request's stated goal
- [x] Description motivates each change
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- [x] Testing strategy adequately addresses listed risks
- [x] Change is maintainable (easy to change, telemetry, documentation)
- [x] Release note makes sense to a user of the library
- [x] Author has acknowledged and discussed the performance implications
of this PR as reported in the benchmarks PR comment
- [x] 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)

(cherry picked from commit 6f1ecfd)
@datadog-dd-trace-py-rkomorn
Copy link

Datadog Report

Branch report: backport-8713-to-2.7
Commit report: b0d06ce
Test service: dd-trace-py

✅ 0 Failed, 192 Passed, 0 Skipped, 2m 47.56s Total duration (3.72s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Mar 25, 2024

Benchmarks

Benchmark execution time: 2024-03-25 16:40:32

Comparing candidate commit b0d06ce in PR branch backport-8713-to-2.7 with baseline commit 94ded6f in branch 2.7.

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

scenario:httppropagationextract-empty_headers

  • 🟥 max_rss_usage [+456.410KB; +735.526KB] or [+2.146%; +3.459%]

scenario:httppropagationextract-wsgi_empty_headers

  • 🟥 max_rss_usage [+437.676KB; +780.884KB] or [+2.082%; +3.714%]

scenario:httppropagationextract-wsgi_invalid_trace_id_header

  • 🟥 max_rss_usage [+897.420KB; +974.042KB] or [+4.291%; +4.658%]

@emmettbutler emmettbutler enabled auto-merge (squash) March 25, 2024 18:25
@mabdinur mabdinur closed this Mar 25, 2024
auto-merge was automatically disabled March 25, 2024 18:37

Pull request was closed

@mabdinur mabdinur reopened this Mar 25, 2024
@mabdinur mabdinur enabled auto-merge (squash) March 25, 2024 18:37
@mabdinur mabdinur merged commit 52856c5 into 2.7 Mar 26, 2024
63 checks passed
@mabdinur mabdinur deleted the backport-8713-to-2.7 branch March 26, 2024 03:21
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.

None yet

3 participants