Added Python3 support

.travis.yml

@@ -10,6 +10,10 @@ matrix:
     env: COVER=1
   - python: '2.7'
     env: CROSSDOCK=1
+  - python: '3.6'
+    env: COVER=1
+  - python: '3.6'
+    env: CROSSDOCK=1
 
 services:
   - docker

Makefile

@@ -65,7 +65,7 @@ shell:
 
 # Generate jaeger thrifts
 THRIFT_GEN_DIR=jaeger_client/thrift_gen
-THRIFT_VER=0.9.3
+THRIFT_VER=0.10.0
 THRIFT_IMG=thrift:$(THRIFT_VER)
 THRIFT_PY_ARGS=new_style,tornado
 THRIFT=docker run -v "${PWD}:/data" $(THRIFT_IMG) thrift

crossdock/server/endtoend.py

@@ -1,5 +1,8 @@
+from builtins import range
+from builtins import object
 import tornado.web
 import json
+import six
 
 from jaeger_client.local_agent_net import LocalAgentSender
 from jaeger_client.config import (
@@ -99,7 +102,7 @@ def generate_traces(self, request, response_writer):
         tracer = self.tracers[sampler_type]
         for _ in range(req.get('count', 0)):
             span = tracer.start_span(req['operation'])
-            for k, v in req.get('tags', {}).iteritems():
+            for k, v in six.iteritems(req.get('tags', {})):
                 span.set_tag(k, v)
             span.finish()
         response_writer.finish()

crossdock/server/serializer.py

@@ -1,5 +1,7 @@
+from builtins import str
 import json
 import logging
+import six
 
 from crossdock.thrift_gen.tracetest.ttypes import JoinTraceRequest, StartTraceRequest, \
     Downstream, Transport, TraceResponse, ObservedSpan
@@ -93,7 +95,7 @@ def traced_service_object_to_json(obj):
 
 
 def set_traced_service_object_values(obj, values, downstream_func):
-    for k in values.iterkeys():
+    for k in six.iterkeys(values):
         if hasattr(obj, k):
             if k == 'downstream':
                 if values[k] is not None:

crossdock/server/server.py

@@ -1,3 +1,4 @@
+from builtins import object
 import logging
 
 import tornado.web

jaeger_client/codecs.py

@@ -19,8 +19,13 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from past.builtins import basestring
+from builtins import object
 
-import urllib
+import urllib.request, urllib.parse, urllib.error
+import six
 
 from opentracing import (
     InvalidCarrierException,
@@ -64,37 +69,37 @@ def inject(self, span_context, carrier):
             parent_id=span_context.parent_id, flags=span_context.flags)
         baggage = span_context.baggage
         if baggage:
-            for key, value in baggage.iteritems():
+            for key, value in six.iteritems(baggage):
                 if self.url_encoding:
-                    encoded_value = urllib.quote(value)
+                    encoded_value = urllib.parse.quote(value)
                 else:
                     encoded_value = value
                 carrier['%s%s' % (self.baggage_prefix, key)] = encoded_value
 
     def extract(self, carrier):
-        if not hasattr(carrier, 'iteritems'):
+        if not isinstance(carrier, dict):
             raise InvalidCarrierException('carrier not a collection')
         trace_id, span_id, parent_id, flags = None, None, None, None
         baggage = None
         debug_id = None
-        for key, value in carrier.iteritems():
+        for key, value in six.iteritems(carrier):
             uc_key = key.lower()
             if uc_key == self.trace_id_header:
                 if self.url_encoding:
-                    value = urllib.unquote(value)
+                    value = urllib.parse.unquote(value)
                 trace_id, span_id, parent_id, flags = \
                     span_context_from_string(value)
             elif uc_key.startswith(self.baggage_prefix):
                 if self.url_encoding:
-                    value = urllib.unquote(value)
+                    value = urllib.parse.unquote(value)
                 attr_key = key[self.prefix_length:]
                 if baggage is None:
                     baggage = {attr_key.lower(): value}
                 else:
                     baggage[attr_key.lower()] = value
             elif uc_key == self.debug_id_header:
                 if self.url_encoding:
-                    value = urllib.unquote(value)
+                    value = urllib.parse.unquote(value)
                 debug_id = value
         if not trace_id and baggage:
             raise SpanContextCorruptedException('baggage without trace ctx')
@@ -137,7 +142,7 @@ def span_context_to_string(trace_id, span_id, parent_id, flags):
     :param parent_id:
     :param flags:
     """
-    parent_id = parent_id or 0L
+    parent_id = parent_id or 0
     return '{:x}:{:x}:{:x}:{:x}'.format(trace_id, span_id, parent_id, flags)
 
 
@@ -162,9 +167,9 @@ def span_context_from_string(value):
         raise SpanContextCorruptedException(
             'malformed trace context "%s"' % value)
     try:
-        trace_id = long(parts[0], 16)
-        span_id = long(parts[1], 16)
-        parent_id = long(parts[2], 16)
+        trace_id = int(parts[0], 16)
+        span_id = int(parts[1], 16)
+        parent_id = int(parts[2], 16)
         flags = int(parts[3], 16)
         if trace_id < 1 or span_id < 1 or parent_id < 0 or flags < 0:
             raise SpanContextCorruptedException(

jaeger_client/config.py

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from builtins import object
 
 import logging
 import threading

jaeger_client/constants.py

@@ -33,10 +33,10 @@
 DEFAULT_FLUSH_INTERVAL = 1
 
 # Name of the HTTP header used to encode trace ID
-TRACE_ID_HEADER = b'uber-trace-id'
+TRACE_ID_HEADER = 'uber-trace-id'
 
 # Prefix for HTTP headers used to record baggage items
-BAGGAGE_HEADER_PREFIX = b'uberctx-'
+BAGGAGE_HEADER_PREFIX = 'uberctx-'
 
 # The name of HTTP header or a TextMap carrier key which, if found in the
 # carrier, forces the trace to be sampled as "debug" trace. The value of the

jaeger_client/local_agent_net.py

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from builtins import object
 from threadloop import ThreadLoop
 import tornado
 import tornado.httpclient

jaeger_client/metrics.py

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from builtins import object
 
 
 class Metrics(object):

jaeger_client/rate_limiter.py

@@ -1,3 +1,4 @@
+from builtins import object
 # Copyright (c) 2017 Uber Technologies, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

jaeger_client/reporter.py

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from builtins import object
 import logging
 import threading
 

jaeger_client/sampler.py

@@ -19,9 +19,13 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from __future__ import division
+from builtins import object
+from past.utils import old_div
 import logging
 import random
 import json
+import six
 
 from threading import Lock
 from tornado.ioloop import PeriodicCallback
@@ -45,7 +49,7 @@
 SAMPLER_TYPE_TAG_KEY = 'sampler.type'
 SAMPLER_PARAM_TAG_KEY = 'sampler.param'
 DEFAULT_SAMPLING_PROBABILITY = 0.001
-DEFAULT_LOWER_BOUND = 1.0 / (10.0 * 60.0)  # sample once every 10 minutes
+DEFAULT_LOWER_BOUND = old_div(1.0, (10.0 * 60.0))  # sample once every 10 minutes
 DEFAULT_MAX_OPERATIONS = 2000
 
 STRATEGIES_STR = 'perOperationStrategies'
@@ -235,7 +239,7 @@ def update(self, lower_bound, rate):
 
     def __str__(self):
         return 'GuaranteedThroughputProbabilisticSampler(%s, %s, %s)' \
-               % (self.operation, self.rate, self.lower_bound)
+               % (self.operation, self.rate, round(float(self.lower_bound), 14))
 
 
 class AdaptiveSampler(Sampler):
@@ -306,12 +310,12 @@ def update(self, strategies):
                 ProbabilisticSampler(self.default_sampling_probability)
 
     def close(self):
-        for _, sampler in self.samplers.iteritems():
+        for _, sampler in six.iteritems(self.samplers):
             sampler.close()
 
     def __str__(self):
         return 'AdaptiveSampler(%s, %s, %s)' \
-               % (self.default_sampling_probability, self.lower_bound,
+               % (self.default_sampling_probability, round(float(self.lower_bound), 14),
                   self.max_operations)
 
 

jaeger_client/span.py

@@ -19,10 +19,12 @@
 # THE SOFTWARE.
 
 from __future__ import absolute_import
+from builtins import str
 
 import json
 import threading
 import time
+import six
 
 import opentracing
 from opentracing.ext import tags as ext_tags
@@ -54,7 +56,7 @@ def __init__(self, context, tracer, operation_name,
         self.tags = []
         self.logs = []
         if tags:
-            for k, v in tags.iteritems():
+            for k, v in six.iteritems(tags):
                 self.set_tag(k, v)
 
     def set_operation_name(self, operation_name):

jaeger_client/thrift.py

@@ -1,3 +1,4 @@
+from past.builtins import basestring
 # Copyright (c) 2016 Uber Technologies, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,6 +21,7 @@
 
 import socket
 import struct
+import sys
 
 import jaeger_client.thrift_gen.zipkincore.ZipkinCollector as zipkin_collector
 import jaeger_client.thrift_gen.sampling.SamplingManager as sampling_manager
@@ -30,8 +32,12 @@
 
 _max_signed_port = (1 << 15) - 1
 _max_unsigned_port = (1 << 16)
-_max_signed_id = (1L << 63) - 1
-_max_unsigned_id = (1L << 64)
+_max_signed_id = (1 << 63) - 1
+_max_unsigned_id = (1 << 64)
+
+
+def str_to_binary(value):
+    return value if sys.version_info[0] == 2 else value.encode('utf-8')
 
 
 def ipv4_to_int(ipv4):
@@ -61,6 +67,12 @@ def port_to_int(port):
 def id_to_int(big_id):
     # zipkincore.thrift defines ID fields as i64, which is signed,
     # therefore we convert large IDs (> 2^63) to negative longs
+
+    # In Python 2, expression None > 1 is legal and has a value of False
+    # In Python 3, this expression is illegal - so we need to have an additional check
+    if big_id is None:
+        return None
+
     if big_id > _max_signed_id:
         big_id -= _max_unsigned_id
     return big_id
@@ -78,8 +90,9 @@ def make_endpoint(ipv4, port, service_name):
 def make_string_tag(key, value):
     if len(value) > 256:
         value = value[:256]
+
     return zipkin_collector.BinaryAnnotation(
-        key, value, zipkin_collector.AnnotationType.STRING)
+        key, str_to_binary(value), zipkin_collector.AnnotationType.STRING)
 
 
 def make_peer_address_tag(key, host):
@@ -90,7 +103,7 @@ def make_peer_address_tag(key, host):
     :param host:
     """
     return zipkin_collector.BinaryAnnotation(
-        key, '0x01', zipkin_collector.AnnotationType.BOOL, host)
+        key, str_to_binary('0x01'), zipkin_collector.AnnotationType.BOOL, host)
 
 
 def make_local_component_tag(component_name, endpoint):
@@ -100,7 +113,7 @@ def make_local_component_tag(component_name, endpoint):
     :param endpoint:
     """
     return zipkin_collector.BinaryAnnotation(
-        key=LOCAL_COMPONENT, value=component_name,
+        key=LOCAL_COMPONENT, value=str_to_binary(component_name),
         annotation_type=zipkin_collector.AnnotationType.STRING,
         host=endpoint)
 
@@ -117,7 +130,7 @@ def timestamp_micros(ts):
     :param ts:
     :return:
     """
-    return long(ts * 1000000)
+    return int(ts * 1000000)
 
 
 def make_zipkin_spans(spans):