Upgrade flake8 to 3.8 + black ddtrace{,.span} (#1429)

* chore: upgrade flake8 to 3.8 and fix new warnings

* chore(black): black ddtrace and ddtrace.span

Author: jd

ddtrace/__init__.py

@@ -2,14 +2,15 @@
 
 # Always import and patch import hooks before loading anything else
 from .internal.import_hooks import patch as patch_import_hooks
+
 patch_import_hooks()  # noqa: E402
 
-from .monkey import patch, patch_all
-from .pin import Pin
-from .span import Span
-from .tracer import Tracer
-from .settings import config
-from .utils.deprecation import deprecated
+from .monkey import patch, patch_all  # noqa: E402
+from .pin import Pin  # noqa: E402
+from .span import Span  # noqa: E402
+from .tracer import Tracer  # noqa: E402
+from .settings import config  # noqa: E402
+from .utils.deprecation import deprecated  # noqa: E402
 
 try:
     __version__ = pkg_resources.get_distribution(__name__).version
@@ -22,21 +23,21 @@
 tracer = Tracer()
 
 __all__ = [
-    'patch',
-    'patch_all',
-    'Pin',
-    'Span',
-    'tracer',
-    'Tracer',
-    'config',
+    "patch",
+    "patch_all",
+    "Pin",
+    "Span",
+    "tracer",
+    "Tracer",
+    "config",
 ]
 
 
-@deprecated('This method will be removed altogether', '1.0.0')
+@deprecated("This method will be removed altogether", "1.0.0")
 def install_excepthook():
     """Install a hook that intercepts unhandled exception and send metrics about them."""
 
 
-@deprecated('This method will be removed altogether', '1.0.0')
+@deprecated("This method will be removed altogether", "1.0.0")
 def uninstall_excepthook():
     """Uninstall the global tracer except hook."""

ddtrace/compat.py

@@ -184,7 +184,7 @@ def _shadowed_dict(klass):
                 pass
             else:
                 if not (
-                    type(class_dict) is types.GetSetDescriptorType
+                    type(class_dict) is types.GetSetDescriptorType  # noqa: E721
                     and class_dict.__name__ == "__dict__"  # noqa: E721,E261,W504
                     and class_dict.__objclass__ is entry  # noqa: E261,W504
                 ):

ddtrace/opentracer/tracer.py

@@ -69,7 +69,7 @@ def __init__(self, service_name=None, config=None, scope_manager=None, dd_tracer
             invalid_keys = config_invalid_keys(self._config)
             if invalid_keys:
                 str_invalid_keys = ','.join(invalid_keys)
-                raise ConfigException('invalid key(s) given (%s)'.format(str_invalid_keys))
+                raise ConfigException('invalid key(s) given ({})'.format(str_invalid_keys))
 
         if not self._service_name:
             raise ConfigException(""" Cannot detect the \'service_name\'.

ddtrace/span.py

@@ -6,8 +6,12 @@
 from .vendor import six
 from .compat import StringIO, stringify, iteritems, numeric_types, time_ns, is_integer
 from .constants import (
-    NUMERIC_TAGS, MANUAL_DROP_KEY, MANUAL_KEEP_KEY,
-    VERSION_KEY, SERVICE_VERSION_KEY, SPAN_MEASURED_KEY,
+    NUMERIC_TAGS,
+    MANUAL_DROP_KEY,
+    MANUAL_KEEP_KEY,
+    VERSION_KEY,
+    SERVICE_VERSION_KEY,
+    SPAN_MEASURED_KEY,
     SERVICE_KEY,
 )
 from .ext import SpanTypes, errors, priority, net, http
@@ -27,33 +31,32 @@ class Span(object):
 
     __slots__ = [
         # Public span attributes
-        'service',
-        'name',
-        'resource',
-        'span_id',
-        'trace_id',
-        'parent_id',
-        'meta',
-        'error',
-        'metrics',
-        'span_type',
-        'start_ns',
-        'duration_ns',
-        'tracer',
+        "service",
+        "name",
+        "resource",
+        "span_id",
+        "trace_id",
+        "parent_id",
+        "meta",
+        "error",
+        "metrics",
+        "span_type",
+        "start_ns",
+        "duration_ns",
+        "tracer",
         # Sampler attributes
-        'sampled',
+        "sampled",
         # Internal attributes
-        '_context',
-        'finished',
-        '_parent',
-        '__weakref__',
+        "_context",
+        "finished",
+        "_parent",
+        "__weakref__",
     ]
 
     def __init__(
         self,
         tracer,
         name,
-
         service=None,
         resource=None,
         span_type=None,
@@ -150,14 +153,14 @@ def finish(self, finish_time=None):
             try:
                 self._context.close_span(self)
             except Exception:
-                log.exception('error recording finished trace')
+                log.exception("error recording finished trace")
             else:
                 # if a tracer is available to process the current context
                 if self.tracer:
                     try:
                         self.tracer.record(self._context)
                     except Exception:
-                        log.exception('error recording finished trace')
+                        log.exception("error recording finished trace")
 
     def set_tag(self, key, value=None):
         """Set a tag key/value pair on the span.
@@ -185,7 +188,7 @@ def set_tag(self, key, value=None):
 
         # Explicitly try to convert expected integers to `int`
         # DEV: Some integrations parse these values from strings, but don't call `int(value)` themselves
-        INT_TYPES = (net.TARGET_PORT, )
+        INT_TYPES = (net.TARGET_PORT,)
         if key in INT_TYPES and not val_is_an_int:
             try:
                 value = int(value)
@@ -272,7 +275,7 @@ def set_metric(self, key, value):
             try:
                 value = int(bool(value))
             except (ValueError, TypeError):
-                log.warning('failed to convert %r tag to an integer from %r', key, value)
+                log.warning("failed to convert %r tag to an integer from %r", key, value)
                 return
 
         # FIXME[matt] we could push this check to serialization time as well.
@@ -283,12 +286,12 @@ def set_metric(self, key, value):
             try:
                 value = float(value)
             except (ValueError, TypeError):
-                log.debug('ignoring not number metric %s:%s', key, value)
+                log.debug("ignoring not number metric %s:%s", key, value)
                 return
 
         # don't allow nan or inf
         if math.isnan(value) or math.isinf(value):
-            log.debug('ignoring not real metric %s:%s', key, value)
+            log.debug("ignoring not real metric %s:%s", key, value)
             return
 
         if key in self.meta:
@@ -305,36 +308,36 @@ def get_metric(self, key):
 
     def to_dict(self):
         d = {
-            'trace_id': self.trace_id,
-            'parent_id': self.parent_id,
-            'span_id': self.span_id,
-            'service': self.service,
-            'resource': self.resource,
-            'name': self.name,
-            'error': self.error,
+            "trace_id": self.trace_id,
+            "parent_id": self.parent_id,
+            "span_id": self.span_id,
+            "service": self.service,
+            "resource": self.resource,
+            "name": self.name,
+            "error": self.error,
         }
 
         # a common mistake is to set the error field to a boolean instead of an
         # int. let's special case that here, because it's sure to happen in
         # customer code.
-        err = d.get('error')
+        err = d.get("error")
         if err and type(err) == bool:
-            d['error'] = 1
+            d["error"] = 1
 
         if self.start_ns:
-            d['start'] = self.start_ns
+            d["start"] = self.start_ns
 
         if self.duration_ns:
-            d['duration'] = self.duration_ns
+            d["duration"] = self.duration_ns
 
         if self.meta:
-            d['meta'] = self.meta
+            d["meta"] = self.meta
 
         if self.metrics:
-            d['metrics'] = self.metrics
+            d["metrics"] = self.metrics
 
         if self.span_type:
-            d['type'] = self.span_type
+            d["type"] = self.span_type
 
         return d
 
@@ -344,10 +347,10 @@ def set_traceback(self, limit=20):
         """
         (exc_type, exc_val, exc_tb) = sys.exc_info()
 
-        if (exc_type and exc_val and exc_tb):
+        if exc_type and exc_val and exc_tb:
             self.set_exc_info(exc_type, exc_val, exc_tb)
         else:
-            tb = ''.join(traceback.format_stack(limit=limit + 1)[:-1])
+            tb = "".join(traceback.format_stack(limit=limit + 1)[:-1])
             self.set_tag(errors.ERROR_STACK, tb)  # FIXME[gabin] Want to replace 'error.stack' tag with 'python.stack'
 
     def set_exc_info(self, exc_type, exc_val, exc_tb):
@@ -363,7 +366,7 @@ def set_exc_info(self, exc_type, exc_val, exc_tb):
         tb = buff.getvalue()
 
         # readable version of type (e.g. exceptions.ZeroDivisionError)
-        exc_type_str = '%s.%s' % (exc_type.__module__, exc_type.__name__)
+        exc_type_str = "%s.%s" % (exc_type.__module__, exc_type.__name__)
 
         self.set_tag(errors.ERROR_MSG, exc_val)
         self.set_tag(errors.ERROR_TYPE, exc_type_str)
@@ -379,22 +382,22 @@ def _remove_exc_info(self):
     def pprint(self):
         """ Return a human readable version of the span. """
         lines = [
-            ('name', self.name),
-            ('id', self.span_id),
-            ('trace_id', self.trace_id),
-            ('parent_id', self.parent_id),
-            ('service', self.service),
-            ('resource', self.resource),
-            ('type', self.span_type),
-            ('start', self.start),
-            ('end', '' if not self.duration else self.start + self.duration),
-            ('duration', '%fs' % (self.duration or 0)),
-            ('error', self.error),
-            ('tags', '')
+            ("name", self.name),
+            ("id", self.span_id),
+            ("trace_id", self.trace_id),
+            ("parent_id", self.parent_id),
+            ("service", self.service),
+            ("resource", self.resource),
+            ("type", self.span_type),
+            ("start", self.start),
+            ("end", "" if not self.duration else self.start + self.duration),
+            ("duration", "%fs" % (self.duration or 0)),
+            ("error", self.error),
+            ("tags", ""),
         ]
 
-        lines.extend((' ', '%s:%s' % kv) for kv in sorted(self.meta.items()))
-        return '\n'.join('%10s %s' % l for l in lines)
+        lines.extend((" ", "%s:%s" % kv) for kv in sorted(self.meta.items()))
+        return "\n".join("%10s %s" % line for line in lines)
 
     @property
     def context(self):
@@ -414,10 +417,10 @@ def __exit__(self, exc_type, exc_val, exc_tb):
                 self.set_exc_info(exc_type, exc_val, exc_tb)
             self.finish()
         except Exception:
-            log.exception('error closing trace')
+            log.exception("error closing trace")
 
     def __repr__(self):
-        return '<Span(id=%s,trace_id=%s,parent_id=%s,name=%s)>' % (
+        return "<Span(id=%s,trace_id=%s,parent_id=%s,name=%s)>" % (
             self.span_id,
             self.trace_id,
             self.parent_id,

pyproject.toml

@@ -19,7 +19,7 @@ exclude = '''
   | build/
   | dist/
   | ddtrace/(
-    (?!compat\.py$)[^/]+\.py$
+    (?!(compat|span|__init__)\.py$)[^/]+\.py$
     | commands/
     | contrib/
     (

tests/contrib/asyncio/test_tracer.py

@@ -383,6 +383,7 @@ def test_trace_multiple_coroutines_ot_inner(self):
         # if multiple coroutines have nested tracing, they must belong
         # to the same trace
         ot_tracer = init_tracer('asyncio_svc', self.tracer)
+
         @asyncio.coroutine
         def coro():
             # another traced coroutine

tests/profiling/exporter/test_http.py

@@ -377,4 +377,3 @@ def test_get_tags_override(monkeypatch):
     assert tags["profiler_version"] == ddtrace.__version__.encode("utf-8")
     assert tags["version"] == b"123"
     assert tags["env"] == b"prod"
-

tox.ini

@@ -545,7 +545,7 @@ commands=black --check .
 commands_pre=
 skip_install=true
 deps=
-  flake8>=3.7,<=3.8
+  flake8>=3.8,<=3.9
   flake8-blind-except
   flake8-builtins
   flake8-docstrings