From 10bad12978b1beed8b22cfe9b0600133f66e53dc Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:26:19 -0800 Subject: [PATCH 1/4] Change import path for LoggingHandler to accomodate upstream breaking changes - Distro --- .../azure-monitor-opentelemetry/CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 3 ++- .../azure-monitor-opentelemetry/setup.py | 17 +++++++++-------- .../tests/test_configure.py | 6 ++++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 0b968e0a84dd..53b14be1b5f0 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -10,6 +10,8 @@ ### Bugs Fixed ### Other Changes +- Change import path for `LoggingHandler` to accomodate upstream breaking changes +([#XXXXX](https://github.com/Azure/azure-sdk-for-python/pull/XXXXX)) ## 1.8.6 (2026-02-05) diff --git a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py index 897758fbc2a3..e60c78829465 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -223,7 +223,8 @@ def _setup_logging(configurations: Dict[str, ConfigurationValue]): # Use try catch while signal is experimental try: from opentelemetry._logs import set_logger_provider - from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler + from opentelemetry.sdk._logs import LoggerProvider + from opentelemetry.instrumentation.logging.handler import LoggingHandler from azure.monitor.opentelemetry.exporter.export.logs._processor import _AzureBatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import ( # pylint: disable=import-error,no-name-in-module diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index 13494f9ec99f..88c986f95391 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -85,14 +85,15 @@ "azure-core<2.0.0,>=1.28.0", "azure-core-tracing-opentelemetry~=1.0.0b11", "azure-monitor-opentelemetry-exporter~=1.0.0b47", - "opentelemetry-sdk==1.39", - "opentelemetry-instrumentation-django==0.60b0", - "opentelemetry-instrumentation-fastapi==0.60b0", - "opentelemetry-instrumentation-flask==0.60b0", - "opentelemetry-instrumentation-psycopg2==0.60b0", - "opentelemetry-instrumentation-requests==0.60b0", - "opentelemetry-instrumentation-urllib==0.60b0", - "opentelemetry-instrumentation-urllib3==0.60b0", + "opentelemetry-sdk~=1.40", + "opentelemetry-instrumentation-django~=0.61b0", + "opentelemetry-instrumentation-fastapi~=0.61b0", + "opentelemetry-instrumentation-flask~=0.61b0", + "opentelemetry-instrumentation-psycopg2~=0.61b0", + "opentelemetry-instrumentation-requests~=0.61b0", + "opentelemetry-instrumentation-urllib~=0.61b0", + "opentelemetry-instrumentation-urllib3~=0.61b0", + "opentelemetry-instrumentation-logging~=0.61b0", "opentelemetry-resource-detector-azure<1.0.0,>=0.1.5", ], entry_points={ diff --git a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py index 7adfbeb5b33f..48291b881756 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py @@ -579,7 +579,8 @@ def test_setup_logging(self, get_logger_mock, pclp_mock): "sys.modules", { "opentelemetry._logs": Mock(set_logger_provider=set_logger_provider_mock), - "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock, LoggingHandler=logging_handler_mock), + "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock), + "opentelemetry.instrumentation.logging.handler": Mock(LoggingHandler=logging_handler_mock), "azure.monitor.opentelemetry.exporter.export.logs._processor": Mock( _AzureBatchLogRecordProcessor=blrp_mock ), @@ -724,7 +725,8 @@ def test_setup_logging_disable_performance_counters(self, get_logger_mock, pclp_ "sys.modules", { "opentelemetry._logs": Mock(set_logger_provider=set_logger_provider_mock), - "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock, LoggingHandler=logging_handler_mock), + "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock), + "opentelemetry.instrumentation.logging.handler": Mock(LoggingHandler=logging_handler_mock), "azure.monitor.opentelemetry.exporter.export.logs._processor": Mock( _AzureBatchLogRecordProcessor=blrp_mock ), From cf78566c81d1346c63d31d4891b73edbd528430b Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:28:30 -0800 Subject: [PATCH 2/4] Update CHANGELOG --- sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 53b14be1b5f0..3dc9e6fc02c8 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -11,7 +11,7 @@ ### Other Changes - Change import path for `LoggingHandler` to accomodate upstream breaking changes -([#XXXXX](https://github.com/Azure/azure-sdk-for-python/pull/XXXXX)) +([#45539](https://github.com/Azure/azure-sdk-for-python/pull/45539)) ## 1.8.6 (2026-02-05) From b3517add6b09f55be5dfd4cec0324efc7ab224b9 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:36:33 -0800 Subject: [PATCH 3/4] Update CHANGELOG --- sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 3dc9e6fc02c8..554ee80078ac 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -10,7 +10,7 @@ ### Bugs Fixed ### Other Changes -- Change import path for `LoggingHandler` to accomodate upstream breaking changes +- Change import path for `LoggingHandler` to accommodate upstream breaking changes ([#45539](https://github.com/Azure/azure-sdk-for-python/pull/45539)) ## 1.8.6 (2026-02-05) From d9397eabb94ed15a8faa486bbcc34713c8a3a39c Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 15:16:07 -0800 Subject: [PATCH 4/4] fix dep --- .../azure-monitor-opentelemetry/setup.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index 88c986f95391..7fab5cfb557e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -85,15 +85,15 @@ "azure-core<2.0.0,>=1.28.0", "azure-core-tracing-opentelemetry~=1.0.0b11", "azure-monitor-opentelemetry-exporter~=1.0.0b47", - "opentelemetry-sdk~=1.40", - "opentelemetry-instrumentation-django~=0.61b0", - "opentelemetry-instrumentation-fastapi~=0.61b0", - "opentelemetry-instrumentation-flask~=0.61b0", - "opentelemetry-instrumentation-psycopg2~=0.61b0", - "opentelemetry-instrumentation-requests~=0.61b0", - "opentelemetry-instrumentation-urllib~=0.61b0", - "opentelemetry-instrumentation-urllib3~=0.61b0", - "opentelemetry-instrumentation-logging~=0.61b0", + "opentelemetry-sdk==1.40", + "opentelemetry-instrumentation-django==0.61b0", + "opentelemetry-instrumentation-fastapi==0.61b0", + "opentelemetry-instrumentation-flask==0.61b0", + "opentelemetry-instrumentation-psycopg2==0.61b0", + "opentelemetry-instrumentation-requests==0.61b0", + "opentelemetry-instrumentation-urllib==0.61b0", + "opentelemetry-instrumentation-urllib3==0.61b0", + "opentelemetry-instrumentation-logging==0.61b0", "opentelemetry-resource-detector-azure<1.0.0,>=0.1.5", ], entry_points={