Remove Python2 support from code and CI (#307)

* Remove python2 tests from CI

Signed-off-by: George Leman <[email protected]>

* Update crossdock image to python 3.9

Signed-off-by: George Leman <[email protected]>

* Remove python 2 mentions from code

Signed-off-by: George Leman <[email protected]>

* Make python2 tests run on python3

Signed-off-by: George Leman <[email protected]>

* Install tchannel in setup.py

Signed-off-by: George Leman <[email protected]>

* Fix failing tests

Signed-off-by: Yuri Shkuro <[email protected]>

* Fix crossdock tests for Tornado 6+

Signed-off-by: Yuri Shkuro <[email protected]>

* Fix tornado exclusion

Signed-off-by: Yuri Shkuro <[email protected]>

* Decode request.body

Signed-off-by: George Leman <[email protected]>

* Convert to str before loading json data

Signed-off-by: George Leman <[email protected]>

* Convert to str before loading json data

Signed-off-by: George Leman <[email protected]>

Co-authored-by: Yuri Shkuro <[email protected]>

Author: cedy

.github/workflows/ci-crossdock.yml

@@ -19,7 +19,7 @@ jobs:
 
     - uses: actions/setup-python@v2
       with:
-        python-version: 2.7
+        python-version: 3.9
 
     - uses: docker/login-action@v1
       id: dockerhub-login

.github/workflows/ci-unit-tests.yml

@@ -14,10 +14,6 @@ jobs:
     strategy:
       matrix:
         version:
-        - python: "2.7"
-          tornado: ">=4,<5"
-        - python: "2.7"
-          tornado: ">=5,<6"
         - python: "3.5"
           tornado: ">=4,<5"
         - python: "3.5"

CONTRIBUTING.md

@@ -34,11 +34,12 @@ ImportError: pycurl: libcurl link-time ssl backend (openssl) is different from c
 It can be fixed with:
 
 ```
+OPENSSL=/usr/local/opt/openssl
 pip uninstall pycurl
-export LDFLAGS="-L/usr/local/opt/openssl/lib"
-export CPPFLAGS="-I/usr/local/opt/openssl/include"
+export LDFLAGS="-L$OPENSSL/lib"
+export CPPFLAGS="-I$OPENSSL/include"
 export PYCURL_SSL_LIBRARY=openssl
-pip install --no-cache-dir --compile --ignore-installed --install-option="--with-openssl" --install-option="--openssl-dir=/usr/local/opt/openssl" pycurl
+pip install --no-cache-dir --compile --ignore-installed --install-option="--with-openssl" --install-option="--openssl-dir=$OPENSSL" pycurl
 ```
 
 ## Making A Change

crossdock/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:2.7
+FROM python:3.9
 
 ARG tornado
 ENV APPDIR /usr/src/app/
@@ -20,7 +20,7 @@ COPY crossdock/setup_crossdock.py ${APPDIR}
 RUN python setup_crossdock.py install
 
 # TODO Remove this after the tchannel-python crossdock is no longer a package
-RUN rm -rf /usr/local/lib/python2.7/site-packages/crossdock
+RUN rm -rf /usr/local/lib/python3.9/site-packages/crossdock
 
 CMD ["crossdock"]
 EXPOSE 8080-8082

crossdock/server/endtoend.py

@@ -116,12 +116,14 @@ def local_agent_sender(self):
 
     @tornado.gen.coroutine
     def generate_traces(self, request, response_writer):
+        if isinstance(request.body, (bytes, bytearray)):
+            request.body = request.body.decode('utf-8')
         req = json.loads(request.body)
         sampler_type = req.get('type', 'remote')
         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 req.get('tags', {}).items():
                 span.set_tag(k, v)
             span.finish()
         response_writer.finish()

crossdock/server/serializer.py

@@ -27,12 +27,16 @@ def set_downstream_object_values(downstream_object, json_obj):
 
 
 def join_trace_request_from_json(json_request):
+    if isinstance(json_request, (bytes, bytearray)):
+        json_request = json_request.decode('utf-8')
     request = JoinTraceRequest()
     set_downstream_object_values(request, json.loads(json_request))
     return request
 
 
 def start_trace_request_from_json(json_request):
+    if isinstance(json_request, (bytes, bytearray)):
+        json_request = json_request.decode('utf-8')
     request = StartTraceRequest()
     set_downstream_object_values(request, json.loads(json_request))
     return request
@@ -75,6 +79,8 @@ def traceresponse_from_struct(json_obj):
 
 def traceresponse_from_json(json_str):
     try:
+        if isinstance(json_str, (bytes, bytearray)):
+            json_str = json_str.decode('utf-8')
         return traceresponse_from_struct(json.loads(json_str))
     except:  # noqa: E722
         logging.exception('Failed to parse JSON')
@@ -107,7 +113,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 values.keys():
         if hasattr(obj, k):
             if k == 'downstream':
                 if values[k] is not None:

jaeger_client/codecs.py

@@ -65,24 +65,15 @@ def inject(self, span_context, carrier):
         if baggage:
             for key, value in six.iteritems(baggage):
                 encoded_key = key
+                if isinstance(key, six.binary_type):
+                    encoded_key = str(key, 'utf-8')
                 if self.url_encoding:
-                    if six.PY2 and isinstance(value, six.text_type):
-                        encoded_value = urllib_parse.quote(value.encode('utf-8'))
-                    else:
-                        encoded_value = urllib_parse.quote(value)
-                    # we assume that self.url_encoding means we are injecting
-                    # into HTTP headers. httplib does not like unicode strings
-                    # so we convert the key to utf-8. The URL-encoded value is
-                    # already a plain string.
-                    if six.PY2 and isinstance(key, six.text_type):
-                        encoded_key = key.encode('utf-8')
+                    encoded_value = urllib_parse.quote(value)
                 else:
-                    if six.PY3 and isinstance(value, six.binary_type):
+                    if isinstance(value, six.binary_type):
                         encoded_value = str(value, 'utf-8')
                     else:
                         encoded_value = value
-                if six.PY3 and isinstance(key, six.binary_type):
-                    encoded_key = str(key, 'utf-8')
                 # Leave the below print(), you will thank me next time you debug unicode strings
                 # print('adding baggage', key, '=>', value, 'as', encoded_key, '=>', encoded_value)
                 header_key = '%s%s' % (self.baggage_prefix, encoded_key)

jaeger_client/thrift.py

@@ -59,11 +59,7 @@ def id_to_int(big_id):
 
 def _to_string(s):
     try:
-        # Thrift in PY2 likes strings as bytes
-        if six.PY2 and isinstance(s, six.text_type):
-            return s.encode('utf-8')
-        else:
-            return str(s)
+        return str(s)
     except Exception as e:
         return str(e)
 

setup.py

@@ -32,7 +32,6 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
@@ -48,9 +47,6 @@
     # ],
     test_suite='tests',
     extras_require={
-        ':python_version<"3"': [
-            'futures',
-        ],
         'tests': [
             'mock==1.0.1',
             'pycurl>=7.43,<8',
@@ -66,7 +62,7 @@
             'flake8',
             'flake8-quotes',
             'codecov',
-            'tchannel>=0.27;python_version=="2.7"',  # This is only used in python 2
+            'tchannel==2.1.0',
             'opentracing_instrumentation>=3,<4',
             'prometheus_client==0.3.1',
         ]

tests/test_codecs.py

@@ -119,7 +119,7 @@ def test_context_to_readable_headers(self):
             ctx._baggage = {
                 'bender': 'Countess de la Roca',
                 'fry': u'Leela',
-                b'key1': bytes(chr(75)) if six.PY2 else bytes([75]),
+                b'key1': bytes([75]),
                 u'key2': 'cafe',
                 u'key3': u'\U0001F47E',
             }
@@ -526,12 +526,8 @@ def test_debug_id():
 
 
 def test_baggage_as_unicode_strings_with_httplib(httpserver):
-    if six.PY2:
-        import urllib2
-        urllib_under_test = urllib2
-    else:
-        import urllib.request
-        urllib_under_test = urllib.request
+    import urllib.request
+    urllib_under_test = urllib.request
 
     # httpserver is provided by pytest-localserver
     httpserver.serve_content(content='Hello', code=200, headers=None)
@@ -548,7 +544,7 @@ def test_baggage_as_unicode_strings_with_httplib(httpserver):
         (b'key1', b'value'),
         (u'key2', b'value'),
         ('key3', u'value'),
-        (b'key4', bytes(chr(255)) if six.PY2 else bytes([255])),
+        (b'key4', bytes([255])),
         (u'key5', u'\U0001F47E')
     ]
     for b in baggage: