Swap mock_http_response to MockHTTPResponse by mwdd146980 · Pull Request #22935 · DataDog/integrations-core

mwdd146980 · 2026-03-17T15:27:03Z

Motivation

Part of the httpx migration: decouple the shared mock_http_response test fixture from the requests library so individual integration tests don't need to change when we swap HTTP backends.

Approach

Swap the mock_http_response fixture from MockResponse (requests-backed) to MockHTTPResponse (library-agnostic) in the central pytest plugin — this implicitly covers ~102 test files (228 calls) without touching individual test code
13 files needed explicit changes: 9 match string updates, sonatype_nexus fixture override removal, and base package updates
Re-add _CaseInsensitiveDict to MockHTTPResponse.headers — previously unnecessary when only used in controlled new tests, now required because production code (e.g. prometheus/mixins.py) accesses response.headers['Content-Type']
Fix sonatype_nexus test bug: dict.update() returns None, so json_data=data.update({...}) was passing an empty response body — now builds the dict before passing it

See plan for more details.

agint-review follow-ups

Addressed nits from the agint-review findings:

Fix _CaseInsensitiveDict.update() to handle iterable-of-pairs (aligns with httpx's Headers interface)
Add test_mock_response_url() for MockHTTPResponse.url coverage
Remove dead URL positional args from 7 sonatype_nexus tests

Verification

ddev test -fs datadog_checks_base — clean
ddev test datadog_checks_base — 1280 passed
ddev test sonatype_nexus — 13 passed

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

codecov · 2026-03-17T15:42:16Z

Codecov Report

❌ Patch coverage is 98.66667% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 90.39%. Comparing base (889474c) to head (457ad34).
⚠️ 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.

datadog-prod-us1-5 · 2026-03-17T15:42:50Z

⚠️ Tests

✨ Fix all issues with BitsAI or with Cursor

⚠️ Warnings

🧪 3 Tests failed

test_e2e_profile_cisco_asa from test_e2e_core_vs_python.py

(Fix with Cursor)

[s6-init] making user provided files available at /var/run/s6/etc...exited 0.
[s6-init] ensuring user provided files have correct perms...exited 0.
[fix-attrs.d] applying ownership & permissions fixes...
[fix-attrs.d] done.
[cont-init.d] executing container initialization scripts...
[cont-init.d] 01-check-apikey.sh: executing... 
[cont-init.d] 01-check-apikey.sh: exited 0.
[cont-init.d] 50-ci.sh: executing... 
[cont-init.d] 50-ci.sh: exited 0.
[cont-init.d] 50-ecs-managed.sh: executing... 
...

test_e2e_v3_md5_aes from test_e2e_core_vs_python.py

(Fix with Cursor)

[s6-init] making user provided files available at /var/run/s6/etc...exited 0.
[s6-init] ensuring user provided files have correct perms...exited 0.
[fix-attrs.d] applying ownership & permissions fixes...
[fix-attrs.d] done.
[cont-init.d] executing container initialization scripts...
[cont-init.d] 01-check-apikey.sh: executing... 
[cont-init.d] 01-check-apikey.sh: exited 0.
[cont-init.d] 50-ci.sh: executing... 
[cont-init.d] 50-ci.sh: exited 0.
[cont-init.d] 50-ecs-managed.sh: executing... 
...

test_e2e_metrics from test_e2e.py

(Fix with Cursor)

Metadata assertion errors using metadata.csv:
	- Expect \`prefect.server.task_runs.cancelled.count\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.completed.count\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.crashed.count\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.failed.count\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.late_start.count\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.paused\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.pending\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.running\` from metadata.csv but not submitted.
	- Expect \`prefect.server.task_runs.throughput\` from metadata.csv but not submitted.

ℹ️ Info

No other issues found (see more)

❄️ No new flaky tests detected

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 457ad34 | Docs | Datadog PR Page | Was this helpful? React with 👍/👎 or give us feedback!}

mwdd146980 · 2026-03-17T16:00:03Z

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

Swap mock_http_response to MockHTTPResponse #22935 👈 (View in Graphite)
Feature branch for httpx migration #22676 : 7 other dependent PRs (#22704 , #22710 , #22722 and 4 others)
master

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

mwdd146980 · 2026-03-17T18:46:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c4fad19d17

ℹ️ 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".

NouemanKHAL

Claude Code Review

Issues

Bug fix in sonatype_nexus test (good, but worth calling out)

The old code had:

json_data=status_metrics_response_data.update({"gauges": ...}),

dict.update() returns None, so the mock was sending an empty response body. The PR fixes this correctly by building the dict before passing it. This is a genuine bug fix — worth mentioning in the PR description.

`_CaseInsensitiveDict` is incomplete

The dict only overrides __setitem__, __getitem__, __contains__, and get(). Missing methods that could silently behave incorrectly:

__delitem__ — del headers['Content-Type'] won't find the lowercase-stored key
pop() — same issue
update() — won't normalize keys from the incoming dict
setdefault() — won't normalize the key

For test mocking this is likely sufficient today, but if any production code path calls .pop() or del on response headers, tests would silently use the wrong key. Consider either:

Adding the missing methods, or
Using requests.structures.CaseInsensitiveDict or httpx.Headers directly (one will be a dependency anyway), or
At minimum, adding a comment noting the intentional subset

`mock_http_response_per_endpoint` still patches `requests.Session.get`

method: str = 'requests.Session.get',  # default target

If the goal is to decouple from requests, this should either be updated here or tracked for a follow-up.

Minor observations

The _CaseInsensitiveDict.__setitem__ and __getitem__ call .lower() unconditionally, which would raise AttributeError on non-string keys. __contains__ handles this with an isinstance check but the others don't. Inconsistent, though HTTP headers are always strings in practice.
_CaseInsensitiveDict stores keys lowercased (unlike requests.structures.CaseInsensitiveDict which preserves original case for iteration). Fine for testing but worth a docstring note.
PR description says "~102 test files" but only 13 are in the diff. The central fixture swap covers the rest implicitly — might be worth clarifying to avoid reviewer confusion.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8a934fdb4b

ℹ️ 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".

mwdd146980 · 2026-03-21T01:47:46Z

@codex review

chatgpt-codex-connector · 2026-03-21T01:54:00Z

Codex Review: Didn't find any major issues. 🎉

ℹ️ 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".

NouemanKHAL

Left some comments, non-blockers, LGTM!

NouemanKHAL · 2026-03-30T19:25:54Z

    response = MockHTTPResponse(json_data={'key': 'value'}, headers=headers)

-    assert response.headers['content-type'] == 'application/json'
+    assert response.headers['Content-Type'] == 'application/json'


Suggested change

assert response.headers['Content-Type'] == 'application/json'

assert response.headers['content-type'] == 'application/json'

I don't see a reason to touch this test

NouemanKHAL · 2026-03-30T19:42:38Z

-        default_response: MockResponse | None = None,
-        method: str = 'requests.Session.get',
+        default_response: MockHTTPResponse | None = None,
+        method: str = 'requests.Session.get',  # TODO(httpx-migration): update default when backend changes


In case we can't get rid of this, could we store in a global constant so we would only need to change it in one place?

Co-authored-by: Kyle-Neale <37895372+Kyle-Neale@users.noreply.github.com>

Replace the requests-coupled MockResponse with the library-agnostic MockHTTPResponse in the mock_response fixture, decoupling ~102 test files from the requests library without touching individual test code. - Swap mock_response fixture to yield MockHTTPResponse - Fix mock_http_response_per_endpoint fallback to use fixture parameter - Remove sonatype_nexus local fixture override (now redundant) - Update match strings in 9 integrations from requests.exceptions.HTTPError to HTTPStatusError (our own shared exception class) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Document that MockHTTPResponse has a different parameter order than MockResponse (all callers use keyword args, so not a compatibility concern). Fix test_successful_metrics_collection which was passing vacuously: dict.update() returns None so json_data was always None, the check's json decode failed silently, no metrics were submitted, and assert_all_metrics_covered() trivially passed. Provide complete mock data for both API calls and add individual metric assertions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Step3b will make MockHTTPResponse the backing for all mock_http_response fixture users (~102 test files). Production code accesses headers with original-case keys (e.g. response.headers['Content-Type']), which would KeyError or silently return wrong values with the plain lowered-key dict. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

- Add missing dict methods (__delitem__, pop, update, setdefault) to _CaseInsensitiveDict so tests won't silently break if production code uses them on response headers - Make isinstance guards consistent across all methods - Replace redundant `assert in` checks with mixed-case .get() per reviewer suggestion; add tests for new dict methods - Add TODO(httpx-migration) comment on per-endpoint fixture default Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Make raw.read delegate to BytesIO stream so json.load(r.raw) works (fixes kubelet_base test regression). Add url attribute with default '' (fixes sonatype_nexus test_timeout_error accessing response.url). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…dead args - Fix _CaseInsensitiveDict.update() to lowercase keys from iterable-of-pairs - Add test_mock_response_url() for MockHTTPResponse url parameter - Remove dead URL positional args from 7 sonatype_nexus test calls Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

- Revert unnecessary Content-Type → content-type case change in test - Extract _DEFAULT_MOCK_METHOD constant for requests.Session.get default Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

mwdd146980 self-assigned this Mar 17, 2026

datadog-agent-integrations-bot Bot added integration/rabbitmq dev_package integration/dcgm integration/nvidia_triton integration/argo_workflows integration/vllm integration/appgate_sdp integration/nvidia_nim integration/sonatype_nexus integration/celery integration/quarkus labels Mar 17, 2026

mwdd146980 changed the title ~~Swap mock_http_response fixture from MockResponse to MockHTTPResponse~~ Decouple test fixtures from requests: swap mock_response to MockHTTPResponse Mar 17, 2026

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from 21e6af8 to c1ac2c5 Compare March 17, 2026 15:59

mwdd146980 mentioned this pull request Mar 17, 2026

Migrate config assertion tests away from requests #22722

Merged

3 tasks

mwdd146980 mentioned this pull request Mar 17, 2026

Widen except clauses and align MockHTTPResponse for fixture swap #22864

Merged

mwdd146980 changed the title ~~Decouple test fixtures from requests: swap mock_response to MockHTTPResponse~~ Swap mock_http_response to MockHTTPResponse Mar 17, 2026

datadog-agent-integrations-bot Bot added the base_package label Mar 17, 2026

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from cb98cdb to c4fad19 Compare March 17, 2026 18:34

chatgpt-codex-connector Bot reviewed Mar 17, 2026

View reviewed changes

Comment thread datadog_checks_dev/datadog_checks/dev/plugin/pytest.py

NouemanKHAL reviewed Mar 19, 2026

View reviewed changes

Comment thread datadog_checks_base/tests/base/utils/http/test_http_testing.py Outdated

NouemanKHAL reviewed Mar 19, 2026

View reviewed changes

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from 461f963 to a11d677 Compare March 19, 2026 18:33

mwdd146980 force-pushed the mwdd146980/step3a-widen-om-exceptions branch 2 times, most recently from 01603f0 to 6e9c663 Compare March 19, 2026 19:17

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from a11d677 to 8e65a6f Compare March 19, 2026 19:24

mwdd146980 requested a review from a team as a code owner March 20, 2026 21:43

datadog-agent-integrations-bot Bot added the team/agent-integrations label Mar 20, 2026

chatgpt-codex-connector Bot reviewed Mar 20, 2026

View reviewed changes

Comment thread datadog_checks_dev/datadog_checks/dev/plugin/pytest.py

Comment thread datadog_checks_dev/datadog_checks/dev/plugin/pytest.py

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from 358ac6f to 2d32227 Compare March 24, 2026 19:54

mwdd146980 requested a review from NouemanKHAL March 24, 2026 21:02

mwdd146980 mentioned this pull request Mar 25, 2026

Widen production except clauses for httpx migration #23046

Merged

NouemanKHAL reviewed Mar 30, 2026

View reviewed changes

Comment thread datadog_checks_base/datadog_checks/base/utils/http_testing.py

NouemanKHAL approved these changes Mar 30, 2026

View reviewed changes

temporal-github-worker-1 Bot added agent/approved ecosystems/review-requested product/review-requested labels Mar 30, 2026

mwdd146980 force-pushed the mwdd146980/step3a-widen-om-exceptions branch from fd558c5 to 08e03be Compare April 3, 2026 19:45

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from 217fc16 to 9f4a6c4 Compare April 3, 2026 19:45

Base automatically changed from mwdd146980/step3a-widen-om-exceptions to mwdd146980/httpx-migration-base April 4, 2026 16:43

mwdd146980 requested a review from a team as a code owner April 4, 2026 16:43

datadog-agent-integrations-bot Bot and others added 8 commits April 4, 2026 13:20

Update dependency resolution (#23159)

65fcc4e

Co-authored-by: Kyle-Neale <37895372+Kyle-Neale@users.noreply.github.com>

Address review round 2: revert test churn, extract mock method constant

457ad34

- Revert unnecessary Content-Type → content-type case change in test - Extract _DEFAULT_MOCK_METHOD constant for requests.Session.get default Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

mwdd146980 force-pushed the mwdd146980/httpx-migration-base branch from 5e594eb to 889474c Compare April 4, 2026 17:20

mwdd146980 force-pushed the mwdd146980/step3b-fixture-swap branch from 9f4a6c4 to 457ad34 Compare April 4, 2026 17:20

datadog-agent-integrations-bot Bot added the team/container-integrations label Apr 4, 2026

mwdd146980 merged commit 8938e5e into mwdd146980/httpx-migration-base Apr 5, 2026
315 of 613 checks passed

mwdd146980 deleted the mwdd146980/step3b-fixture-swap branch April 5, 2026 17:00

	assert response.headers['Content-Type'] == 'application/json'
	assert response.headers['content-type'] == 'application/json'

Conversation

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

Uh oh!

Motivation

Approach

agint-review follow-ups

Verification

Review checklist (to be filled by reviewers)

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

datadog-prod-us1-5 Bot commented Mar 17, 2026 • edited by datadog-datadog-prod-us1 Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Warnings

ℹ️ Info

Uh oh!

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

Uh oh!

Uh oh!

mwdd146980 commented Mar 17, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

NouemanKHAL left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Claude Code Review

Issues

Bug fix in sonatype_nexus test (good, but worth calling out)

_CaseInsensitiveDict is incomplete

mock_http_response_per_endpoint still patches requests.Session.get

Minor observations

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

mwdd146980 commented Mar 21, 2026

Uh oh!

chatgpt-codex-connector Bot commented Mar 21, 2026

Uh oh!

Uh oh!

NouemanKHAL left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NouemanKHAL Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

NouemanKHAL Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mwdd146980 commented Mar 17, 2026 •

edited

Loading

codecov Bot commented Mar 17, 2026 •

edited

Loading

datadog-prod-us1-5 Bot commented Mar 17, 2026 •

edited by datadog-datadog-prod-us1 Bot

Loading

mwdd146980 commented Mar 17, 2026 •

edited

Loading

NouemanKHAL left a comment •

edited

Loading

`_CaseInsensitiveDict` is incomplete

`mock_http_response_per_endpoint` still patches `requests.Session.get`

NouemanKHAL left a comment •

edited

Loading