Skip to content

Support httpx2 entry point exposed by the opentelemetry-instrumentation-httpx 0.65b0 #48899

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

Draft
Radhika Gupta (rads-1996) wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Support httpx2 entry point exposed by the opentelemetry-instrumentation-httpx 0.65b0 #48899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c3a43e
Add support for the httpx2 OpenTelemetry instrumentation entry point
rads-1996 Sep 3, 2026
44e956c
Add CHANGELOG
rads-1996 Sep 3, 2026
1439752
Update CHANGELOG
rads-1996 Sep 3, 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
2 changes: 2 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## 1.8.10 (Unreleased)

### Features Added
- Add support for the `httpx2` OpenTelemetry instrumentation entry point
([#48899](https://github.com/Azure/azure-sdk-for-python/pull/48899))
- Add httpx instrumentation support
([#47953](https://github.com/Azure/azure-sdk-for-python/pull/47953))

Expand Down
3 changes: 2 additions & 1 deletion sdk/monitor/azure-monitor-opentelemetry/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ OpenTelemetry instrumentations allow automatic collection of requests sent from
| [OpenTelemetry Django Instrumentation][ot_instrumentation_django] | [django][pypi_django] | [link][ot_instrumentation_django_version]
| [OpenTelemetry FastApi Instrumentation][ot_instrumentation_fastapi] | [fastapi][pypi_fastapi] | [link][ot_instrumentation_fastapi_version]
| [OpenTelemetry Flask Instrumentation][ot_instrumentation_flask] | [flask][pypi_flask] | [link][ot_instrumentation_flask_version]
| [OpenTelemetry Httpx Instrumentation][ot_instrumentation_httpx] | [httpx][pypi_httpx] | [link][ot_instrumentation_httpx_version]
| [OpenTelemetry Httpx Instrumentation][ot_instrumentation_httpx] | [httpx][pypi_httpx], [httpx2][pypi_httpx2] | [link][ot_instrumentation_httpx_version]
| [OpenTelemetry Psycopg2 Instrumentation][ot_instrumentation_psycopg2] | [psycopg2][pypi_psycopg2] | [link][ot_instrumentation_psycopg2_version]
| [OpenTelemetry Requests Instrumentation][ot_instrumentation_requests] | [requests][pypi_requests] | [link][ot_instrumentation_requests_version]
| [OpenTelemetry UrlLib Instrumentation][ot_instrumentation_urllib] | [urllib][pypi_urllib] | All
Expand Down Expand Up @@ -264,6 +264,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
[pypi_fastapi]: https://pypi.org/project/fastapi/
[pypi_flask]: https://pypi.org/project/Flask/
[pypi_httpx]: https://pypi.org/project/httpx/
[pypi_httpx2]: https://pypi.org/project/httpx2/
[pypi_psycopg2]: https://pypi.org/project/psycopg2/
[pypi_requests]: https://pypi.org/project/requests/
[pypi_urllib]: https://docs.python.org/3/library/urllib.html
Expand Down
1 change: 1 addition & 0 deletions sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"fastapi",
"flask",
"httpx",
"httpx2",
"psycopg2",
"requests",
"urllib",
Expand Down
1 change: 1 addition & 0 deletions sdk/monitor/azure-monitor-opentelemetry/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ psycopg2-binary
requests
urllib3
httpx
httpx2
brotli
1 change: 1 addition & 0 deletions sdk/monitor/azure-monitor-opentelemetry/samples/tracing/instrumentation_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
"urllib": {"enabled": False},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
}
)
9 changes: 7 additions & 2 deletions sdk/monitor/azure-monitor-opentelemetry/tests/instrumentation/test_httpx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@

from opentelemetry.instrumentation.httpx import (
HTTPXClientInstrumentor,
HTTPX2ClientInstrumentor,
)


class TestHttpxInstrumentation(unittest.TestCase):
def test_instrument(self):
self._instrument(HTTPXClientInstrumentor)
self._instrument(HTTPX2ClientInstrumentor)

def _instrument(self, instrumentor):
try:
HTTPXClientInstrumentor().instrument()
instrumentor().instrument()
except Exception as ex: # pylint: disable=broad-except
print(ex)
self.fail(f"Unexpected exception raised when instrumenting {HTTPXClientInstrumentor.__name__}")
self.fail(f"Unexpected exception raised when instrumenting {instrumentor.__name__}")
11 changes: 11 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry/tests/utils/test_configurations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ def test_get_configurations(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
"previewlib1": {"enabled": False},
"previewlib2": {"enabled": False},
},
Expand Down Expand Up @@ -147,6 +148,7 @@ def test_get_configurations_defaults(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -196,6 +198,7 @@ def test_get_configurations_env_vars(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -280,6 +283,7 @@ def test_merge_instrumentation_options_conflict(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": False},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)

Expand Down Expand Up @@ -315,6 +319,7 @@ def test_merge_instrumentation_options_extra_args(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)

Expand Down Expand Up @@ -461,6 +466,7 @@ def test_get_configurations_env_vars_rate_limited(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -489,6 +495,7 @@ def test_get_configurations_rate_limited_sampler_param(self, resource_create_moc
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -528,6 +535,7 @@ def test_get_configurations_env_vars_no_preference(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -567,6 +575,7 @@ def test_get_configurations_env_vars_check_default(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -607,6 +616,7 @@ def test_get_configurations_env_vars_fixed_percentage(self, resource_create_mock
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down Expand Up @@ -646,6 +656,7 @@ def test_get_configurations_env_vars_always_on(self, resource_create_mock):
"urllib": {"enabled": True},
"urllib3": {"enabled": True},
"httpx": {"enabled": True},
"httpx2": {"enabled": True},
},
)
self.assertEqual(configurations["resource"].attributes, TEST_DEFAULT_RESOURCE.attributes)
Expand Down