Merge branch 'open-telemetry:main' into 1103-instrumentin-multiple-sq…

…lalchemy-engines
open-telemetry · Jun 14, 2022 · 81fcad0 · 81fcad0
2 parents 4234bf3 + 99a0283
commit 81fcad0
Show file tree

Hide file tree

Showing 2 changed files with 141 additions and 119 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc1-0.31b0...HEAD)
 
 ### Fixed
+- Fix bug in system metrics by checking their configuration
+  ([#1129](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1129))
 - Adding escape call to fix [auto-instrumentation not producing spans on Windows](https://github.com/open-telemetry/opentelemetry-python/issues/2703).
   ([#1100](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1100))
 - `opentelemetry-instrumentation-grpc` narrow protobuf dependency to exclude protobuf >= 4