Agnosticize integrations HTTP error handling (batch 2 of 3)#24547
Open
mwdd146980 wants to merge 3 commits into
Open
Agnosticize integrations HTTP error handling (batch 2 of 3)#24547mwdd146980 wants to merge 3 commits into
mwdd146980 wants to merge 3 commits into
Conversation
3 tasks
Contributor
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: 25fcd34 | Docs | Datadog PR Page | Give us feedback! |
Narrow self.http catch sites to backend-agnostic http_exceptions and swap interception-path tests to the agnostic surface for: fly_io, gitlab, harbor, hdfs_datanode, hdfs_namenode, ibm_db2, kubelet, kyototycoon, mapreduce, marathon, marklogic, mesos_master.
8677a25 to
633eb98
Compare
… review) ConnectTimeout translates to HTTPTimeoutError, a sibling of HTTPConnectionError, so it escaped `except (HTTPStatusError, HTTPConnectionError)` and skipped the CRITICAL connect service check that master emitted (master caught it via requests ConnectionError). Add HTTPTimeoutError to the catch.
… review) The test body raises HTTPStatusError, not a requests HTTPError, so rename test_report_node_metrics_kubernetes1_18_requests_httperror to ..._httpstatuserror. Test-only, no behavior change.
steveny91
approved these changes
Jul 14, 2026
Contributor
Validation ReportAll 21 validations passed. Show details
|
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?
Removes backend-specific
requestsreferences from the next set of integrations, leaving each on the HTTP-agnostic surface only. Per integration it narrowsself.httpcatch sites todatadog_checks.base.utils.http_exceptions.*(no dual-catch), swaps barefrom requests import ...to agnostic names, drops now-unusedrequestsimports, and updates the interception-path tests (agnostic exceptions,MockHTTPResponse, and themock_http/mock_openmetrics_httpfixtures).Integrations covered (batch 2 of 3): fly_io, gitlab, harbor, hdfs_datanode, hdfs_namenode, ibm_db2, kubelet, kyototycoon, mapreduce, marathon, marklogic, mesos_master.
The backend stays
requests. Behavior is unchanged. This PR is based directly on #24516 for now. When #24516 is approved, it will be merged into #22676, and then this PR will be stacked on #22676.Motivation
Checks and their tests should depend only on the agnostic HTTP surface (
http_exceptions.*), never onrequests-specific APIs, so the backend can later be swapped without touching consumers.Verification
requestsimports/attribute use.http_exceptions.*. No(RequestException, HTTPError)dual-catch remains.ddev test --lintis green across the touched integrations.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