Skip to content

Commit 16e04ef

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-python-contrib into semconv-celery
2 parents 9a33772 + fd21563 commit 16e04ef

File tree

65 files changed

+5077
-2737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+5077
-2737
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,11 @@ body:
6464
options:
6565
- "No"
6666
- "Yes"
67+
68+
- type: dropdown
69+
attributes:
70+
label: Tip
71+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
72+
options:
73+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
74+
default: 0

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,11 @@ body:
4848
options:
4949
- "No"
5050
- "Yes"
51+
52+
- type: dropdown
53+
attributes:
54+
label: Tip
55+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
56+
options:
57+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
58+
default: 0

.github/component_owners.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ components:
3333
- dorkolog
3434

3535
propagator/opentelemetry-propagator-aws-xray:
36-
- NathanielRN
36+
- jj22ee
3737

3838
sdk-extension/opentelemetry-sdk-extension-aws:
39-
- NathanielRN
40-
- Kausik-A
4139
- srprash
40+
- jj22ee
4241

4342
instrumentation/opentelemetry-instrumentation-tortoiseorm:
4443
- tonybaloney

CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
### Fixed
1515

16+
- `opentelemetry-instrumentation-fastapi`: Fix middleware ordering to cover all exception handling use cases.
17+
([#3664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3664))
18+
- `opentelemetry-instrumentation-asgi`: Make all user hooks failsafe and record exceptions in hooks.
19+
([#3664](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3664))
20+
- `opentelemetry-instrumentation-fastapi`: Fix memory leak in `uninstrument_app()` by properly removing apps from the tracking set
21+
([#3688](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3688))
22+
- `opentelemetry-instrumentation-tornado` Fix server (request) duration metric calculation
23+
([#3679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3679))
24+
- `opentelemetry-instrumentation-tornado`: Fix to properly skip all server telemetry when URL excluded.
25+
([#3680](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3680))
1626
- `opentelemetry-instrumentation`: Avoid calls to `context.detach` with `None` token.
1727
([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
28+
- `opentelemetry-instrumentation-starlette`/`opentelemetry-instrumentation-fastapi`: Fixes a crash when host-based routing is used
29+
([#3507](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3507))
30+
- Fix documentation order of sections and headers for Django, Flask, MySQL, mysqlclient, psycopg, psycopg2, pymysql, sqlalchemy instrumentations.
31+
([#3719](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3719))
32+
33+
### Added
34+
35+
- `opentelemetry-instrumentation-confluent-kafka` Add support for confluent-kafka <=2.11.0
36+
([#3685](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3685))
37+
- `opentelemetry-instrumentation-system-metrics`: Add `cpython.gc.collected_objects` and `cpython.gc.uncollectable_objects` metrics
38+
([#3666](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3666))
39+
- `opentelemetry-sdk-extension-aws` Add AWS X-Ray Remote Sampler with initial Rules Poller implementation
40+
([#3366](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3366))
41+
- `opentelemetry-instrumentation`: add support for `OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH` to inform opentelemetry-instrument about gevent monkeypatching
42+
([#3699](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3699))
1843

1944
## Version 1.36.0/0.57b0 (2025-07-29)
2045

@@ -118,7 +143,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
118143
### Deprecated
119144

120145
- Drop support for Python 3.8, bump baseline to Python 3.9.
121-
([#3399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3399))
146+
([#3399](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3399))
122147

123148
## Version 1.33.0/0.54b0 (2025-05-09)
124149

docs-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ botocore~=1.0
2121
boto3~=1.0
2222
cassandra-driver~=3.25
2323
celery>=4.0
24-
confluent-kafka>= 1.8.2,<= 2.4.0
24+
confluent-kafka>= 1.8.2,<= 2.11.0
2525
elasticsearch>=6.0,<9.0
2626
flask~=2.0
2727
falcon~=2.0

instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/manual/main.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44
from openai import OpenAI
55

66
# NOTE: OpenTelemetry Python Logs and Events APIs are in beta
7-
from opentelemetry import _events, _logs, trace
7+
from opentelemetry import _events, _logs, metrics, trace
88
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
99
OTLPLogExporter,
1010
)
11+
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
12+
OTLPMetricExporter,
13+
)
1114
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
1215
OTLPSpanExporter,
1316
)
1417
from opentelemetry.instrumentation.openai_v2 import OpenAIInstrumentor
1518
from opentelemetry.sdk._events import EventLoggerProvider
1619
from opentelemetry.sdk._logs import LoggerProvider
1720
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
21+
from opentelemetry.sdk.metrics import MeterProvider
22+
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
1823
from opentelemetry.sdk.trace import TracerProvider
1924
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2025

@@ -31,6 +36,17 @@
3136
)
3237
_events.set_event_logger_provider(EventLoggerProvider())
3338

39+
# configure metrics
40+
metrics.set_meter_provider(
41+
MeterProvider(
42+
metric_readers=[
43+
PeriodicExportingMetricReader(
44+
OTLPMetricExporter(),
45+
),
46+
]
47+
)
48+
)
49+
3450
# instrument OpenAI
3551
OpenAIInstrumentor().instrument()
3652

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
openai~=1.57.3
22

3-
opentelemetry-sdk~=1.30.0
4-
opentelemetry-exporter-otlp-proto-grpc~=1.30.0
3+
opentelemetry-sdk~=1.36.0
4+
opentelemetry-exporter-otlp-proto-grpc~=1.36.0
55
opentelemetry-instrumentation-openai-v2~=2.1b0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
openai~=1.57.3
22

3-
opentelemetry-sdk~=1.30.0
4-
opentelemetry-exporter-otlp-proto-grpc~=1.30.0
5-
opentelemetry-distro~=0.51b0
3+
opentelemetry-sdk~=1.36.0
4+
opentelemetry-exporter-otlp-proto-grpc~=1.36.0
5+
opentelemetry-distro~=0.57b0
66
opentelemetry-instrumentation-openai-v2~=2.1b0

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/events.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# type: ignore[reportUnknownDeprecated]
16+
1517
"""
1618
Factories for event types described in
1719
https://github.com/open-telemetry/semantic-conventions/blob/main/docs/gen-ai/gen-ai-events.md#system-event.

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
# type: ignore[reportUnknownDeprecated]
16+
1517
from __future__ import annotations
1618

1719
import re

0 commit comments

Comments
 (0)