Update exporter to use opentelemetry api/sdk 1.12.0 (#25659)

Azure · Aug 11, 2022 · 8de7c12 · 8de7c12
1 parent aa09ef6
commit 8de7c12
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
@@ -5,10 +5,13 @@
 ### Features Added
 
 - Added storage configuration options
-    ([#25369](https://github.com/Azure/azure-sdk-for-python/pull/25369))
+    ([#25633](https://github.com/Azure/azure-sdk-for-python/pull/25633))
 
 ### Breaking Changes
 
+- Update to OpenTelemetry api/sdk v1.12.0
+    ([#25659](https://github.com/Azure/azure-sdk-for-python/pull/25659))
+
 ### Bugs Fixed
 
 - Opentelemetry span events have wrong ParentId in Azure Monitor logs

diff --git a/...r-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/metrics/_exporter.py b/...r-opentelemetry-exporter/azure/monitor/opentelemetry/exporter/export/metrics/_exporter.py
@@ -35,6 +35,14 @@
 class AzureMonitorMetricExporter(BaseExporter, MetricExporter):
     """Azure Monitor Metric exporter for OpenTelemetry."""
 
+    def __init__(self, **kwargs: Any) -> None:
+        BaseExporter.__init__(self, **kwargs)
+        MetricExporter.__init__(
+            self,
+            preferred_temporality=kwargs.get("preferred_temporality"),
+            preferred_aggregation=kwargs.get("preferred_aggregation"),
+        )
+
     def export(
         self,
         metrics_data: OTMetricsData,
@@ -70,6 +78,16 @@ def export(
             _logger.exception("Exception occurred while exporting the data.")
             return _get_metric_export_result(ExportResult.FAILED_NOT_RETRYABLE)
 
+    def force_flush(
+        self,
+        timeout_millis: float = 10_000,
+    ) -> None:
+        """
+        Ensure that export of any metrics currently received by the exporter
+        are completed as soon as possible.
+        """
+        # TODO
+
     def shutdown(
         self,
         timeout_millis: float = 30_000,  # pylint: disable=unused-argument

diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py b/sdk/monitor/azure-monitor-opentelemetry-exporter/setup.py
@@ -82,8 +82,8 @@
     install_requires=[
         "azure-core<2.0.0,>=1.23.0",
         "msrest>=0.6.10",
-        "opentelemetry-api==1.12.0rc1",
-        "opentelemetry-sdk==1.12.0rc1",
+        "opentelemetry-api<2.0.0,>=1.12.0",
+        "opentelemetry-sdk<2.0.0,>=1.12.0",
     ],
 )
 
diff --git a/shared_requirements.txt b/shared_requirements.txt
@@ -209,8 +209,8 @@ opentelemetry-sdk<2.0.0,>=1.5.0,!=1.10a0
 #override azure-ai-translation-document azure-core<2.0.0,>=1.14.0
 #override azure-monitor-opentelemetry-exporter azure-core<2.0.0,>=1.23.0
 #override azure-monitor-opentelemetry-exporter msrest>=0.6.10
-#override azure-monitor-opentelemetry-exporter opentelemetry-api==1.12.0rc1
-#override azure-monitor-opentelemetry-exporter opentelemetry-sdk==1.12.0rc1
+#override azure-monitor-opentelemetry-exporter opentelemetry-api<2.0.0,>=1.12.0
+#override azure-monitor-opentelemetry-exporter opentelemetry-sdk<2.0.0,>=1.12.0
 #override azure-core-tracing-opentelemetry opentelemetry-api<2.0.0,>=1.0.0
 #override azure-identity six>=1.12.0
 #override azure-keyvault-keys six>=1.12.0