Replaced Py3-style dict.items() with six.iteritems(dict)

six.iteritems(dict) behave like dict.iteritems() in Python 2 and like iter(dict.items()) in Python 3. This should keep performance on the same level for both Py2/3 environments.

crossdock/server/endtoend.py

@@ -2,6 +2,7 @@
 from builtins import object
 import tornado.web
 import json
+import six
 
 from jaeger_client.local_agent_net import LocalAgentSender
 from jaeger_client.config import (
@@ -101,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', {}).items():
+            for k, v in six.iteritems(req.get('tags', {})):
                 span.set_tag(k, v)
             span.finish()
         response_writer.finish()

crossdock/server/serializer.py

@@ -1,6 +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
@@ -94,7 +95,7 @@ def traced_service_object_to_json(obj):
 
 
 def set_traced_service_object_values(obj, values, downstream_func):
-    for k in values.keys():
+    for k in six.iterkeys(values):
         if hasattr(obj, k):
             if k == 'downstream':
                 if values[k] is not None:

crossdock/setup_crossdock.py

@@ -20,6 +20,7 @@
         ]
     },
     install_requires=[
-        # all dependencies are included in tchannel already
+        # most of dependencies are included in tchannel already
+        'six'
     ],
 )

jaeger_client/codecs.py

@@ -25,6 +25,7 @@
 from builtins import object
 
 import urllib.request, urllib.parse, urllib.error
+import six
 
 from opentracing import (
     InvalidCarrierException,
@@ -68,7 +69,7 @@ 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.items():
+            for key, value in six.iteritems(baggage):
                 if self.url_encoding:
                     encoded_value = urllib.parse.quote(value)
                 else:
@@ -81,7 +82,7 @@ def extract(self, carrier):
         trace_id, span_id, parent_id, flags = None, None, None, None
         baggage = None
         debug_id = None
-        for key, value in carrier.items():
+        for key, value in six.iteritems(carrier):
             uc_key = key.lower()
             if uc_key == self.trace_id_header:
                 if self.url_encoding:

jaeger_client/sampler.py

@@ -25,6 +25,7 @@
 import logging
 import random
 import json
+import six
 
 from threading import Lock
 from tornado.ioloop import PeriodicCallback
@@ -309,7 +310,7 @@ def update(self, strategies):
                 ProbabilisticSampler(self.default_sampling_probability)
 
     def close(self):
-        for _, sampler in self.samplers.items():
+        for _, sampler in six.iteritems(self.samplers):
             sampler.close()
 
     def __str__(self):

jaeger_client/span.py

@@ -24,6 +24,7 @@
 import json
 import threading
 import time
+import six
 
 import opentracing
 from opentracing.ext import tags as ext_tags
@@ -55,7 +56,7 @@ def __init__(self, context, tracer, operation_name,
         self.tags = []
         self.logs = []
         if tags:
-            for k, v in tags.items():
+            for k, v in six.iteritems(tags):
                 self.set_tag(k, v)
 
     def set_operation_name(self, operation_name):

jaeger_client/tracer.py

@@ -26,6 +26,7 @@
 import time
 import logging
 import random
+import six
 import opentracing
 from opentracing import Format, UnsupportedFormatException
 from opentracing.ext import tags as ext_tags
@@ -132,7 +133,7 @@ def start_span(self,
                 if sampled:
                     flags = SAMPLED_FLAG
                     tags = tags or {}
-                    for k, v in sampler_tags.items():
+                    for k, v in six.iteritems(sampler_tags):
                         tags[k] = v
             else:  # have debug id
                 flags = SAMPLED_FLAG | DEBUG_FLAG
@@ -159,7 +160,7 @@ def start_span(self,
 
         if (rpc_server or not parent_id) and (flags & SAMPLED_FLAG):
             # this is a first-in-process span, and is sampled
-            for k, v in self.tags.items():
+            for k, v in six.iteritems(self.tags):
                 span.set_tag(k, v)
 
         self._emit_span_metrics(span=span, join=rpc_server)

setup.py

@@ -38,6 +38,7 @@
     install_requires=[
         'future',
         'futures',
+        'six',
         'threadloop>=1,<2',
         'thrift>=0.10.0',
         'tornado>=4.3,<5',

tests/test_tracer.py

@@ -21,6 +21,7 @@
 import mock
 import random
 
+import six
 import pytest
 import tornado.httputil
 
@@ -224,7 +225,7 @@ def test_tracer_tags_on_root_span(span_type, expected_tags):
                 'child', child_of=span.context,
                 tags={ext_tags.SPAN_KIND: ext_tags.SPAN_KIND_RPC_SERVER}
             )
-        for key, value in expected_tags.items():
+        for key, value in six.iteritems(expected_tags):
             found_tag = None
             for tag in span.tags:
                 if tag.key == key: