Skip to content

Commit bb38a65

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib into num-fds-system-metrics
2 parents 8553297 + c9bad62 commit bb38a65

File tree

22 files changed

+2065
-587
lines changed

22 files changed

+2065
-587
lines changed

.github/workflows/instrumentations_1.yml

+2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ jobs:
3535
- "sdk-extension-aws"
3636
- "propagator-aws-xray"
3737
- "propagator-ot-trace"
38+
- "resource-detector-azure"
3839
- "resource-detector-container"
40+
- "util-http"
3941
os: [ubuntu-20.04]
4042
exclude:
4143
- python-version: pypy3

.github/workflows/lint.yml

+2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ jobs:
6868
- "processor-baggage"
6969
- "propagator-aws-xray"
7070
- "propagator-ot-trace"
71+
- "resource-detector-azure"
7172
- "resource-detector-container"
7273
- "sdk-extension-aws"
74+
- "util-http"
7375
os: [ubuntu-20.04]
7476
runs-on: ubuntu-20.04
7577
steps:

CHANGELOG.md

+21-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10-
- `opentelemetry-instrumentation-django` Handle exceptions from request/response hooks
11-
([#2153](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2153))
12-
- `opentelemetry-instrumentation-asyncio` instrumented `asyncio.wait_for` properly raises `asyncio.TimeoutError` as expected
13-
([#2637](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2637))
14-
- `opentelemetry-instrumentation-aws-lambda` Bugfix: AWS Lambda event source key incorrect for SNS in instrumentation library.
15-
([#2612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2612))
16-
- `opentelemetry-instrumentation-system-metrics` Permit to use psutil 6.0+.
17-
([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
18-
1910
### Added
2011

2112
- `opentelemetry-instrumentation-pyramid` Record exceptions raised when serving a request
@@ -28,11 +19,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2819
([#2638](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2638))
2920
- `opentelemetry-instrumentation-system-metrics` Add support for capture open file descriptors
3021
([#2652](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2652))
22+
- `opentelemetry-instrumentation-system-metrics` Permit to use psutil 6.0+.
23+
([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
3124

3225
### Breaking changes
3326

3427
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi`, `opentelemetry-instrumentation-starlette` Use `tracer` and `meter` of originating components instead of one from `asgi` middleware
3528
([#2580](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2580))
29+
- Populate `{method}` as `HTTP` on `_OTHER` methods from scope
30+
([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
31+
32+
### Added
33+
34+
- `opentelemetry-instrumentation-asgi` Implement new semantic convention opt-in with stable http semantic conventions
35+
([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
3636

3737
### Fixed
3838

@@ -48,6 +48,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4848
([#2644](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2644))
4949
- `opentelemetry-instrumentation-confluent-kafka` Confluent Kafka: Ensure consume span is ended when consumer is closed
5050
([#2640](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2640))
51+
- `opentelemetry-instrumentation-asgi` Fix generation of `http.target` and `http.url` attributes for ASGI apps
52+
using sub apps
53+
([#2477](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2477))
54+
- `opentelemetry-instrumentation-aws-lambda` Bugfix: AWS Lambda event source key incorrect for SNS in instrumentation library.
55+
([#2612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2612))
56+
- `opentelemetry-instrumentation-asyncio` instrumented `asyncio.wait_for` properly raises `asyncio.TimeoutError` as expected
57+
([#2637](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2637))
58+
- `opentelemetry-instrumentation-django` Handle exceptions from request/response hooks
59+
([#2153](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2153))
60+
- `opentelemetry-instrumentation-asgi` Removed `NET_HOST_NAME` AND `NET_HOST_PORT` from active requests count attribute
61+
([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
62+
5163

5264
## Version 1.25.0/0.46b0 (2024-05-31)
5365

instrumentation/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
| [opentelemetry-instrumentation-aiohttp-client](./opentelemetry-instrumentation-aiohttp-client) | aiohttp ~= 3.0 | No | experimental
66
| [opentelemetry-instrumentation-aiohttp-server](./opentelemetry-instrumentation-aiohttp-server) | aiohttp ~= 3.0 | No | experimental
77
| [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No | experimental
8-
| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | No | experimental
8+
| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | Yes | migration
99
| [opentelemetry-instrumentation-asyncio](./opentelemetry-instrumentation-asyncio) | asyncio | No | experimental
1010
| [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | No | experimental
1111
| [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | No | experimental

0 commit comments

Comments
 (0)