diff --git a/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry/CHANGELOG.md index c3af9523c59b..6cdf6bb3d500 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 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)) 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..601d04d8b284 100644 --- a/sdk/monitor/azure-monitor-opentelemetry/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry/setup.py @@ -84,15 +84,16 @@ install_requires=[ "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", + "azure-monitor-opentelemetry-exporter~=1.0.0b49", + "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 ), 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