Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
### Bugs Fixed

### 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))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 0 additions & 25 deletions sdk/monitor/azure-monitor-opentelemetry/tests/test_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = {
Expand All @@ -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)
Expand All @@ -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")
Expand All @@ -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()
Expand All @@ -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,
Expand All @@ -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)
Expand All @@ -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")
Expand All @@ -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
Expand All @@ -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 = {
Expand All @@ -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)
Expand All @@ -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",
Expand Down