Skip to content

Commit

Permalink
Merge branch 'main' into fix_unix
Browse files Browse the repository at this point in the history
  • Loading branch information
lzchen authored May 28, 2024
2 parents 356fb3e + 88111d0 commit 873aaec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2524](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2524))
- `opentelemetry-instrumentation-asyncio` Check for __name__ attribute in the coroutine
([#2521](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2521))
- `opentelemetry-instrumentation-requests` Fix wrong time unit for duration histogram
([#2553](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2553))
- `opentelemetry-util-http` Preserve brackets around literal IPv6 hosts ([#2552](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2552))


## Version 1.24.0/0.45b0 (2024-03-28)

### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,7 @@ def get_or_create_headers():
exception = exc
result = getattr(exc, "response", None)
finally:
elapsed_time = max(
round((default_timer() - start_time) * 1000), 0
)
elapsed_time = max(default_timer() - start_time, 0)

if isinstance(result, Response):
span_attributes = {}
Expand Down

0 comments on commit 873aaec

Please sign in to comment.