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

ci(botocore): fix flaky botocore tests #11872

Merged
merged 5 commits into from
Jan 13, 2025

Conversation

mabdinur
Copy link
Contributor

@mabdinur mabdinur commented Jan 7, 2025

Botocore sensitive data redaction sets AWSPayloadTagging.request_redaction_paths and AWSPayloadTagging.response_redaction_paths the first time AWSPayloadTagging.expand_payload_as_tags(...) is called.

In tests overriding config.botocore.payload_tagging_request and config.botocore.payload_tagging_request using tests.utils.override_config(..) is not sufficient. We also need to set ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated to False. This ensures the overriden botocore configurations are actually used.

Note: This PR does not fix the underlying issue of AWSPayloadTagging configurations becoming out of sync with ddtrace.config.botocore. We will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test would fail: https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

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

@mabdinur mabdinur requested review from a team as code owners January 7, 2025 20:50
Copy link
Contributor

github-actions bot commented Jan 7, 2025

CODEOWNERS have been resolved as:

tests/contrib/botocore/test.py                                          @DataDog/apm-core-python @DataDog/apm-idm-python

@mabdinur mabdinur added the changelog/no-changelog A changelog entry is not required for this PR. label Jan 7, 2025
@datadog-dd-trace-py-rkomorn
Copy link

datadog-dd-trace-py-rkomorn bot commented Jan 7, 2025

Datadog Report

Branch report: munir/make-botocore-test-less-flaky
Commit report: 909975c
Test service: dd-trace-py

✅ 0 Failed, 87 Passed, 1468 Skipped, 4m 13.7s Total duration (35m 22.71s time saved)

@pr-commenter
Copy link

pr-commenter bot commented Jan 7, 2025

Benchmarks

Benchmark execution time: 2025-01-08 18:39:01

Comparing candidate commit 909975c in PR branch munir/make-botocore-test-less-flaky with baseline commit 86a367a in branch main.

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

Copy link
Member

@brettlangdon brettlangdon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be set for all botocore tests? would an auto-use fixture be better? e.g. if someone adds a new test do they need to copy/pasta this setting as well?

example:

@pytest.fixture(autouse=True)
def reset_payload_tagger():    
    span_tags._PAYLOAD_TAGGER.validated = False

@bouwkast
Copy link
Contributor

bouwkast commented Jan 8, 2025

Does this need to be set for all botocore tests? would an auto-use fixture be better? e.g. if someone adds a new test do they need to copy/pasta this setting as well?

example:

@pytest.fixture(autouse=True)
def reset_payload_tagger():    
    span_tags._PAYLOAD_TAGGER.validated = False

This feature is disabled by default so most of these tests will not use this, but if it is as simple as that then I think that is reasonable.

@mabdinur
Copy link
Contributor Author

mabdinur commented Jan 8, 2025

@pytest.fixture(autouse=True)
def reset_payload_tagger():    
    span_tags._PAYLOAD_TAGGER.validated = False

Yup that's a cleaner approach, we can also add this logic to BotocoreTest.setUp(...). Ideally we also should address the underlying issue and not just re-write tests to avoid the broken edge case.

I just want to fix flakies 🔫

@mabdinur mabdinur enabled auto-merge (squash) January 8, 2025 17:52
@mabdinur mabdinur requested a review from brettlangdon January 9, 2025 15:24
@mabdinur mabdinur merged commit 505d148 into main Jan 13, 2025
234 of 235 checks passed
@mabdinur mabdinur deleted the munir/make-botocore-test-less-flaky branch January 13, 2025 18:32
github-actions bot pushed a commit that referenced this pull request Jan 15, 2025
Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.

In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## 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](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)

(cherry picked from commit 505d148)
github-actions bot pushed a commit that referenced this pull request Jan 15, 2025
Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.

In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## 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](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)

(cherry picked from commit 505d148)
github-actions bot pushed a commit that referenced this pull request Jan 15, 2025
Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.

In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## 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](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)

(cherry picked from commit 505d148)
erikayasuda pushed a commit that referenced this pull request Jan 15, 2025
Backport 505d148 from #11872 to 2.17.

Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.
 
In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## Reviewer Checklist
- [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: Munir Abdinur <munir.abdinur@datadoghq.com>
erikayasuda pushed a commit that referenced this pull request Jan 15, 2025
Backport 505d148 from #11872 to 2.18.

Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.
 
In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## Reviewer Checklist
- [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: Munir Abdinur <munir.abdinur@datadoghq.com>
erikayasuda pushed a commit that referenced this pull request Jan 15, 2025
Backport 505d148 from #11872 to 2.19.

Botocore sensitive data redaction sets
`AWSPayloadTagging.request_redaction_paths` and
`AWSPayloadTagging.response_redaction_paths` the first time
[AWSPayloadTagging.expand_payload_as_tags(...)](https://github.com/DataDog/dd-trace-py/blob/4970e6d0e8f6787e841576e6229ee572d743e9e8/ddtrace/_trace/utils_botocore/aws_payload_tagging.py#L83)
is called.
 
In tests overriding `config.botocore.payload_tagging_request` and
`config.botocore.payload_tagging_request` using
`tests.utils.override_config(..)` is not sufficient. We also need to set
`ddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated` to
`False`. This ensures the overriden botocore configurations are actually
used.

Note: This PR does not fix the underlying issue of `AWSPayloadTagging`
configurations becoming out of sync with `ddtrace.config.botocore`. We
will need to address this bug in a future PR.

Depending on the order the tests were run the following snapshot test
would fail:
https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/80321/workflows/54bb5dd9-9c50-4e2a-afeb-e168c6c1e6d9/jobs/4394672

## Checklist
- [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))

## Reviewer Checklist
- [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: Munir Abdinur <munir.abdinur@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants