Skip to content

Commit c55426d

Browse files
authored
Merge branch 'main' into trace-based-sampling
2 parents 204eb43 + 7cef070 commit c55426d

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414

1515
- Add `minimum_severity_level` and `trace_based_sampling` logger parameters to filter logs
1616
([#4765](https://github.com/open-telemetry/opentelemetry-python/pull/4765))
17+
- `opentelemetry-sdk`: Fix the type hint of the `_metrics_data` property to allow `None`
18+
([#4837](https://github.com/open-telemetry/opentelemetry-python/pull/4837)
1719
- Regenerate opentelemetry-proto code with v1.9.0 release
1820
([#4840](https://github.com/open-telemetry/opentelemetry-python/pull/4840))
1921
- Add python 3.14 support

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ def __init__(
406406
preferred_aggregation=preferred_aggregation,
407407
)
408408
self._lock = RLock()
409-
self._metrics_data: MetricsData = None
409+
self._metrics_data: MetricsData | None = None
410410

411411
def get_metrics_data(
412412
self,

0 commit comments

Comments
 (0)