Updating export result enums (#590)

open-telemetry · Apr 20, 2020 · 920b4b4 · 920b4b4
1 parent 03292aa
commit 920b4b4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/...ntelemetry-ext-otcollector/src/opentelemetry/ext/otcollector/metrics_exporter/__init__.py b/...ntelemetry-ext-otcollector/src/opentelemetry/ext/otcollector/metrics_exporter/__init__.py
@@ -80,7 +80,7 @@ def export(
                 pass
 
         except grpc.RpcError:
-            return MetricsExportResult.FAILED_RETRYABLE
+            return MetricsExportResult.FAILURE
 
         return MetricsExportResult.SUCCESS
 

diff --git a/...pentelemetry-ext-otcollector/src/opentelemetry/ext/otcollector/trace_exporter/__init__.py b/...pentelemetry-ext-otcollector/src/opentelemetry/ext/otcollector/trace_exporter/__init__.py
@@ -73,7 +73,7 @@ def export(self, spans: Sequence[Span]) -> SpanExportResult:
                 pass
 
         except grpc.RpcError:
-            return SpanExportResult.FAILED_NOT_RETRYABLE
+            return SpanExportResult.FAILURE
 
         return SpanExportResult.SUCCESS
 

diff --git a/ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/__init__.py b/ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/__init__.py
@@ -142,8 +142,8 @@ def export(self, spans: Sequence[Span]) -> SpanExportResult:
             )
 
             if self.retry:
-                return SpanExportResult.FAILED_RETRYABLE
-            return SpanExportResult.FAILED_NOT_RETRYABLE
+                return SpanExportResult.FAILURE
+            return SpanExportResult.FAILURE
         return SpanExportResult.SUCCESS
 
     def _translate_to_zipkin(self, spans: Sequence[Span]):

diff --git a/ext/opentelemetry-ext-zipkin/tests/test_zipkin_exporter.py b/ext/opentelemetry-ext-zipkin/tests/test_zipkin_exporter.py
@@ -242,4 +242,4 @@ def test_invalid_response(self, mock_post):
         spans = []
         exporter = ZipkinSpanExporter("test-service")
         status = exporter.export(spans)
-        self.assertEqual(SpanExportResult.FAILED_NOT_RETRYABLE, status)
+        self.assertEqual(SpanExportResult.FAILURE, status)
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/__init__.py
@@ -21,8 +21,7 @@
 
 class MetricsExportResult(Enum):
     SUCCESS = 0
-    FAILED_RETRYABLE = 1
-    FAILED_NOT_RETRYABLE = 2
+    FAILURE = 1
 
 
 class MetricRecord:

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py
@@ -31,8 +31,7 @@
 
 class SpanExportResult(Enum):
     SUCCESS = 0
-    FAILED_RETRYABLE = 1
-    FAILED_NOT_RETRYABLE = 2
+    FAILURE = 1
 
 
 class SpanExporter:

diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/in_memory_span_exporter.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/export/in_memory_span_exporter.py
@@ -45,7 +45,7 @@ def get_finished_spans(self):
     def export(self, spans: typing.Sequence[Span]) -> SpanExportResult:
         """Stores a list of spans in memory."""
         if self._stopped:
-            return SpanExportResult.FAILED_NOT_RETRYABLE
+            return SpanExportResult.FAILURE
         with self._lock:
             self._finished_spans.extend(spans)
         return SpanExportResult.SUCCESS

diff --git a/opentelemetry-sdk/tests/trace/export/test_in_memory_span_exporter.py b/opentelemetry-sdk/tests/trace/export/test_in_memory_span_exporter.py
@@ -72,4 +72,4 @@ def test_return_code(self):
 
         # after shutdown export should fail
         ret = memory_exporter.export(span_list)
-        self.assertEqual(ret, export.SpanExportResult.FAILED_NOT_RETRYABLE)
+        self.assertEqual(ret, export.SpanExportResult.FAILURE)