Merge branch 'master' of https://github.com/open-telemetry/openteleme…

…try-python into exp
open-telemetry · Nov 12, 2020 · b8d7528 · b8d7528
2 parents 604c054 + 26bf23f
commit b8d7528
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py
@@ -70,13 +70,22 @@
 from opentelemetry.exporter.jaeger.gen.agent import Agent as agent
 from opentelemetry.exporter.jaeger.gen.jaeger import Collector as jaeger
 from opentelemetry.sdk.trace.export import Span, SpanExporter, SpanExportResult
+from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import StatusCode
 
 DEFAULT_AGENT_HOST_NAME = "localhost"
 DEFAULT_AGENT_PORT = 6831
 
 UDP_PACKET_MAX_LENGTH = 65000
 
+OTLP_JAEGER_SPAN_KIND = {
+    SpanKind.CLIENT: "client",
+    SpanKind.SERVER: "server",
+    SpanKind.CONSUMER: "consumer",
+    SpanKind.PRODUCER: "producer",
+    SpanKind.INTERNAL: "internal",
+}
+
 logger = logging.getLogger(__name__)
 
 
@@ -226,7 +235,7 @@ def _translate_to_jaeger(spans: Span):
             [
                 _get_long_tag("status.code", status.status_code.value),
                 _get_string_tag("status.message", status.description),
-                _get_string_tag("span.kind", span.kind.name),
+                _get_string_tag("span.kind", OTLP_JAEGER_SPAN_KIND[span.kind]),
             ]
         )
 

diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py
@@ -25,6 +25,7 @@
 from opentelemetry.sdk import trace
 from opentelemetry.sdk.trace import Resource
 from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
+from opentelemetry.trace import SpanKind
 from opentelemetry.trace.status import Status, StatusCode
 
 
@@ -151,6 +152,10 @@ def test_nsec_to_usec_round(self):
         self.assertEqual(nsec_to_usec_round(5499), 5)
         self.assertEqual(nsec_to_usec_round(5500), 6)
 
+    def test_all_otlp_span_kinds_are_mapped(self):
+        for kind in SpanKind:
+            self.assertIn(kind, jaeger_exporter.OTLP_JAEGER_SPAN_KIND)
+
     # pylint: disable=too-many-locals
     def test_translate_to_jaeger(self):
         # pylint: disable=invalid-name
@@ -216,9 +221,7 @@ def test_translate_to_jaeger(self):
                 key="status.message", vType=jaeger.TagType.STRING, vStr=None
             ),
             jaeger.Tag(
-                key="span.kind",
-                vType=jaeger.TagType.STRING,
-                vStr=trace_api.SpanKind.INTERNAL.name,
+                key="span.kind", vType=jaeger.TagType.STRING, vStr="internal",
             ),
         ]
 
@@ -315,7 +318,7 @@ def test_translate_to_jaeger(self):
                     jaeger.Tag(
                         key="span.kind",
                         vType=jaeger.TagType.STRING,
-                        vStr=trace_api.SpanKind.CLIENT.name,
+                        vStr="client",
                     ),
                     jaeger.Tag(
                         key="error", vType=jaeger.TagType.BOOL, vBool=True
@@ -391,7 +394,7 @@ def test_translate_to_jaeger(self):
                     jaeger.Tag(
                         key="span.kind",
                         vType=jaeger.TagType.STRING,
-                        vStr=trace_api.SpanKind.INTERNAL.name,
+                        vStr="internal",
                     ),
                     jaeger.Tag(
                         key="otel.instrumentation_library.name",

diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg
@@ -37,8 +37,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api
-    opentelemetry-sdk
+    opentelemetry-api == 0.16.dev0
+    opentelemetry-sdk == 0.16.dev0
 
 [options.extras_require]
 test = flask~=1.0