From 51df402126b93c790d0100c4cc2f56392010add5 Mon Sep 17 00:00:00 2001 From: jerevoss Date: Thu, 15 Dec 2022 10:25:39 -0800 Subject: [PATCH] Release hotfix 1.0.0b11. Reverting #27913. Pinning to < OTel 1.15 --- .../azure-monitor-opentelemetry-exporter/CHANGELOG.md | 11 +++-------- .../opentelemetry/exporter/export/logs/_exporter.py | 2 +- .../azure-monitor-opentelemetry-exporter/setup.py | 4 ++-- .../tests/logs/test_logs.py | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md index b158789b716c..74f764737ec4 100644 --- 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/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 3ef9d4bdbd34..9a310f6965c8 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,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 index 0a441d8a1310..d38088cb3a92 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.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 index adb876aac278..e7ba5c07080c 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._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 (