Skip to content

Commit 81fcad0

Browse files
authored
Merge branch 'open-telemetry:main' into 1103-instrumentin-multiple-sqlalchemy-engines
2 parents 4234bf3 + 99a0283 commit 81fcad0

File tree

2 files changed

+141
-119
lines changed
  • instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics

2 files changed

+141
-119
lines changed

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc1-0.31b0...HEAD)
99

1010
### Fixed
11+
- Fix bug in system metrics by checking their configuration
12+
([#1129](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1129))
1113
- Adding escape call to fix [auto-instrumentation not producing spans on Windows](https://github.com/open-telemetry/opentelemetry-python/issues/2703).
1214
([#1100](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1100))
1315
- `opentelemetry-instrumentation-grpc` narrow protobuf dependency to exclude protobuf >= 4

0 commit comments

Comments
 (0)