Release 1.0.0b11 Hotfix. Reverting [#27913]. Pinning to < Otel 1.15 i…

…nstead (#27958) * Release hotfix 1.0.0b11. Reverting #27913. Pinning to < OTel 1.15 * shared_requirements
Azure · Dec 16, 2022 · 4bdaacc · 4bdaacc
1 parent 2a44691
commit 4bdaacc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0b11 (Unreleased)
+## 1.0.0b11 (2022-12-15)
 
 ### Features Added
 
@@ -9,18 +9,13 @@
 - Add azure-sdk usage to instrumentations statsbeat
     ([#27756](https://github.com/Azure/azure-sdk-for-python/pull/27756))
 
-### 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 [#27913]
+    ([#27958](https://github.com/Azure/azure-sdk-for-python/pull/27958))
 - Pass along sampleRate in SpanEvents from Span
     ([#27629](https://github.com/Azure/azure-sdk-for-python/pull/27629))
 
-### Other Changes
-
 ## 1.0.0b10 (2022-11-10)
 
 ### Bugs Fixed

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 (

diff --git a/shared_requirements.txt b/shared_requirements.txt
@@ -309,9 +309,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.15.0
+#override azure-monitor-opentelemetry-exporter opentelemetry-api<1.15.0,>=1.12.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.15.0
+#override azure-monitor-opentelemetry-exporter opentelemetry-sdk<1.15.0,>=1.12.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