Add mock_http fixture; migrate 9 intg to mock_http by mwdd146980 · Pull Request #22710 · DataDog/integrations-core

mwdd146980 · 2026-02-23T19:31:49Z

Test Decoupling Step 1 (plan). Stacked on #22676.

Adds the mock_http pytest fixture and migrates 9 integration test suites to library-agnostic HTTP mocking. The OM V2 scraper is also refactored to reuse check.http instead of constructing its own RequestsWrapper, which uncovered two bugs fixed here:

openmetrics: Accept header was being mutated into the shared check.http.options dict; fixed by injecting it via extra_headers per-request
vault: auth headers (X-Vault-Token, X-Vault-Request) needed to be reapplied to check.http in configure_scrapers after the scraper started sharing it

File	Change
`checks/base.py`	`AgentCheck.http` return type: `RequestsWrapper` → `HTTPClientProtocol`
`checks/openmetrics/v2/scraper/base_scraper.py`	Scraper reuses `check.http`; `Accept` header injected via `extra_headers`
`utils/http_testing.py`	`MockHTTPResponse.json_data`: type widened to `Any`
`plugin/pytest.py`	`mock_http` fixture added

Integration tests migrated: falco, strimzi, couchbase, ray, tekton, kubevirt_api, kubevirt_controller, kubevirt_handler, bentoml

Review checklist (to be filled by reviewers)

Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
Add the qa/skip-qa label if the PR doesn't need to be tested during QA.
If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

mwdd146980 · 2026-02-23T19:32:11Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

Add mock_http fixture; migrate 9 intg to mock_http #22710 👈 (View in Graphite)
Feature branch for httpx migration #22676 : 7 other dependent PRs (#22704 , #22722 , #22864 and 4 others)
master

This stack of pull requests is managed by Graphite. Learn more about stacking.

codecov · 2026-02-23T21:46:46Z

Codecov Report

❌ Patch coverage is 98.97959% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 90.53%. Comparing base (6f90874) to head (ea5790d).
⚠️ Report is 1 commits behind head on mwdd146980/httpx-migration-base.

Additional details and impacted files

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Patches get/post/put/delete/head/patch on RequestsWrapper so all three HTTP paths are intercepted: AgentCheck.http, OpenMetrics V2 scraper, and kube* health check handlers. Real RequestsWrapper instances are still created, so check.http.options remains accessible. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Replace direct mock.patch('requests.Session.get') with the library-agnostic mock_http fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…xture Replace direct mocker.patch('requests.Session.get') with the library-agnostic mock_http fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…fixture Replace direct mocker.patch('requests.Session.get') with the library-agnostic mock_http fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

The fixture mocks the HTTP client (RequestsWrapper), not responses. mock_http_client is more precise and avoids confusion with the existing mock_http_response fixture from datadog_checks.dev. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

… fixture Replace direct mocker.patch('requests.Session.get') with the library-agnostic mock_http_client fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…ent fixture Replace direct mocker.patch('requests.Session.get') with the library-agnostic mock_http_client fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Use direct import with noqa: F401 to match the existing codebase pattern. No other integration uses pytest_plugins for fixture registration. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

The fixture name mock_http_client was added in the previous commit, but the team prefers the shorter mock_http name. Revert all usages across integrations and the fixture definition in http_testing.py. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…yMock on AgentCheck.http - mock_http now patches AgentCheck.http via PropertyMock with a create_autospec(HTTPClientProtocol) client, constraining the mock to the protocol interface and enforcing call signatures - AgentCheck.http return type updated from RequestsWrapper to HTTPClientProtocol - OM V2 scraper reuses check.http directly instead of constructing its own RequestsWrapper; options access guarded with hasattr for mock compatibility Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…mock_http fixture Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

base_scraper.py shares check.http via `self.http = check.http`. The previous code mutated `self.http.options['headers']['Accept']` which bled through to check.http since they are the same object, breaking tests that assert check.http.options['headers']['Accept'] == '*/*'. Fix: store the accept header as self._accept_header and inject it per-request via extra_headers in send_request. Using extra_headers (not headers=) is required because RequestsWrapper._request uses ChainMap — passing headers= directly would shadow the entire session headers dict rather than merging a single key. Update test assertions in three files to check scraper._accept_header instead of scraper.http.options['headers']['Accept']. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

After self.http = check.http in the OM V2 scraper, patching BentomlCheck.http at the class level intercepted scraper HTTP calls too, causing AttributeError on the minimal mock response. Replace both patch('BentomlCheck.http') blocks with URL-based dispatch on the already-patched requests.Session.get mock. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

NouemanKHAL · 2026-02-27T10:58:36Z

-        aggregator.assert_metric_has_tag('bentoml.service.request.count', 'bentoml_endpoint:/summarize')
-        aggregator.assert_service_check('bentoml.openmetrics.health', ServiceCheck.OK)
+    aggregator.assert_all_metrics_covered()
+    assert get_mock.call_count == 3  # 1 metrics scrape + 2 health endpoints (/livez, /readyz)


Suggested change

assert get_mock.call_count == 3 # 1 metrics scrape + 2 health endpoints (/livez, /readyz)

Asserting this would tie us to the implementation.

IMO: What our users see are metrics and health checks, those are the things we should ensure our code is doing, testing the code itself will only require us to update the tests for every change in the code, even if it doesn't change any output or observed behavior. This is similar to the black-box testing concept.

Applied suggestion.

Asserting on the number of HTTP calls ties the test to implementation details rather than observable behavior (metrics, service checks). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

mwdd146980 self-assigned this Feb 23, 2026

This comment has been minimized.

Sign in to view

datadog-agent-integrations-bot Bot added integration/vllm integration/consul integration/kube_dns integration/kube_proxy integration/rabbitmq integration/squid integration/openstack_controller integration/kube_controller_manager integration/kube_scheduler labels Feb 24, 2026

mwdd146980 and others added 18 commits February 27, 2026 00:46

Migrate falco tests from requests.Session.get patch to mock_http fixture

f4e689f

Replace direct mock.patch('requests.Session.get') with the library-agnostic mock_http fixture and MockHTTPResponse from http_testing.py. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Fix E402: move pytest_plugins after all imports

56475b3

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Switch from pytest_plugins to direct import for fixture registration

5ab9547

Use direct import with noqa: F401 to match the existing codebase pattern. No other integration uses pytest_plugins for fixture registration. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Shorten docstring

3321b99

Migrate kubevirt_api, kubevirt_controller, kubevirt_handler tests to …

8d39453

…mock_http fixture Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Fix Vault auth headers lost when OM V2 scraper reuses check.http

05152e7

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Raise NotImplementedError for options_method in mock_http fixture

a12f3ee

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Move mock_http fixture to datadog_checks_dev pytest plugin

8db2b4f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

NouemanKHAL reviewed Feb 27, 2026

View reviewed changes

mwdd146980 and others added 2 commits February 27, 2026 15:17

Remove call_count assertion from bentoml test

93c6cd2

Asserting on the number of HTTP calls ties the test to implementation details rather than observable behavior (metrics, service checks). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Drop unused get_mock variable in bentoml test

ea5790d

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

steveny91 approved these changes Feb 27, 2026

View reviewed changes

This was referenced Mar 13, 2026

Widen except clauses and align MockHTTPResponse for fixture swap #22864

Merged

Swap mock_http_response to MockHTTPResponse #22935

Merged

mwdd146980 mentioned this pull request Mar 25, 2026

Widen production except clauses for httpx migration #23046

Merged

This was referenced Apr 7, 2026

Batch migrate integration tests from MockResponse to MockHTTPResponse #23207

Merged

Migrate conftest.py MockResponse fixture chains to MockHTTPResponse #23226

Merged

Remove requests.Session test patches from conftest.py files #23314

Draft

This was referenced Apr 23, 2026

Fix bentoml tests: remove patch override of mock_http_response, add METRICS assertions #23449

Merged

Fix gitlab conftest: json.loads for version response, remove dead /-/health branch #23452

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add mock_http fixture; migrate 9 intg to mock_http#22710

Add mock_http fixture; migrate 9 intg to mock_http#22710
mwdd146980 merged 20 commits intomwdd146980/httpx-migration-basefrom
mwdd146980/phase1b-test-decoupling

mwdd146980 commented Feb 23, 2026 •

edited

Loading

Uh oh!

mwdd146980 commented Feb 23, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Feb 23, 2026 •

edited

Loading

Uh oh!

This comment has been minimized.

NouemanKHAL Feb 27, 2026

Uh oh!

mwdd146980 Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mwdd146980 commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review checklist (to be filled by reviewers)

Uh oh!

mwdd146980 commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

This comment has been minimized.

NouemanKHAL Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

mwdd146980 Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mwdd146980 commented Feb 23, 2026 •

edited

Loading

mwdd146980 commented Feb 23, 2026 •

edited

Loading

codecov Bot commented Feb 23, 2026 •

edited

Loading