From 15ed65b56ba6deee95e9951614f3292e33473504 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Thu, 12 Mar 2026 17:27:55 -0700 Subject: [PATCH 1/4] Remove deprecated events package and methods --- .../azure-monitor-opentelemetry/CHANGELOG.md | 2 ++ .../azure/monitor/opentelemetry/_configure.py | 15 ----------- .../tests/test_configure.py | 25 ------------------- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index c3af9523c59b..a82397f39925 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 +- Remove deprecated events packages. + - 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..670f5bd144de 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/azure/monitor/opentelemetry/_configure.py @@ -266,21 +266,6 @@ def _setup_logging(configurations: Dict[str, ConfigurationValue]): ) logger.addHandler(handler) - # Setup Events - try: - from opentelemetry._events import _set_event_logger_provider - from opentelemetry.sdk._events import EventLoggerProvider - - event_provider = EventLoggerProvider(logger_provider) - _set_event_logger_provider(event_provider, False) - except ImportError as ex: - # If the events is not available, we will not set it up. - # This could possibly be due to breaking change in upstream OpenTelemetry - # Advise user to upgrade to latest OpenTelemetry version - _logger.warning( # pylint: disable=do-not-log-exceptions-if-not-debug - "Exception occurred when setting up Events. Please upgrade to the latest OpenTelemetry version: %s.", - ex, - ) except ImportError as ex: # If the events is not available, we will not set it up. # This could possibly be due to breaking change in upstream OpenTelemetry diff --git a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py index 7adfbeb5b33f..bdf1e2f9c259 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py +++ b/sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py @@ -543,8 +543,6 @@ def test_setup_logging(self, get_logger_mock, pclp_mock): log_exporter_mock = Mock() blrp_mock = Mock() logging_handler_mock = Mock() - elp_mock = Mock() - set_elp_mock = Mock() lp_init_mock = Mock() lp_mock.return_value = lp_init_mock @@ -560,8 +558,6 @@ def test_setup_logging(self, get_logger_mock, pclp_mock): custom_lrp = Mock() get_logger_mock.return_value = logger_mock formatter_init_mock = Mock() - elp_init_mock = Mock() - elp_mock.return_value = elp_init_mock pclp_init_mock = Mock() pclp_mock.return_value = pclp_init_mock configurations = { @@ -584,8 +580,6 @@ def test_setup_logging(self, get_logger_mock, pclp_mock): _AzureBatchLogRecordProcessor=blrp_mock ), "azure.monitor.opentelemetry.exporter": Mock(AzureMonitorLogExporter=log_exporter_mock), - "opentelemetry._events": Mock(_set_event_logger_provider=set_elp_mock), - "opentelemetry.sdk._events": Mock(EventLoggerProvider=elp_mock), }, ): _setup_logging(configurations) @@ -605,8 +599,6 @@ def test_setup_logging(self, get_logger_mock, pclp_mock): logging_handler_init_mock.setFormatter.assert_called_once_with(formatter_init_mock) get_logger_mock.assert_called_once_with("test") logger_mock.addHandler.assert_called_once_with(logging_handler_init_mock) - elp_mock.assert_called_once_with(lp_init_mock) - set_elp_mock.assert_called_once_with(elp_init_mock, False) @patch("azure.monitor.opentelemetry._configure._PerformanceCountersLogRecordProcessor") @patch("azure.monitor.opentelemetry._configure.isinstance") @@ -617,8 +609,6 @@ def test_setup_logging_duplicate_logger(self, get_logger_mock, instance_mock, pc set_logger_provider_mock = Mock() log_exporter_mock = Mock() blrp_mock = Mock() - elp_mock = Mock() - set_elp_mock = Mock() # Create mock instances lp_init_mock = Mock() @@ -639,9 +629,6 @@ def test_setup_logging_duplicate_logger(self, get_logger_mock, instance_mock, pc get_logger_mock.return_value = logger_mock instance_mock.return_value = True - elp_init_mock = Mock() - elp_mock.return_value = elp_init_mock - configurations = { "connection_string": "test_cs", "enable_performance_counters": True, @@ -662,8 +649,6 @@ def test_setup_logging_duplicate_logger(self, get_logger_mock, instance_mock, pc _AzureBatchLogRecordProcessor=blrp_mock ), "azure.monitor.opentelemetry.exporter": Mock(AzureMonitorLogExporter=log_exporter_mock), - "opentelemetry._events": Mock(_set_event_logger_provider=set_elp_mock), - "opentelemetry.sdk._events": Mock(EventLoggerProvider=elp_mock), }, ): _setup_logging(configurations) @@ -678,8 +663,6 @@ def test_setup_logging_duplicate_logger(self, get_logger_mock, instance_mock, pc get_logger_mock.assert_called_once_with("test") # The logger already has a LoggingHandler, so addHandler should not be called logger_mock.addHandler.assert_not_called() - elp_mock.assert_called_once_with(lp_init_mock) - set_elp_mock.assert_called_once_with(elp_init_mock, False) @patch("azure.monitor.opentelemetry._configure._PerformanceCountersLogRecordProcessor") @patch("azure.monitor.opentelemetry._configure.getLogger") @@ -689,8 +672,6 @@ def test_setup_logging_disable_performance_counters(self, get_logger_mock, pclp_ log_exporter_mock = Mock() blrp_mock = Mock() logging_handler_mock = Mock() - elp_mock = Mock() - set_elp_mock = Mock() lp_init_mock = Mock() lp_mock.return_value = lp_init_mock @@ -705,8 +686,6 @@ def test_setup_logging_disable_performance_counters(self, get_logger_mock, pclp_ logger_mock.handlers = [] get_logger_mock.return_value = logger_mock formatter_init_mock = Mock() - elp_init_mock = Mock() - elp_mock.return_value = elp_init_mock pclp_init_mock = Mock() pclp_mock.return_value = pclp_init_mock configurations = { @@ -729,8 +708,6 @@ def test_setup_logging_disable_performance_counters(self, get_logger_mock, pclp_ _AzureBatchLogRecordProcessor=blrp_mock ), "azure.monitor.opentelemetry.exporter": Mock(AzureMonitorLogExporter=log_exporter_mock), - "opentelemetry._events": Mock(_set_event_logger_provider=set_elp_mock), - "opentelemetry.sdk._events": Mock(EventLoggerProvider=elp_mock), }, ): _setup_logging(configurations) @@ -745,8 +722,6 @@ def test_setup_logging_disable_performance_counters(self, get_logger_mock, pclp_ logging_handler_init_mock.setFormatter.assert_called_once_with(formatter_init_mock) get_logger_mock.assert_called_once_with("test") logger_mock.addHandler.assert_called_once_with(logging_handler_init_mock) - elp_mock.assert_called_once_with(lp_init_mock) - set_elp_mock.assert_called_once_with(elp_init_mock, False) @patch( "azure.monitor.opentelemetry._configure.enable_performance_counters", From f6f811afbe6805271b720c621f1cba4eeaf869a3 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 13 Mar 2026 07:51:32 -0700 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 a82397f39925..dcca4a5f9488 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md @@ -11,7 +11,7 @@ ### Other Changes - Remove deprecated events packages. - + ([#45684](https://github.com/Azure/azure-sdk-for-python/pull/45684)) - Remove internal import from sample file ([#45619](https://github.com/Azure/azure-sdk-for-python/pull/45619)) From bc26e85c5867db8e2006734f412f21d2b1cc8531 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 13 Mar 2026 08:01:54 -0700 Subject: [PATCH 3/4] Retrigger CI/CD pipeline From 486de63f1c0e224a9a965fc650eb39ba2f9b5527 Mon Sep 17 00:00:00 2001 From: Radhika Gupta Date: Fri, 13 Mar 2026 08:53:09 -0700 Subject: [PATCH 4/4] Retrigger CI/CD pipeline