Narrow HTTP exception catches in kube_* and openstack legacy#24604
Draft
mwdd146980 wants to merge 2 commits into
Draft
Narrow HTTP exception catches in kube_* and openstack legacy#24604mwdd146980 wants to merge 2 commits into
mwdd146980 wants to merge 2 commits into
Conversation
Contributor
Validation Report
Run Passed validations (20)
|
Contributor
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: 82ab375 | Docs | Datadog PR Page | Give us feedback! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Narrows the
requests.exceptions.*exception catches in the fivekube_*checks and theopenstack_controllerlegacy path to the backend-agnostic HTTP exception family (datadog_checks.base.utils.http_exceptions), and drops the now-unusedimport requestsfrom those modules.kube_dns,kube_proxy,kube_scheduler,kube_controller_manager,kube_metrics_server:except requests.exceptions.RequestExceptionbecomesexcept HTTPError(the agnostic base, same breadth).openstack_controllerlegacy: precise per-type mapping (HTTPErrortoHTTPStatusError,TimeouttoHTTPTimeoutError,ConnectionErrortoHTTPConnectionError), preserving the non-requests catch members and the.response.status_codehandling.Motivation
The base branch (#24516) makes
RequestsWrapperraise only the agnosticHTTPErrorfamily, never rawrequests.exceptions.*. On that base these remainingrequests.exceptions.*catches are dead code: the agnostic exception escapes uncaught, so the CRITICAL service check no longer fires on HTTP errors. Narrowing the catches restores that behavior and removes concrete-backend coupling from shipped integration code.Review checklist (to be filled by reviewers)
qa/requiredif this PR needs QA validation, orqa/skip-qaif it does not. Exactly one of the two is required.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged