Merge branch 'master' into falcon-instrumentation

Author: owais

.pylintrc

@@ -5,11 +5,11 @@
 # run arbitrary code.
 extension-pkg-whitelist=
 
-# Add files or directories to the blacklist. They should be base names, not
+# Add list of files or directories to be excluded. They should be base names, not
 # paths.
 ignore=CVS,gen,proto
 
-# Add files or directories matching the regex patterns to the blacklist. The
+# Add files or directories matching the regex patterns to be excluded. The
 # regex matches against base names, not paths.
 ignore-patterns=
 

exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py

@@ -215,9 +215,11 @@ def test_translate_to_jaeger(self):
         otel_spans[0].end(end_time=end_times[0])
 
         otel_spans[1].start(start_time=start_times[1])
+        otel_spans[1].resource = Resource({})
         otel_spans[1].end(end_time=end_times[1])
 
         otel_spans[2].start(start_time=start_times[2])
+        otel_spans[2].resource = Resource({})
         otel_spans[2].end(end_time=end_times[2])
 
         # pylint: disable=protected-access

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/exporter.py

@@ -186,7 +186,7 @@ def _export(self, data):
                 if error.code() == StatusCode.OK:
                     return self._result.SUCCESS
 
-                return self.result.FAILURE
+                return self._result.FAILURE
 
         return self._result.FAILURE
 

exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py

@@ -87,6 +87,14 @@ def Export(self, request, context):
         return ExportTraceServiceResponse()
 
 
+class TraceServiceServicerALREADY_EXISTS(TraceServiceServicer):
+    # pylint: disable=invalid-name,unused-argument,no-self-use
+    def Export(self, request, context):
+        context.set_code(StatusCode.ALREADY_EXISTS)
+
+        return ExportTraceServiceResponse()
+
+
 class TestOTLPSpanExporter(TestCase):
     def setUp(self):
         tracer_provider = TracerProvider()
@@ -178,6 +186,14 @@ def test_success(self):
             self.exporter.export([self.span]), SpanExportResult.SUCCESS
         )
 
+    def test_failure(self):
+        add_TraceServiceServicer_to_server(
+            TraceServiceServicerALREADY_EXISTS(), self.server
+        )
+        self.assertEqual(
+            self.exporter.export([self.span]), SpanExportResult.FAILURE
+        )
+
     def test_translate_spans(self):
 
         expected = ExportTraceServiceRequest(

exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py

@@ -165,6 +165,7 @@ def test_export(self):
         ]
 
         otel_spans[0].start(start_time=start_times[0])
+        otel_spans[0].resource = Resource({})
         # added here to preserve order
         otel_spans[0].set_attribute("key_bool", False)
         otel_spans[0].set_attribute("key_string", "hello_world")
@@ -185,6 +186,7 @@ def test_export(self):
         otel_spans[2].end(end_time=end_times[2])
 
         otel_spans[3].start(start_time=start_times[3])
+        otel_spans[3].resource = Resource({})
         otel_spans[3].end(end_time=end_times[3])
 
         service_name = "test-service"
@@ -295,6 +297,7 @@ def test_zero_padding(self):
         )
 
         otel_span.start(start_time=start_time)
+        otel_span.resource = Resource({})
         otel_span.end(end_time=end_time)
 
         service_name = "test-service"

instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg

@@ -41,6 +41,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 0.13dev0
+    opentelemetry-sdk == 0.13dev0
     psutil ~= 5.7.0
 
 [options.extras_require]