-
Notifications
You must be signed in to change notification settings - Fork 417
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
base: main
Are you sure you want to change the base?
Conversation
|
Datadog ReportBranch report: ✅ 0 Failed, 87 Passed, 1468 Skipped, 4m 13.7s Total duration (35m 22.71s time saved) |
BenchmarksBenchmark execution time: 2025-01-08 18:39:01 Comparing candidate commit 909975c in PR branch Found 0 performance improvements and 0 performance regressions! Performance is the same for 394 metrics, 2 unstable metrics. |
There was a problem hiding this 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
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. |
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 🔫 |
Botocore sensitive data redaction sets
AWSPayloadTagging.request_redaction_paths
andAWSPayloadTagging.response_redaction_paths
the first time AWSPayloadTagging.expand_payload_as_tags(...) is called.In tests overriding
config.botocore.payload_tagging_request
andconfig.botocore.payload_tagging_request
usingtests.utils.override_config(..)
is not sufficient. We also need to setddtrace._trace.utils_botocore.span_tags._PAYLOAD_TAGGER.validated
toFalse
. 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 withddtrace.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
Reviewer Checklist