From 5d4ddb4220f1899c9645dd94c7fd28c6a1c1cce0 Mon Sep 17 00:00:00 2001 From: Mark Jan van Kampen Date: Fri, 27 Jan 2023 13:57:47 +0100 Subject: [PATCH 1/3] Fixes warning filter being reset --- .../src/opentelemetry/sdk/trace/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py index 739f59ee706..075e50aec61 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py @@ -37,7 +37,7 @@ Type, Union, ) -from warnings import filterwarnings, resetwarnings +from warnings import filterwarnings, catch_warnings from deprecated import deprecated @@ -1169,13 +1169,14 @@ def get_tracer( if instrumenting_library_version is None: instrumenting_library_version = "" - filterwarnings("ignore", category=DeprecationWarning) - instrumentation_info = InstrumentationInfo( - instrumenting_module_name, - instrumenting_library_version, - schema_url, - ) - resetwarnings() + with catch_warnings(): + filterwarnings("ignore", category=DeprecationWarning) + instrumentation_info = InstrumentationInfo( + instrumenting_module_name, + instrumenting_library_version, + schema_url, + ) + return Tracer( self.sampler, self.resource, From 57dbac5aae16e8dbc04722c4c1f7d324c510c8cd Mon Sep 17 00:00:00 2001 From: Mark Jan van Kampen Date: Fri, 27 Jan 2023 14:03:08 +0100 Subject: [PATCH 2/3] Updates changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bb6b0c7016..cb0be2a5f4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3128](https://github.com/open-telemetry/opentelemetry-python/pull/3128)) - Fix validation of baggage values ([#3058](https://github.com/open-telemetry/opentelemetry-python/pull/3058)) +- Fix warning filters being reset when instrumenting + ([#3147](https://github.com/open-telemetry/opentelemetry-python/pull/3147)) ## Version 1.15.0/0.36b0 (2022-12-09) From 32dc9ff03f7953e14160304c4e605004792747a0 Mon Sep 17 00:00:00 2001 From: Mark Jan van Kampen Date: Tue, 31 Jan 2023 09:39:26 +0100 Subject: [PATCH 3/3] Fixes formatting --- opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py index 075e50aec61..377b6ec6aee 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py @@ -37,7 +37,7 @@ Type, Union, ) -from warnings import filterwarnings, catch_warnings +from warnings import catch_warnings, filterwarnings from deprecated import deprecated