Skip to content

Feature/httpx2 instrumentor #4730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xrmx merged 11 commits into from
Jul 15, 2026
+1,161 −70
Merged

Feature/httpx2 instrumentor #4730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6f39cf1
httpx2 instrumentation support
gloshkajian Jun 23, 2026
61ac117
small readme edit
gloshkajian Jun 23, 2026
5530f54
Add docstring for httpx2
gloshkajian Jun 23, 2026
44520ed
doc updates
gloshkajian Jun 23, 2026
39844e0
ensure that if only httpx2 is available, that the httpx instrumentor …
gloshkajian Jun 23, 2026
448ac99
feedback: httpx protocol to type checking block
gloshkajian Jun 23, 2026
8ff8669
feedback: remove top level fail, fix annotations
gloshkajian Jun 23, 2026
6df4520
feedback: move class definitions to the same conditions, fix docgen a…
gloshkajian Jun 23, 2026
6237557
feedback: pull out the client instrumentor
gloshkajian Jun 23, 2026
94f83fa
Merge branch 'main' into feature/httpx2_instrumentor
xrmx Jul 15, 2026
89524ab
tox -e generate
xrmx Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/4730.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`opentelemetry-instrumentation-httpx`: add support for httpx2
120 changes: 120 additions & 0 deletions .github/workflows/core_contrib_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3087,6 +3087,126 @@ jobs:
- name: Run tests
run: tox -e py310-test-instrumentation-httpx-1-wrapt2 -- -ra

py310-test-instrumentation-httpx-2-wrapt1:
name: instrumentation-httpx-2-wrapt1
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python-contrib
ref: ${{ env.CONTRIB_REPO_SHA }}

- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python

- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"
architecture: "x64"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e py310-test-instrumentation-httpx-2-wrapt1 -- -ra

py310-test-instrumentation-httpx-2-wrapt2:
name: instrumentation-httpx-2-wrapt2
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python-contrib
ref: ${{ env.CONTRIB_REPO_SHA }}

- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python

- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"
architecture: "x64"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e py310-test-instrumentation-httpx-2-wrapt2 -- -ra

py310-test-instrumentation-httpx-3-wrapt1:
name: instrumentation-httpx-3-wrapt1
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python-contrib
ref: ${{ env.CONTRIB_REPO_SHA }}

- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python

- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"
architecture: "x64"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e py310-test-instrumentation-httpx-3-wrapt1 -- -ra

py310-test-instrumentation-httpx-3-wrapt2:
name: instrumentation-httpx-3-wrapt2
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python-contrib
ref: ${{ env.CONTRIB_REPO_SHA }}

- name: Checkout core repo @ SHA - ${{ env.CORE_REPO_SHA }}
uses: actions/checkout@v4
with:
repository: open-telemetry/opentelemetry-python
ref: ${{ env.CORE_REPO_SHA }}
path: opentelemetry-python

- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: "3.10"
architecture: "x64"

- name: Install tox
run: pip install tox-uv

- name: Run tests
run: tox -e py310-test-instrumentation-httpx-3-wrapt2 -- -ra

py310-test-util-http:
name: util-http
runs-on: ubuntu-latest
Expand Down
Loading
Loading