OTLP exporter: Handle error case when no credentials supplied (#1366)

open-telemetry · Nov 18, 2020 · a085c10 · a085c10
1 parent d556b90
commit a085c10
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Add Gzip compression for exporter
   ([#1141](https://github.com/open-telemetry/opentelemetry-python/pull/1141))
+- OTLP exporter: Handle error case when no credentials supplied
+  ([#1366](https://github.com/open-telemetry/opentelemetry-python/pull/1366))
 ## Version 0.15b0
 
 Released 2020-11-02

diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py
@@ -53,7 +53,7 @@
     trace.set_tracer_provider(TracerProvider(resource=resource)))
     tracer = trace.get_tracer(__name__)
 
-    otlp_exporter = OTLPSpanExporter(endpoint="localhost:55680")
+    otlp_exporter = OTLPSpanExporter(endpoint="localhost:55680", insecure=True)
 
     span_processor = BatchExportSpanProcessor(otlp_exporter)
 

diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py
@@ -201,15 +201,23 @@ def __init__(
             self._client = self._stub(
                 insecure_channel(endpoint, compression=compression_algorithm)
             )
-        else:
-            credentials = credentials or _load_credential_from_file(
-                Configuration().EXPORTER_OTLP_CERTIFICATE
-            )
-            self._client = self._stub(
-                secure_channel(
-                    endpoint, credentials, compression=compression_algorithm
-                )
+            return
+
+        # secure mode
+        if (
+            credentials is None
+            and Configuration().EXPORTER_OTLP_CERTIFICATE is None
+        ):
+            raise ValueError("No credentials set in secure mode.")
+
+        credentials = credentials or _load_credential_from_file(
+            Configuration().EXPORTER_OTLP_CERTIFICATE
+        )
+        self._client = self._stub(
+            secure_channel(
+                endpoint, credentials, compression=compression_algorithm
             )
+        )
 
     @abstractmethod
     def _translate_data(

diff --git a/exporter/opentelemetry-exporter-otlp/tests/test_otlp_metric_exporter.py b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_metric_exporter.py
@@ -91,6 +91,10 @@ def test_env_variables(self, mock_exporter_mixin):
         self.assertIsNotNone(kwargs["credentials"])
         self.assertIsInstance(kwargs["credentials"], ChannelCredentials)
 
+    def test_no_credentials_error(self):
+        with self.assertRaises(ValueError):
+            OTLPMetricsExporter()
+
     @patch("opentelemetry.sdk.metrics.export.aggregate.time_ns")
     def test_translate_metrics(self, mock_time_ns):
         # pylint: disable=no-member

diff --git a/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py
@@ -183,6 +183,10 @@ def test_env_variables(self, mock_exporter_mixin):
         self.assertIsNotNone(kwargs["credentials"])
         self.assertIsInstance(kwargs["credentials"], ChannelCredentials)
 
+    def test_no_credentials_error(self):
+        with self.assertRaises(ValueError):
+            OTLPSpanExporter()
+
     @patch("opentelemetry.exporter.otlp.exporter.expo")
     @patch("opentelemetry.exporter.otlp.exporter.sleep")
     def test_unavailable(self, mock_sleep, mock_expo):