JaegerExporter : handle annotations (#324)

* JaegerExporter : handle annotations

* Minor fix

* Add test case

* Fix test case

Author: mayurkale22

opencensus/trace/exporters/jaeger_exporter.py

@@ -280,7 +280,10 @@ def _extract_logs_from_span(span):
         annotation = time_event.annotation
         if not annotation:
             continue
-        fields = _extract_tags(annotation.attributes)
+
+        fields = []
+        if annotation.attributes is not None:
+            fields = _extract_tags(annotation.attributes.attributes)
 
         fields.append(jaeger.Tag(
             key='message',
@@ -297,7 +300,7 @@ def _extract_logs_from_span(span):
 
 def _extract_tags(attr):
     if attr is None:
-        return None
+        return []
     tags = []
     for attribute_key, attribute_value in attr.items():
         tag = _convert_attribute_to_tag(attribute_key, attribute_value)

tests/unit/trace/exporters/test_jaeger_exporter.py

@@ -16,8 +16,8 @@
 
 import mock
 
-from opencensus.trace import (link, span_context, span_data, status,
-                              time_event, trace_options)
+from opencensus.trace import (attributes, link, span_context, span_data,
+                              status, time_event)
 from opencensus.trace.exporters import jaeger_exporter
 from opencensus.trace.exporters.gen.jaeger import jaeger
 
@@ -178,7 +178,7 @@ def test_translate_to_jaeger(self):
         span_id = '6e0c63257de34c92'
         parent_span_id = '1111111111111111'
 
-        attributes = {
+        span_attributes = {
             'key_bool': False,
             'key_string': 'hello_world',
             'key_int': 3
@@ -200,7 +200,21 @@ def test_translate_to_jaeger(self):
                 timestamp=time,
                 annotation=time_event.Annotation(
                     description='First Annotation',
-                    attributes=annotation_attributes)),
+                    attributes=attributes.Attributes(annotation_attributes))),
+            time_event.TimeEvent(
+                timestamp=time,
+                message_event=time_event.MessageEvent(
+                    id='message-event-id',
+                    uncompressed_size_bytes=0,
+                )),
+        ]
+
+        time_events2 = [
+            time_event.TimeEvent(
+                timestamp=time,
+                annotation=time_event.Annotation(
+                    description='First Annotation',
+                    attributes=None)),
             time_event.TimeEvent(
                 timestamp=time,
                 message_event=time_event.MessageEvent(
@@ -238,7 +252,7 @@ def test_translate_to_jaeger(self):
                 context=span_context.SpanContext(trace_id=trace_id),
                 span_id=span_id,
                 parent_span_id=parent_span_id,
-                attributes=attributes,
+                attributes=span_attributes,
                 start_time=start_time,
                 end_time=end_time,
                 child_span_count=0,
@@ -259,6 +273,22 @@ def test_translate_to_jaeger(self):
                 end_time=end_time,
                 child_span_count=None,
                 stack_trace=None,
+                time_events=time_events2,
+                links=None,
+                status=None,
+                same_process_as_parent_span=None,
+                span_kind=None,
+            ),
+            span_data.SpanData(
+                name='test3',
+                context=None,
+                span_id=span_id,
+                parent_span_id=None,
+                attributes=None,
+                start_time=start_time,
+                end_time=end_time,
+                child_span_count=None,
+                stack_trace=None,
                 time_events=None,
                 links=None,
                 status=None,
@@ -341,7 +371,28 @@ def test_translate_to_jaeger(self):
                 spanId=7929822056569588882,
                 parentSpanId=0,
                 startTime=1502820146071158,
-                duration=10000000)
+                duration=10000000,
+                logs=[
+                    jaeger.Log(
+                        timestamp=1502820146000,
+                        fields=[
+                            jaeger.Tag(
+                                key='message',
+                                vType=jaeger.TagType.STRING,
+                                vStr='First Annotation')
+                        ])
+                ]
+            ),
+            jaeger.Span(
+                operationName="test3",
+                traceIdHigh=7929822056569588882,
+                traceIdLow=-4638992594902767826,
+                spanId=7929822056569588882,
+                parentSpanId=0,
+                startTime=1502820146071158,
+                duration=10000000,
+                logs=[]
+            )
         ]
 
         spans_json = [span.format_span_json() for span in spans]
@@ -376,6 +427,8 @@ def test_translate_to_jaeger(self):
         self.assertEqual(span.get('flags'), expected_span.get('flags'))
         self.assertEqual(spans_json[1], expected_spans_json[1])
 
+        self.assertEqual(spans_json[2], expected_spans_json[2])
+
     def test_convert_hex_str_to_int(self):
         invalid_id = '990c63257de34c92'
         jaeger_exporter._convert_hex_str_to_int(invalid_id)