Skip to content

Conversation

wantsui
Copy link
Collaborator

@wantsui wantsui commented Jun 3, 2025

Attempt to backport 2.2x for #13554 (comment)

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

…ed mechanisms (#13554)

#13516

https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-py/-/jobs/961877338#L460
=========================== short test summary info
============================
FAILED
tests/integration/test_sampling.py::test_supported_sampling_mechanism -
AssertionError: DATA_JOBS_MONITORING returned {'_dd.propagation_error':
'decoding_error'}
assert {'_dd.propagation_error': 'decoding_error'} !=
{'_dd.propagation_error': 'decoding_error'}
====== 1 failed, 104 passed, 28 skipped, 6 xpassed, 14 warnings in
26.31s ======
Test failed with exit code 1

- [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: Emmett Butler <[email protected]>
(cherry picked from commit 733711e)
@wantsui wantsui changed the base branch from main to 2.21 June 3, 2025 20:55
@wantsui wantsui marked this pull request as ready for review June 4, 2025 01:33
@wantsui wantsui requested review from a team as code owners June 4, 2025 01:33
@wantsui wantsui requested review from ZStriker19 and juanjux June 4, 2025 01:33
Copy link
Contributor

github-actions bot commented Jun 4, 2025

CODEOWNERS have been resolved as:

releasenotes/notes/fix-validate-sampling-decision-logging-561e2ef1c0156b5e.yaml  @DataDog/apm-python
ddtrace/internal/sampling.py                                            @DataDog/apm-sdk-api-python
tests/integration/test_sampling.py                                      @DataDog/apm-core-python
tests/tracer/test_propagation.py                                        @DataDog/apm-sdk-api-python

@pr-commenter
Copy link

pr-commenter bot commented Jun 4, 2025

Benchmarks

Benchmark execution time: 2025-06-05 15:47:24

Comparing candidate commit ec643b9 in PR branch backport-13554-to-2.21 with baseline commit 4076301 in branch 2.21.

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

@emmettbutler emmettbutler changed the title Backport 13554 to 2.21 fix(sampling): validate_sampling_decision giving log warns on supported mechanisms (backport 2.21) Jun 4, 2025
@brettlangdon brettlangdon enabled auto-merge (squash) June 5, 2025 14:51
@brettlangdon brettlangdon merged commit 226ebd5 into 2.21 Jun 5, 2025
766 checks passed
@brettlangdon brettlangdon deleted the backport-13554-to-2.21 branch June 5, 2025 16:03
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.

5 participants