Reverting [Azure#27900]. Pinning to < Otel 1.15 instead

jeremydvoss · Dec 15, 2022 · 8c9aa82 · 8c9aa82
1 parent faf48cc
commit 8c9aa82
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
@@ -11,11 +11,10 @@
 
 ### Breaking Changes
 
-- Update to OpenTelemetry api/sdk v1.15.0
-    ([#27900](https://github.com/Azure/azure-sdk-for-python/issues/27900))
-
 ### Bugs Fixed
 
+- Pinning OpenTelemetry SDK and API to between 1.12 and 1.14 to avoid bug from change in module path. Reverting [#27900]
+    ([#xxxxx](https://github.com/Azure/azure-sdk-for-python/pull/xxxxx))
 - Pass along sampleRate in SpanEvents from Span
     ([#27629](https://github.com/Azure/azure-sdk-for-python/pull/27629))
 

diff --git a/...itor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py b/...itor-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/logs/_exporter.py
@@ -3,7 +3,7 @@
 import logging
 from typing import Sequence, Any
 
-from opentelemetry._logs.severity import SeverityNumber
+from opentelemetry.sdk._logs.severity import SeverityNumber
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.sdk._logs import LogData
 from opentelemetry.sdk._logs.export import LogExporter, LogExportResult

diff --git 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.15.0",
-        "opentelemetry-sdk<2.0.0,>=1.15.0",
+        "opentelemetry-api<1.15.0,>=1.12.0",
+        "opentelemetry-sdk<1.15.0,>=1.12.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
@@ -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._logs.severity import SeverityNumber
+from opentelemetry.sdk._logs.severity import SeverityNumber
 
 from azure.monitor.opentelemetry.exporter.export._base import ExportResult
 from azure.monitor.opentelemetry.exporter.export.logs._exporter import (