From 616b953ff20cf2c28413754aa0c0743c293105e2 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:26:19 -0800 Subject: [PATCH 1/9] 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 c3af9523c59b..ca23bc412829 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)) - Remove internal import from sample file ([#45619](https://github.com/Azure/azure-sdk-for-python/pull/45619)) 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 b711e4191e9f4166253ef992b362f6b38e70afad Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:28:30 -0800 Subject: [PATCH 2/9] 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 ca23bc412829..4c3505cc1915 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)) - Remove internal import from sample file ([#45619](https://github.com/Azure/azure-sdk-for-python/pull/45619)) From c923f01dcea067bf80a1ad1c87d0574192e31506 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:36:33 -0800 Subject: [PATCH 3/9] 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 4c3505cc1915..9df87af06c2a 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)) - Remove internal import from sample file ([#45619](https://github.com/Azure/azure-sdk-for-python/pull/45619)) From 2af1e20de21af9fd27fb2be1a8d2a2563fe2b85f Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 15:16:07 -0800 Subject: [PATCH 4/9] 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={ From 3f449c581a992a2662cc4556deb444fb185e26ef Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 18 Mar 2026 11:26:41 -0700 Subject: [PATCH 5/9] Update exporter version --- sdk/monitor/azure-monitor-opentelemetry/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index 7fab5cfb557e..601d04d8b284 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -84,7 +84,7 @@ install_requires=[ "azure-core<2.0.0,>=1.28.0", "azure-core-tracing-opentelemetry~=1.0.0b11", - "azure-monitor-opentelemetry-exporter~=1.0.0b47", + "azure-monitor-opentelemetry-exporter~=1.0.0b49", "opentelemetry-sdk==1.40", "opentelemetry-instrumentation-django==0.61b0", "opentelemetry-instrumentation-fastapi==0.61b0", From d0098a827422b53c5996337cf18291b0ec0e5880 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 18 Mar 2026 16:07:58 -0700 Subject: [PATCH 6/9] Retrigger CI/CD pipeline From 743c916b06aa8dfd43aa6f9bcc61b896e90f3834 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 18 Mar 2026 16:13:46 -0700 Subject: [PATCH 7/9] Remove trailing space --- 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 9df87af06c2a..6cdf6bb3d500 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 accommodate upstream breaking changes -([#45539](https://github.com/Azure/azure-sdk-for-python/pull/45539)) + ([#45539](https://github.com/Azure/azure-sdk-for-python/pull/45539)) - Remove internal import from sample file ([#45619](https://github.com/Azure/azure-sdk-for-python/pull/45619)) From 610892dc2f1f040ac3f7531b92c29fcf53647da4 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 18 Mar 2026 17:38:30 -0700 Subject: [PATCH 8/9] Retrigger CI/CD pipeline From 5b5be4d530abfdfaa33c981c4bc51612093d8707 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 18 Mar 2026 18:06:30 -0700 Subject: [PATCH 9/9] Add logging instrumentation to shared requirements --- shared_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/shared_requirements.txt b/shared_requirements.txt index b5e1b85f184a..b7ed14d4376c 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -52,6 +52,7 @@ opentelemetry-instrumentation opentelemetry-instrumentation-django opentelemetry-instrumentation-fastapi opentelemetry-instrumentation-flask +opentelemetry-instrumentation-logging opentelemetry-instrumentation-psycopg2 opentelemetry-instrumentation-requests opentelemetry-instrumentation-urllib