From ca55d93102959ac6b37e8eb65b4ca001c969762d Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 26 Feb 2026 13:13:48 -0800 Subject: [PATCH 01/14] Modify import for LoggingHandler following breaking changes in upstream OTEL --- .../README.md | 18 ++++++------------ .../samples/logs/sample_correlate.py | 6 ++---- .../samples/logs/sample_custom_event.py | 6 ++---- .../samples/logs/sample_exception.py | 6 ++---- .../samples/logs/sample_log.py | 6 ++---- .../samples/logs/sample_properties.py | 6 ++---- .../azure-monitor-opentelemetry/CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 3 ++- .../azure-monitor-opentelemetry/setup.py | 1 + 9 files changed, 21 insertions(+), 33 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md index b4bb06afad30..68d18c38f10e 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md @@ -177,10 +177,8 @@ import os import logging 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 opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter @@ -260,10 +258,8 @@ import os import logging 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 opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter @@ -300,10 +296,8 @@ from opentelemetry._logs import ( get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_correlate.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_correlate.py index e93f984a5dd5..a054a2d6be48 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_correlate.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_correlate.py @@ -12,10 +12,8 @@ get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from opentelemetry.sdk.trace import TracerProvider diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_custom_event.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_custom_event.py index 753fccf7b1c1..82babc90c981 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_custom_event.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_custom_event.py @@ -12,10 +12,8 @@ get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_exception.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_exception.py index 4dfd7bc05635..c595727cbbf8 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_exception.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_exception.py @@ -11,10 +11,8 @@ get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_log.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_log.py index d1d276a31029..3f984fbb19ba 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_log.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_log.py @@ -12,10 +12,8 @@ get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_properties.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_properties.py index bb432368d54e..0ac9ee3f72af 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_properties.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/samples/logs/sample_properties.py @@ -11,10 +11,8 @@ get_logger_provider, set_logger_provider, ) -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 0b968e0a84dd..3460f03f023c 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -6,6 +6,8 @@ - Add Browser SDK loader feature ([#42904](https://github.com/Azure/azure-sdk-for-python/pull/44162)) ### Breaking Changes +- Change import path for `LoggingHandler` to match the upstream breaking changes +([#XXXXX](https://github.com/Azure/azure-sdk-for-python/pull/XXXXX)) ### Bugs Fixed 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..5fd82812c9e0 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -94,6 +94,7 @@ "opentelemetry-instrumentation-urllib==0.60b0", "opentelemetry-instrumentation-urllib3==0.60b0", "opentelemetry-resource-detector-azure<1.0.0,>=0.1.5", + "opentelemetry-instrumentation-logging==0.61b0", ], entry_points={ "opentelemetry_distro": [ From d9b8aa80c2f5505383cd259d99756292a2fb2def Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 4 Mar 2026 12:47:45 -0800 Subject: [PATCH 02/14] Updated README and setup.py --- .../README.md | 8 +++----- sdk/monitor/azure-monitor-opentelemetry/setup.py | 16 ++++++++-------- .../tests/test_configure.py | 6 ++++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md index 68d18c38f10e..e41c66505670 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md @@ -216,12 +216,10 @@ import logging from opentelemetry import trace from opentelemetry._logs import set_logger_provider -from opentelemetry.sdk._logs import ( - LoggerProvider, - LoggingHandler, -) +from opentelemetry.sdk._logs import LoggerProvider from opentelemetry.sdk._logs.export import BatchLogRecordProcessor from opentelemetry.sdk.trace import TracerProvider +from opentelemetry.instrumentation.logging.handler import LoggingHandler from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter @@ -687,7 +685,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio [logger]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.Logger [logger_provider]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LoggerProvider [log_record_processor]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LogRecordProcessor -[logging_handler]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LoggingHandler +[logging_handler]: https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/handler.py [log_reference]: https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py [ot_logging_sdk]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html [metric_concept]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/overview.md#metric-signal diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index 5fd82812c9e0..3e3d10253c1a 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -86,15 +86,15 @@ "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-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-resource-detector-azure<1.0.0,>=0.1.5", - "opentelemetry-instrumentation-logging==0.61b0", + "opentelemetry-instrumentation-logging~=0.61b0", ], entry_points={ "opentelemetry_distro": [ 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 4eda687ee366f8569ca94d9c4930ca7dfe8bd9fb Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 4 Mar 2026 12:55:12 -0800 Subject: [PATCH 03/14] Update CHANGELOG --- sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md | 2 ++ sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index bd372f491e81..ffb1331952da 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -19,6 +19,8 @@ ([#45252](https://github.com/Azure/azure-sdk-for-python/pull/45252)) ### Other Changes +- Change import path for `LoggingHandler` to accomodate upstream breaking changes +([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) ## 1.0.0b48 (2026-02-05) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index 3460f03f023c..b985149dd41a 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -6,12 +6,12 @@ - Add Browser SDK loader feature ([#42904](https://github.com/Azure/azure-sdk-for-python/pull/44162)) ### Breaking Changes -- Change import path for `LoggingHandler` to match the upstream breaking changes -([#XXXXX](https://github.com/Azure/azure-sdk-for-python/pull/XXXXX)) ### Bugs Fixed ### Other Changes +- Change import path for `LoggingHandler` to accomodate upstream breaking changes +([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) ## 1.8.6 (2026-02-05) From 6f4cb1e34e28a2ccae74913bb75ae8f7f026a5b9 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 4 Mar 2026 14:16:03 -0800 Subject: [PATCH 04/14] Update sdk 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 3e3d10253c1a..8661b21bea19 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -85,7 +85,7 @@ "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-sdk==1.40", "opentelemetry-instrumentation-django~=0.61b0", "opentelemetry-instrumentation-fastapi~=0.61b0", "opentelemetry-instrumentation-flask~=0.61b0", From 299af3ea8d6c4ea09973c8dd5e6ebe4454ec1588 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Wed, 4 Mar 2026 15:03:55 -0800 Subject: [PATCH 05/14] Fix dep issue --- sdk/monitor/azure-monitor-opentelemetry/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/setup.py b/sdk/monitor/azure-monitor-opentelemetry/setup.py index 8661b21bea19..88c986f95391 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -85,7 +85,7 @@ "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-sdk~=1.40", "opentelemetry-instrumentation-django~=0.61b0", "opentelemetry-instrumentation-fastapi~=0.61b0", "opentelemetry-instrumentation-flask~=0.61b0", @@ -93,8 +93,8 @@ "opentelemetry-instrumentation-requests~=0.61b0", "opentelemetry-instrumentation-urllib~=0.61b0", "opentelemetry-instrumentation-urllib3~=0.61b0", - "opentelemetry-resource-detector-azure<1.0.0,>=0.1.5", "opentelemetry-instrumentation-logging~=0.61b0", + "opentelemetry-resource-detector-azure<1.0.0,>=0.1.5", ], entry_points={ "opentelemetry_distro": [ From 732ea30a6b3f347a28b7d8ad6c50539ad9cdd6dc Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 09:58:47 -0800 Subject: [PATCH 06/14] Revert doc change to check if CI/CD passes --- sdk/monitor/azure-monitor-opentelemetry-exporter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md index e41c66505670..29d6513fa933 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/README.md @@ -685,7 +685,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio [logger]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.Logger [logger_provider]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LoggerProvider [log_record_processor]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LogRecordProcessor -[logging_handler]: https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/handler.py +[logging_handler]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html#opentelemetry.sdk._logs.LoggingHandler [log_reference]: https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py [ot_logging_sdk]: https://opentelemetry-python.readthedocs.io/en/stable/sdk/_logs.html [metric_concept]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/overview.md#metric-signal From 06cba31f07e726630c7f7c64c0b5301d2fa7779c Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 10:59:51 -0800 Subject: [PATCH 07/14] Fix dep in exporter --- sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py index 1f1fa32aaa66..9b6b818c9324 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py @@ -87,8 +87,8 @@ "azure-core<2.0.0,>=1.28.0", "azure-identity~=1.17", "msrest>=0.6.10", - "opentelemetry-api==1.39", - "opentelemetry-sdk==1.39", + "opentelemetry-api~=1.40", + "opentelemetry-sdk~=1.40", "psutil>=5.9,<8", ], entry_points={ From 264e28d0814f03140d9553336e72a3cb16df2bfe Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:01:52 -0800 Subject: [PATCH 08/14] Move distro changes out to another PR --- .../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, 11 insertions(+), 17 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index b985149dd41a..0b968e0a84dd 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -10,8 +10,6 @@ ### Bugs Fixed ### Other Changes -- Change import path for `LoggingHandler` to accomodate upstream breaking changes -([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) ## 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 e60c78829465..897758fbc2a3 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -223,8 +223,7 @@ 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 - from opentelemetry.instrumentation.logging.handler import LoggingHandler + from opentelemetry.sdk._logs import LoggerProvider, 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 88c986f95391..13494f9ec99f 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -85,15 +85,14 @@ "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.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-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 48291b881756..d05f5518b393 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py @@ -579,8 +579,7 @@ 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), - "opentelemetry.instrumentation.logging.handler": Mock(LoggingHandler=logging_handler_mock), + "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock, LoggingHandler=logging_handler_mock), "azure.monitor.opentelemetry.exporter.export.logs._processor": Mock( _AzureBatchLogRecordProcessor=blrp_mock ), @@ -725,8 +724,7 @@ 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), - "opentelemetry.instrumentation.logging.handler": Mock(LoggingHandler=logging_handler_mock), + "opentelemetry.sdk._logs": Mock(LoggerProvider=lp_mock, LoggingHandler=logging_handler_mock) "azure.monitor.opentelemetry.exporter.export.logs._processor": Mock( _AzureBatchLogRecordProcessor=blrp_mock ), From 9d602af952e25fca49fc2caa65e1b966bd7dae4c Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:02:49 -0800 Subject: [PATCH 09/14] Add back comma --- sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py index d05f5518b393..7adfbeb5b33f 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py @@ -724,7 +724,7 @@ 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, LoggingHandler=logging_handler_mock), "azure.monitor.opentelemetry.exporter.export.logs._processor": Mock( _AzureBatchLogRecordProcessor=blrp_mock ), From 716d2b2f207310f49c6b82860c899a42a65f7220 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 13:37:14 -0800 Subject: [PATCH 10/14] Update CHANGELOG --- sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index ffb1331952da..aa3d33c43565 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -19,7 +19,7 @@ ([#45252](https://github.com/Azure/azure-sdk-for-python/pull/45252)) ### Other Changes -- Change import path for `LoggingHandler` to accomodate upstream breaking changes +- Change import path for `LoggingHandler` to accommodate upstream breaking changes ([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) ## 1.0.0b48 (2026-02-05) From a001fd2bf1561c9729b118671d98008f47edcf53 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 5 Mar 2026 15:42:54 -0800 Subject: [PATCH 11/14] fix dep --- sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py index 9b6b818c9324..df994a6dc098 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py @@ -87,8 +87,8 @@ "azure-core<2.0.0,>=1.28.0", "azure-identity~=1.17", "msrest>=0.6.10", - "opentelemetry-api~=1.40", - "opentelemetry-sdk~=1.40", + "opentelemetry-api==1.40", + "opentelemetry-sdk==1.40", "psutil>=5.9,<8", ], entry_points={ From d73c43277234b5c6e3e4bd2fcd75d0a6552a8ea8 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 6 Mar 2026 08:28:13 -0800 Subject: [PATCH 12/14] Retrigger CI/CD pipeline From 5fb7ae9fc6e828b2ded7937224c024de8a8f3b78 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 6 Mar 2026 09:10:01 -0800 Subject: [PATCH 13/14] Retrigger CI/CD pipeline From 3000f72f60ce62e28c5b5263754ffc8e3676cf56 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 6 Mar 2026 10:57:51 -0800 Subject: [PATCH 14/14] Update CHANGELOG --- .../azure-monitor-opentelemetry-exporter/CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index aa3d33c43565..9db6c4caa006 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -19,8 +19,9 @@ ([#45252](https://github.com/Azure/azure-sdk-for-python/pull/45252)) ### Other Changes -- Change import path for `LoggingHandler` to accommodate upstream breaking changes -([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) +- Change import path for `LoggingHandler` to accommodate upstream breaking changes - +[core](https://github.com/open-telemetry/opentelemetry-python/pull/4919) and [contrib](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4210) + ([#45516](https://github.com/Azure/azure-sdk-for-python/pull/45516)) ## 1.0.0b48 (2026-02-05)