Skip to content

Commit e041297

Browse files
committed
update changelog
1 parent 0149a6c commit e041297

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- `opentelemetry-instrumentation-asgi` now returns a `traceresponse` response header.
1313
([#817](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/817))
1414

15+
- `opentelemetry-instrumentation-httpx` now supports versions higher than `0.19.0`.
16+
([#866](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/866))
17+
1518
### Fixed
1619

1720
- `opentelemetry-instrumentation-flask` Flask: Conditionally create SERVER spans

instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/__init__.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ def _prepare_headers(headers: typing.Optional[Headers]) -> httpx.Headers:
233233
return httpx.Headers(headers)
234234

235235

236-
def extract_parameters(args, kwargs):
237-
if type(args[0]) == httpx.Request:
236+
def _extract_parameters(args, kwargs):
237+
if isinstance(args[0], httpx.Request):
238238
request: httpx.Request = args[0]
239239
method = request.method.encode()
240240
url = request.url
@@ -253,10 +253,10 @@ def extract_parameters(args, kwargs):
253253
return method, url, headers, stream, extensions
254254

255255

256-
def inject_propagation_headers(headers, args, kwargs):
256+
def _inject_propagation_headers(headers, args, kwargs):
257257
_headers = _prepare_headers(headers)
258258
inject(_headers)
259-
if type(args[0]) == httpx.Request:
259+
if isinstance(args[0], httpx.Request):
260260
request: httpx.Request = args[0]
261261
request.headers = _headers
262262
else:
@@ -303,7 +303,7 @@ def handle_request(
303303
if context.get_value("suppress_instrumentation"):
304304
return self._transport.handle_request(*args, **kwargs)
305305

306-
method, url, headers, stream, extensions = extract_parameters(
306+
method, url, headers, stream, extensions = _extract_parameters(
307307
args, kwargs
308308
)
309309
span_attributes = _prepare_attributes(method, url)
@@ -319,9 +319,9 @@ def handle_request(
319319
if self._request_hook is not None:
320320
self._request_hook(span, request_info)
321321

322-
inject_propagation_headers(headers, args, kwargs)
322+
_inject_propagation_headers(headers, args, kwargs)
323323
response = self._transport.handle_request(*args, **kwargs)
324-
if type(response) == httpx.Response:
324+
if isinstance(response, httpx.Response):
325325
response: httpx.Response = response
326326
status_code = response.status_code
327327
headers = response.headers
@@ -380,7 +380,7 @@ async def handle_async_request(
380380
if context.get_value("suppress_instrumentation"):
381381
return await self._transport.handle_async_request(*args, **kwargs)
382382

383-
method, url, headers, stream, extensions = extract_parameters(
383+
method, url, headers, stream, extensions = _extract_parameters(
384384
args, kwargs
385385
)
386386
span_attributes = _prepare_attributes(method, url)
@@ -396,12 +396,12 @@ async def handle_async_request(
396396
if self._request_hook is not None:
397397
await self._request_hook(span, request_info)
398398

399-
inject_propagation_headers(headers, args, kwargs)
399+
_inject_propagation_headers(headers, args, kwargs)
400400

401401
response = await self._transport.handle_async_request(
402402
*args, **kwargs
403403
)
404-
if type(response) == httpx.Response:
404+
if isinstance(response, httpx.Response):
405405
response: httpx.Response = response
406406
status_code = response.status_code
407407
headers = response.headers

0 commit comments

Comments
 (0)