Skip to content
Merged
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
- 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))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 10 additions & 9 deletions sdk/monitor/azure-monitor-opentelemetry/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
Expand Down Expand Up @@ -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
),
Expand Down
1 change: 1 addition & 0 deletions shared_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down