Fixed most tests

Author: Alexander

jaeger_client/codecs.py

@@ -76,7 +76,7 @@ def inject(self, span_context, carrier):
                 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

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/sampler.py

@@ -238,7 +238,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):
@@ -314,7 +314,7 @@ def close(self):
 
     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/thrift.py

@@ -21,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
@@ -35,6 +36,10 @@
 _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):
     if ipv4 == 'localhost':
         ipv4 = '127.0.0.1'
@@ -62,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
@@ -79,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):
@@ -91,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):
@@ -101,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)
 

jaeger_client/utils.py

@@ -1,4 +1,4 @@
-from builtins import str
+from builtins import bytes
 from builtins import range
 from builtins import object
 # Copyright (c) 2016 Uber Technologies, Inc.
@@ -77,7 +77,7 @@ def local_ip():
     if ip.startswith('127.'):
         # Check eth0, eth1, eth2, en0, ...
         interfaces = [
-            i + str(n) for i in ('eth', 'en', 'wlan') for n in range(3)
+            i + bytes(n) for i in (b'eth', b'en', b'wlan') for n in range(3)
         ]  # :(
         for interface in interfaces:
             try:
@@ -91,6 +91,7 @@ def local_ip():
 def interface_ip(interface):
     """Determine the IP assigned to us by the given network interface."""
     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
     return socket.inet_ntoa(
         fcntl.ioctl(
             sock.fileno(), 0x8915, struct.pack('256s', interface[:15])

setup.py

@@ -35,6 +35,7 @@
         'Programming Language :: Python :: 2.7',
     ],
     install_requires=[
+        'future',
         'futures',
         'threadloop>=1,<2',
         # we want thrift>=0.9.2.post1,<0.9.3, but we let the users pin to that

tests/test_TUDPTransport.py

@@ -39,7 +39,7 @@ def test_constructor_nonblocking(self):
         assert t.transport_sock.gettimeout() == 0
 
     def test_write(self):
-        self.t.write('hello')
+        self.t.write(b'hello')
 
     def test_isopen_when_open(self):
         assert self.t.isOpen() == True
@@ -52,4 +52,4 @@ def test_close(self):
         self.t.close()
         with self.assertRaises(Exception):
             # Something bad should happen if we send on a closed socket..
-            self.t.write('hello')
+            self.t.write(b'hello')

tests/test_codecs.py

@@ -324,4 +324,4 @@ def test_debug_id():
     assert span.is_sampled()
     tags = [t for t in span.tags if t.key == debug_header]
     assert len(tags) == 1
-    assert tags[0].value == 'Coraline'
+    assert tags[0].value == b'Coraline'

tests/test_local_agent_net.py

@@ -6,7 +6,7 @@
 from jaeger_client.local_agent_net import LocalAgentSender
 from jaeger_client.config import DEFAULT_REPORTING_PORT
 
-test_strategy = """
+test_strategy = b"""
     {
         "strategyType":0,
         "probabilisticSampling":

tests/test_sampler.py

@@ -164,7 +164,7 @@ def test_guaranteed_throughput_probabilistic_sampler():
     assert tags == get_tags('lowerbound', 0.5)
     sampled, _ = sampler.is_sampled(MAX_INT+10)
     assert not sampled
-    assert '%s' % sampler == 'GuaranteedThroughputProbabilisticSampler(op, 0.5, 2)'
+    assert '%s' % sampler == 'GuaranteedThroughputProbabilisticSampler(op, 0.5, 2.0)'
 
     sampler.update(3, 0.51)
     sampled, tags = sampler.is_sampled(MAX_INT-10)
@@ -174,7 +174,7 @@ def test_guaranteed_throughput_probabilistic_sampler():
     assert sampled
     assert tags == get_tags('lowerbound', 0.51)
 
-    assert '%s' % sampler == 'GuaranteedThroughputProbabilisticSampler(op, 0.51, 3)'
+    assert '%s' % sampler == 'GuaranteedThroughputProbabilisticSampler(op, 0.51, 3.0)'
     sampler.close()
 
 
@@ -212,7 +212,7 @@ def test_adaptive_sampler():
     assert tags == get_tags('probabilistic', 0.51)
     sampled, _ = sampler.is_sampled(MAX_INT+(old_div(MAX_INT,4)), "new_op_2")
     assert not sampled
-    assert '%s' % sampler == 'AdaptiveSampler(0.51, 3, 2)'
+    assert '%s' % sampler == 'AdaptiveSampler(0.51, 3.0, 2)'
 
     # Update the strategies
     strategies = {
@@ -245,7 +245,7 @@ def test_adaptive_sampler():
     sampled, tags = sampler.is_sampled(MAX_INT-10, 'new_op_3')
     assert sampled
     assert tags == get_tags('probabilistic', 0.53)
-    assert '%s' % sampler == 'AdaptiveSampler(0.52, 4, 2)'
+    assert '%s' % sampler == 'AdaptiveSampler(0.52, 4.0, 2)'
 
     sampler.close()
 
@@ -271,12 +271,12 @@ def test_adaptive_sampler_default_values():
                 }
             ]
     })
-    assert '%s' % adaptive_sampler == 'AdaptiveSampler(0.001, 4, 2)'
+    assert '%s' % adaptive_sampler == 'AdaptiveSampler(0.001, 4.0, 2)'
 
     sampled, tags = adaptive_sampler.is_sampled(0, 'new_op')
     assert sampled
     assert tags == get_tags('probabilistic', 0.002)
-    assert '%s' % adaptive_sampler.samplers['new_op'] == 'GuaranteedThroughputProbabilisticSampler(new_op, 0.002, 4)'
+    assert '%s' % adaptive_sampler.samplers['new_op'] == 'GuaranteedThroughputProbabilisticSampler(new_op, 0.002, 4.0)'
 
     sampled, tags = adaptive_sampler.is_sampled(0, 'op')
     assert sampled
@@ -398,7 +398,7 @@ def test_sampling_request_callback():
     return_value.result = lambda *args: \
         type('obj', (object,), {'body': adaptive_sampling_strategy})()
     sampler._sampling_request_callback(return_value)
-    assert '%s' % sampler.sampler == 'AdaptiveSampler(0.001, 2, 10)', 'sampler should have changed to adaptive'
+    assert '%s' % sampler.sampler == 'AdaptiveSampler(0.001, 2.0, 10)', 'sampler should have changed to adaptive'
     prev_sampler = sampler.sampler
 
     sampler._sampling_request_callback(return_value)
@@ -555,7 +555,7 @@ def test_update_sampler_adaptive_sampler():
     }
 
     remote_sampler._update_sampler(response)
-    assert '%s' % remote_sampler.sampler == 'AdaptiveSampler(0.001, 2, 10)'
+    assert '%s' % remote_sampler.sampler == 'AdaptiveSampler(0.001, 2.0, 10)'
 
     new_response = {
         "strategyType":1,
@@ -576,7 +576,7 @@ def test_update_sampler_adaptive_sampler():
     }
 
     remote_sampler._update_sampler(new_response)
-    assert '%s' % remote_sampler.sampler == 'AdaptiveSampler(0.51, 3, 10)'
+    assert '%s' % remote_sampler.sampler == 'AdaptiveSampler(0.51, 3.0, 10)'
 
     remote_sampler._update_sampler({"strategyType":0,"probabilisticSampling":{"samplingRate":0.004}})
     assert '%s' % remote_sampler.sampler == 'ProbabilisticSampler(0.004)', \

tests/test_thrift.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from io import StringIO
+from io import BytesIO
 
 import jaeger_client.thrift_gen.zipkincore.ZipkinCollector as zipkin_collector
 import jaeger_client.thrift_gen.sampling.SamplingManager as sampling_manager
@@ -79,7 +79,7 @@ def now_reading(self):
             it's one or the other (really? yes.). This will convert
             us from write-able to read-able.
             """
-            self._buffer = StringIO(self.getvalue())
+            self._buffer = BytesIO(self.getvalue())
 
     spans = thrift.make_zipkin_spans([span])
 

tests/test_tracer.py

@@ -29,7 +29,7 @@
 from jaeger_client import ConstSampler, Tracer
 from jaeger_client import constants as c
 from jaeger_client.thrift_gen.zipkincore import constants as g
-from jaeger_client.thrift import add_zipkin_annotations
+from jaeger_client.thrift import add_zipkin_annotations, str_to_binary
 
 
 def log_exists(span, value):
@@ -236,7 +236,7 @@ def test_tracer_tags_on_root_span(span_type, expected_tags):
             assert found_tag is not None, 'test (%s): expecting tag %s' % (
                 span_type, key
             )
-            assert found_tag.value == value, \
+            assert found_tag.value == str_to_binary(value), \
                 'test (%s): expecting tag %s=%s' % (span_type, key, value)