fixed threading, first throw of Python 2 and 3 capability

Author: pavlobaron

instana/agent.py

@@ -1,9 +1,12 @@
 import json
-import urllib2
 import instana.log as l
 import instana.fsm as f
 import instana.agent_const as a
 
+try:
+    import urllib.request as urllib2
+except ImportError:
+    import urllib2
 
 class From(object):
     pid = ""
@@ -39,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)
+        return json.dumps(o, default=lambda o: o.__dict__, sort_keys=False, indent=4).encode()
 
     def can_send(self):
         return self.fsm.fsm.current == "ready"
@@ -86,7 +89,7 @@ def full_request_response(self, url, method, o, body, header):
                         b = response.read()
 
                     if header:
-                        h = response.info().getheader(header)
+                        h = response.info().get(header)
 
                     if method == "HEAD":
                         b = True

instana/meter.py

@@ -98,7 +98,8 @@ def process(self):
             m = self.collect_metrics()
             d = EntityData(pid=os.getpid(), snapshot=s, metrics=m)
 
-            t.Thread(self.sensor.agent.request, args=(self.sensor.agent.make_url(a.AGENT_DATA_URL), "POST", d)).start()
+            t.Thread(target=self.sensor.agent.request,
+                     args=(self.sensor.agent.make_url(a.AGENT_DATA_URL), "POST", d)).start()
 
         self.tick()
 

instana/recorder.py

@@ -29,16 +29,16 @@ def record_span(self, span):
             if not data.service:
                 data.service = self.sensor.service_name
 
-            t.Thread(self.sensor.agent.request,
-                    args=(self.sensor.agent.make_url(a.AGENT_TRACES_URL), "POST",
-                          [InstanaSpan(t=span.context.trace_id,
-                                       p=span.parent_id,
-                                       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"),
-                                       f=self.sensor.agent.from_,
-                                       data=data)])).start()
+            t.Thread(target=self.sensor.agent.request,
+                     args=(self.sensor.agent.make_url(a.AGENT_TRACES_URL), "POST",
+                           [InstanaSpan(t=span.context.trace_id,
+                                        p=span.parent_id,
+                                        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"),
+                                        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)