Agnosticize integrations HTTP error handling (batch 1 of 3)#24546
Open
mwdd146980 wants to merge 3 commits into
Open
Agnosticize integrations HTTP error handling (batch 1 of 3)#24546mwdd146980 wants to merge 3 commits into
mwdd146980 wants to merge 3 commits into
Conversation
Narrow self.http catch sites to backend-agnostic http_exceptions and swap interception-path tests to the agnostic surface for: activemq_xml, ambari, arangodb, citrix_hypervisor, cloud_foundry_api, consul.
Same agnosticization for: control_m, couch, couchbase, druid, ecs_fargate, elastic, envoy.
dd-octo-sts
Bot
added
integration/couchbase
integration/activemq_xml
integration/consul
integration/couch
integration/ecs_fargate
integration/elastic
integration/envoy
integration/ambari
integration/druid
integration/cloud_foundry_api
integration/citrix_hypervisor
integration/arangodb
integration/control_m
labels
This was referenced Jul 14, 2026
Contributor
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: b445464 | Docs | Datadog PR Page | Give us feedback! |
…eview) Address review findings on #24546 where narrowed catch sites changed behavior versus master: - couchbase: the agnostic ResponseWrapper.json() raises a stdlib json.JSONDecodeError (ValueError), not an HTTPError, so a 200 with a non-JSON body escaped `except HTTPError` and aborted the run. Master caught it via the broad RequestException. Also catch json.JSONDecodeError at the three sync-gateway/query-monitoring/index-stats sites. - activemq_xml: ConnectTimeout translates to HTTPTimeoutError (a sibling of HTTPConnectionError), so connect timeouts escaped `except HTTPConnectionError` and defeated suppress_errors. Catch HTTPTimeoutError as well. - druid: add explicit parametrize ids to the can-connect failure test.
mwdd146980
changed the title
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b445464b01
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
sarah-witt
reviewed
Jul 14, 2026
sarah-witt
left a comment
sarah-witt
left a comment
Contributor
There was a problem hiding this comment.
Can you bump the minimum checks base requirement for these integrations?
sarah-witt
reviewed
Jul 14, 2026
sarah-witt
approved these changes
Jul 14, 2026
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
3 participants
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 first 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:
The backend stays
requests. Behavior is unchanged. This is part of the migration to a backend-agnostic HTTP layer and stacks 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