diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index 1d5e1614d1eb..b158789b716c 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md @@ -11,6 +11,9 @@ ### Breaking Changes +- Update to OpenTelemetry api/sdk v1.15.0 + ([#27900](https://github.com/Azure/azure-sdk-for-python/issues/27900)) + ### Bugs Fixed - Pass along sampleRate in SpanEvents from Span diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py index acf468b37b0a..3ef9d4bdbd34 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py @@ -3,9 +3,9 @@ import logging from typing import Sequence, Any +from opentelemetry._logs.severity import SeverityNumber from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.sdk._logs import LogData -from opentelemetry.sdk._logs.severity import SeverityNumber from opentelemetry.sdk._logs.export import LogExporter, LogExportResult from azure.monitor.opentelemetry.exporter import _utils diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py index c948111c9639..0a441d8a1310 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py @@ -84,8 +84,8 @@ "azure-core<2.0.0,>=1.23.0", "fixedint==0.1.6", "msrest>=0.6.10", - "opentelemetry-api<2.0.0,>=1.12.0", - "opentelemetry-sdk<2.0.0,>=1.12.0", + "opentelemetry-api<2.0.0,>=1.15.0", + "opentelemetry-sdk<2.0.0,>=1.15.0", ], entry_points={ "opentelemetry_traces_exporter": [ diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py index e7ba5c07080c..adb876aac278 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/tests/logs/test_logs.py @@ -12,7 +12,7 @@ from opentelemetry.sdk.util.instrumentation import InstrumentationScope from opentelemetry.sdk.resources import Resource from opentelemetry.sdk._logs.export import LogExportResult -from opentelemetry.sdk._logs.severity import SeverityNumber +from opentelemetry._logs.severity import SeverityNumber from azure.monitor.opentelemetry.exporter.export._base import ExportResult from azure.monitor.opentelemetry.exporter.export.logs._exporter import ( diff --git a/shared_requirements.txt b/shared_requirements.txt index 60c2382a7e90..7a383c41b4cf 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -306,9 +306,9 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0 #override azure-monitor-opentelemetry-exporter fixedint==0.1.6 #override azure-monitor-opentelemetry-exporter msrest>=0.6.10 #override azure-mgmt-healthbot azure-mgmt-core>=1.3.2,<2.0.0 -#override azure-monitor-opentelemetry-exporter opentelemetry-api<2.0.0,>=1.12.0 +#override azure-monitor-opentelemetry-exporter opentelemetry-api<2.0.0,>=1.15.0 #override azure-mgmt-cosmosdb typing-extensions>=4.3.0; python_version<'3.8.0' -#override azure-monitor-opentelemetry-exporter opentelemetry-sdk<2.0.0,>=1.12.0 +#override azure-monitor-opentelemetry-exporter opentelemetry-sdk<2.0.0,>=1.15.0 #override azure-mgmt-support msrest>=0.7.1 #override azure-core-tracing-opentelemetry opentelemetry-api<2.0.0,>=1.0.0 #override azure-identity six>=1.12.0