Removed logs misuse

Recording logs and tags now
Following OT recommendations for tag names and dependencies

Author: pavlobaron

example/simple.py

@@ -1,39 +1,41 @@
 import sys
-import instana.sensor as s
 import instana.options as o
 import logging
 import opentracing as ot
 import instana.tracer
 import time
-import instana.data as d
-import instana.http as h
+import opentracing.ext.tags as ext
 
+SERVICE = "python-simple"
 
 def main(argv):
-    instana.tracer.init(o.Options(service='python-simple',
+    instana.tracer.init(o.Options(service=SERVICE,
                                   log_level=logging.DEBUG))
 
     while (True):
         simple()
 
-
 def simple():
     parent_span = ot.tracer.start_span(operation_name="parent")
-    parent_span.log_kv({"type": h.HTTP_SERVER,
-                        "data": d.Data(http=h.HttpData(host="localhost",
-                                                       url="/python/simple/one",
-                                                       status=200,
-                                                       method="GET"))})
-    child_span = ot.tracer.start_span(
-        operation_name="child", child_of=parent_span)
-    child_span.log_kv({"type": h.HTTP_CLIENT,
-                       "data": d.Data(http=h.HttpData(host="localhost",
-                                                      url="/python/simple/two",
-                                                      status=204,
-                                                      method="POST"))})
+    parent_span.set_tag(ext.COMPONENT, SERVICE)
+    parent_span.set_tag(ext.SPAN_KIND, ext.SPAN_KIND_RPC_SERVER)
+    parent_span.set_tag(ext.PEER_HOSTNAME, "localhost")
+    parent_span.set_tag(ext.HTTP_URL, "/python/simple/one")
+    parent_span.set_tag(ext.HTTP_METHOD, "GET")
+    parent_span.set_tag(ext.HTTP_STATUS_CODE, 200)
+    parent_span.log_kv({"foo": "bar"})
+
+    child_span = ot.tracer.start_span(operation_name="child", child_of=parent_span)
+    child_span.set_tag(ext.SPAN_KIND, ext.SPAN_KIND_RPC_CLIENT)
+    child_span.set_tag(ext.PEER_HOSTNAME, "localhost")
+    child_span.set_tag(ext.HTTP_URL, "/python/simple/two")
+    child_span.set_tag(ext.HTTP_METHOD, "POST")
+    child_span.set_tag(ext.HTTP_STATUS_CODE, 204)
     child_span.set_baggage_item("someBaggage", "someValue")
+
     time.sleep(.45)
     child_span.finish()
+
     time.sleep(.55)
     parent_span.finish()
 

instana/agent.py

@@ -42,7 +42,7 @@ def __init__(self, sensor):
         self.reset()
 
     def to_json(self, o):
-        return json.dumps(o, default=lambda o: o.__dict__, sort_keys=False, indent=4).encode()
+        return json.dumps(o, default=lambda o: o.__dict__, sort_keys=False,separators=(',', ':')).encode()
 
     def can_send(self):
         return self.fsm.fsm.current == "ready"

instana/custom.py

@@ -0,0 +1,6 @@
+class CustomData(object):
+    tags = None
+    logs = None
+
+    def __init__(self, **kwds):
+        self.__dict__.update(kwds)

instana/data.py

@@ -1,6 +1,8 @@
 class Data(object):
-    http = None
     service = None
+    http = None
+    baggage = None
+    custom = None
 
     def __init__(self, **kwds):
         self.__dict__.update(kwds)

instana/http.py

@@ -1,7 +1,6 @@
 HTTP_CLIENT = "g.hc"
 HTTP_SERVER = "g.http"
 
-
 class HttpData(object):
     host = None
     url = None

instana/recorder.py

@@ -1,6 +1,11 @@
 from basictracer import Sampler, SpanRecorder
 import instana.agent_const as a
+import instana.http as http
+import instana.custom as c
 import threading as t
+import opentracing.ext.tags as ext
+import socket
+import instana.data as d
 
 class InstanaSpan(object):
     t = 0
@@ -15,7 +20,6 @@ class InstanaSpan(object):
     def __init__(self, **kwds):
         self.__dict__.update(kwds)
 
-
 class InstanaRecorder(SpanRecorder):
     sensor = None
 
@@ -25,9 +29,13 @@ def __init__(self, sensor):
 
     def record_span(self, span):
         if self.sensor.agent.can_send():
-            data = self.get_span_log_field(span, "data")
-            if not data.service:
-                data.service = self.sensor.service_name
+            data = d.Data(service=self.get_service_name(span),
+                          http=http.HttpData(host=self.get_host_name(span),
+                                             url=self.get_string_tag(span, ext.HTTP_URL),
+                                             method=self.get_string_tag(span, ext.HTTP_METHOD),
+                                             status=self.get_tag(span, ext.HTTP_STATUS_CODE)),
+                          custom=c.CustomData(tags=span.tags,
+                                              logs=self.collect_logs(span)))
 
             t.Thread(target=self.sensor.agent.request,
                      args=(self.sensor.agent.make_url(a.AGENT_TRACES_URL), "POST",
@@ -36,24 +44,63 @@ def record_span(self, span):
                                         s=span.context.span_id,
                                         ts=int(round(span.start_time * 1000)),
                                         d=int(round(span.duration * 1000)),
-                                        n=self.get_string_span_log_field(span, "type"),
+                                        n=self.get_http_type(span),
                                         f=self.sensor.agent.from_,
                                         data=data)])).start()
 
-    def get_string_span_log_field(self, span, field):
-        ret = self.get_span_log_field(span, field)
+    def get_tag(self, span, tag):
+        if tag in span.tags:
+            return span.tags[tag]
+
+        return None
+
+    def get_string_tag(self, span, tag):
+        ret = self.get_tag(span, tag)
         if not ret:
             return ""
 
         return ret
 
-    def get_span_log_field(self, span, field):
-        for e in span.logs:
-            if field in e.key_values:
-                return e.key_values[field]
+    def get_host_name(self, span):
+        h = self.get_string_tag(span, ext.PEER_HOSTNAME)
+        if len(h) > 0:
+            return h
 
-        return None
+        h = socket.gethostname()
+        if h and len(h) > 0:
+            return h
+
+        return "localhost"
+
+    def get_service_name(self, span):
+        s = self.get_string_tag(span, ext.COMPONENT)
+        if len(s) > 0:
+            return s
+
+        s = self.get_string_tag(span, ext.PEER_SERVICE)
+        if len(s) > 0:
+            return s
+
+        return self.sensor.service_name
+
+    def get_http_type(self, span):
+        k = self.get_string_tag(span, ext.SPAN_KIND)
+        if k == ext.SPAN_KIND_RPC_CLIENT:
+            return http.HTTP_CLIENT
+
+        return http.HTTP_SERVER
+
+    def collect_logs(self, span):
+        logs = {}
+        for l in span.logs:
+            ts = int(round(l.timestamp * 1000))
+            if not ts in logs:
+                logs[ts] = {}
+
+            for f in l.key_values:
+                logs[ts][f] = l.key_values[f]
 
+        return logs
 
 class InstanaSampler(Sampler):