re-apply black after rebase

Signed-off-by: Benjamin Wohlwend <[email protected]>

Author: beniwohli

elasticapm/base.py

@@ -138,10 +138,9 @@ def __init__(self, config=None, **inline):
             skip_modules = ("elasticapm.",)
 
         self.transaction_store = TransactionsStore(
-            frames_collector_func=lambda: list(stacks.iter_stack_frames(
-                start_frame=inspect.currentframe(),
-                skip_top_modules=skip_modules,
-            )),
+            frames_collector_func=lambda: list(
+                stacks.iter_stack_frames(start_frame=inspect.currentframe(), skip_top_modules=skip_modules)
+            ),
             frames_processing_func=lambda frames: self._get_stack_info_for_trace(
                 frames,
                 library_frame_context_lines=self.config.source_lines_span_library_frames,

elasticapm/context/contextvars.py

@@ -2,8 +2,8 @@
 
 import contextvars
 
-elasticapm_transaction_var = contextvars.ContextVar('elasticapm_transaction_var')
-elasticapm_span_var = contextvars.ContextVar('elasticapm_span_var')
+elasticapm_transaction_var = contextvars.ContextVar("elasticapm_transaction_var")
+elasticapm_span_var = contextvars.ContextVar("elasticapm_span_var")
 
 
 def get_transaction(clear=False):

elasticapm/contrib/asyncio/traces.py

@@ -26,4 +26,4 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
             try:
                 transaction.end_span(self.skip_frames)
             except LookupError:
-                error_logger.info('ended non-existing span %s of type %s', self.name, self.type)
+                error_logger.info("ended non-existing span %s of type %s", self.name, self.type)

elasticapm/instrumentation/packages/aiohttp.py

@@ -1,6 +1,5 @@
 from elasticapm import async_capture_span
-from elasticapm.instrumentation.packages.asyncio_base import \
-    AsyncAbstractInstrumentedModule
+from elasticapm.instrumentation.packages.asyncio_base import AsyncAbstractInstrumentedModule
 from elasticapm.utils import default_ports
 from elasticapm.utils.compat import urlparse
 
@@ -9,27 +8,22 @@ def get_host_from_url(url):
     parsed_url = urlparse.urlparse(url)
     host = parsed_url.hostname or " "
 
-    if (
-        parsed_url.port and
-        default_ports.get(parsed_url.scheme) != parsed_url.port
-    ):
+    if parsed_url.port and default_ports.get(parsed_url.scheme) != parsed_url.port:
         host += ":" + str(parsed_url.port)
 
     return host
 
 
 class AioHttpClientInstrumentation(AsyncAbstractInstrumentedModule):
-    name = 'aiohttp_client'
+    name = "aiohttp_client"
 
-    instrument_list = [
-        ("aiohttp.client", "ClientSession._request"),
-    ]
+    instrument_list = [("aiohttp.client", "ClientSession._request")]
 
     async def call(self, module, method, wrapped, instance, args, kwargs):
-        method = kwargs['method'] if 'method' in kwargs else args[0]
-        url = kwargs['method'] if 'method' in kwargs else args[1]
+        method = kwargs["method"] if "method" in kwargs else args[0]
+        url = kwargs["method"] if "method" in kwargs else args[1]
 
         signature = " ".join([method.upper(), get_host_from_url(url)])
 
-        async with async_capture_span(signature, "ext.http.aiohttp", {'url': url}, leaf=True):
+        async with async_capture_span(signature, "ext.http.aiohttp", {"url": url}, leaf=True):
             return await wrapped(*args, **kwargs)

elasticapm/instrumentation/register.py

@@ -28,9 +28,7 @@
 }
 
 if sys.version_info >= (3, 5):
-    _cls_register.update([
-        'elasticapm.instrumentation.packages.aiohttp.AioHttpClientInstrumentation',
-    ])
+    _cls_register.update(["elasticapm.instrumentation.packages.aiohttp.AioHttpClientInstrumentation"])
 
 
 def register(cls):

elasticapm/traces.py

@@ -27,12 +27,7 @@
 
 
 class Transaction(object):
-    def __init__(
-        self,
-        store,
-        transaction_type="custom",
-        is_sampled=True,
-    ):
+    def __init__(self, store, transaction_type="custom", is_sampled=True):
         self.id = str(uuid.uuid4())
         self.timestamp = datetime.datetime.utcnow()
         self.start_time = _time_func()
@@ -149,16 +144,24 @@ def to_dict(self):
 
 
 class DroppedSpan(object):
-    __slots__ = ('leaf', 'parent')
+    __slots__ = ("leaf", "parent")
 
     def __init__(self, parent, leaf=False):
         self.parent = parent
         self.leaf = leaf
 
 
 class TransactionsStore(object):
-    def __init__(self, frames_collector_func, frames_processing_func, collect_frequency, sample_rate=1.0, max_spans=0,
-                 max_queue_size=None, span_frames_min_duration=None, ignore_patterns=None,
+    def __init__(
+        self,
+        frames_collector_func,
+        frames_processing_func,
+        collect_frequency,
+        sample_rate=1.0,
+        max_spans=0,
+        max_queue_size=None,
+        span_frames_min_duration=None,
+        ignore_patterns=None,
     ):
         self.cond = threading.Condition()
         self.collect_frequency = collect_frequency
@@ -206,10 +209,7 @@ def begin_transaction(self, transaction_type):
         :returns the Transaction object
         """
         is_sampled = self._sample_rate == 1.0 or self._sample_rate > random.random()
-        transaction = Transaction(
-            self, transaction_type,
-            is_sampled=is_sampled,
-        )
+        transaction = Transaction(self, transaction_type, is_sampled=is_sampled)
         set_transaction(transaction)
         return transaction