style: fix error [E302] - Expected 2 blank lines, found 1.

Used Ruff (vscode and pre-commit) to:
- Black-compatible code formatting.
- fix all auto-fixable violations.
- isort-compatible import sorting.
- flake8-simplify manual fixes.

Signed-off-by: Paulo Vital <paulo.vital@ibm.com>

Author: pvital

src/instana/autoprofile/runtime.py

@@ -9,6 +9,7 @@
 if TYPE_CHECKING:
     from types import FrameType
 
+
 class RuntimeInfo(object):
     OS_LINUX = sys.platform.startswith("linux")
     OS_DARWIN = sys.platform == "darwin"

src/instana/util/aws.py

@@ -3,6 +3,7 @@
 
 from ..log import logger
 
+
 def normalize_aws_lambda_arn(context):
     """
     Parse the AWS Lambda context object for a fully qualified AWS Lambda function ARN.
@@ -15,12 +16,12 @@ def normalize_aws_lambda_arn(context):
     """
     try:
         arn = context.invoked_function_arn
-        parts = arn.split(':')
+        parts = arn.split(":")
 
         count = len(parts)
         if count == 7:
             # need to append version
-            arn = arn + ':' + context.function_version
+            arn = arn + ":" + context.function_version
         elif count != 8:
             logger.debug("Unexpected ARN parse issue: %s", arn)
 

src/instana/util/gunicorn.py

@@ -3,7 +3,9 @@
 
 import os
 import sys
-from ..log import logger
+
+from instana.log import logger
+
 
 def running_in_gunicorn():
     """
@@ -15,22 +17,22 @@ def running_in_gunicorn():
 
     try:
         # Is this a gunicorn process?
-        if hasattr(sys, 'argv'):
+        if hasattr(sys, "argv"):
             for arg in sys.argv:
-                if arg.find('gunicorn') >= 0:
+                if arg.find("gunicorn") >= 0:
                     process_check = True
         elif os.path.isfile("/proc/self/cmdline"):
             with open("/proc/self/cmdline") as cmd:
                 contents = cmd.read()
 
-            parts = contents.split('\0')
+            parts = contents.split("\0")
             parts.pop()
             cmdline = " ".join(parts)
 
-            if cmdline.find('gunicorn') >= 0:
+            if cmdline.find("gunicorn") >= 0:
                 process_check = True
 
         return process_check
     except Exception:
         logger.debug("Instana.log.running_in_gunicorn: ", exc_info=True)
-        return False
+        return False

src/instana/util/ids.py

@@ -6,7 +6,11 @@
 import random
 from typing import Union
 
-from opentelemetry.trace.span import _SPAN_ID_MAX_VALUE, INVALID_SPAN_ID, INVALID_TRACE_ID
+from opentelemetry.trace.span import (
+    _SPAN_ID_MAX_VALUE,
+    INVALID_SPAN_ID,
+    INVALID_TRACE_ID,
+)
 
 _rnd = random.Random()
 _current_pid = 0
@@ -39,7 +43,7 @@ def header_to_long_id(header: Union[bytes, str]) -> int:
     :return: a valid ID to be used internal to the tracer
     """
     if isinstance(header, bytes):
-        header = header.decode('utf-8')
+        header = header.decode("utf-8")
 
     if not isinstance(header, str):
         return INVALID_TRACE_ID
@@ -67,7 +71,7 @@ def header_to_id(header: Union[bytes, str]) -> int:
     :return: a valid ID to be used internal to the tracer
     """
     if isinstance(header, bytes):
-        header = header.decode('utf-8')
+        header = header.decode("utf-8")
 
     if not isinstance(header, str):
         return INVALID_SPAN_ID
@@ -103,13 +107,14 @@ def hex_id(id: Union[int, str]) -> str:
         elif length > 16 and length < 32:
             hex_id = hex_id.zfill(32)
         return hex_id
-    except ValueError: # Handles ValueError: invalid literal for int() with base 10:
+    except ValueError:  # Handles ValueError: invalid literal for int() with base 10:
         return id
 
+
 def hex_id_limited(id: Union[int, str]) -> str:
     """
     Returns the hexadecimal representation of the given ID.
-    Limit longer IDs to 16 characters 
+    Limit longer IDs to 16 characters
     """
     try:
         hex_id = hex(int(id))[2:]
@@ -121,9 +126,10 @@ def hex_id_limited(id: Union[int, str]) -> str:
             # Phase 0: Discard everything but the last 16byte
             hex_id = hex_id[-16:]
         return hex_id
-    except ValueError: # Handles ValueError: invalid literal for int() with base 10:
+    except ValueError:  # Handles ValueError: invalid literal for int() with base 10:
         return id
 
+
 def define_server_timing(trace_id: Union[int, str]) -> str:
     # Note: The key `intid` is short for Instana Trace ID.
     return f"intid;desc={hex_id_limited(trace_id)}"
@@ -135,7 +141,7 @@ def internal_id(id: Union[int, str]) -> int:
     """
     if isinstance(id, int):
         return id
-    
+
     length = len(id)
 
     if isinstance(id, str) and id.isdigit():
@@ -153,7 +159,8 @@ def internal_id(id: Union[int, str]) -> int:
         return int(id, 16)
     except ValueError:
         return INVALID_TRACE_ID
-    
+
+
 def internal_id_limited(id: Union[int, str]) -> int:
     """
     Returns a valid id to be used internally. Handles both str and int types.

src/instana/util/sql.py

@@ -3,15 +3,16 @@
 
 import re
 
+
 def sql_sanitizer(sql):
     """
     Removes values from valid SQL statements and returns a stripped version.
 
     :param sql: The SQL statement to be sanitized
     :return: String - A sanitized SQL statement without values.
     """
-    return regexp_sql_values.sub('?', sql)
+    return regexp_sql_values.sub("?", sql)
 
 
 # Used by sql_sanitizer
-regexp_sql_values = re.compile(r"('[\s\S][^']*'|\d*\.\d+|\d+|NULL)")
+regexp_sql_values = re.compile(r"('[\s\S][^']*'|\d*\.\d+|\d+|NULL)")

tests/apps/bottle_app/app.py

@@ -15,23 +15,26 @@
 logger = logging.getLogger(__name__)
 
 testenv["wsgi_port"] = 10812
-testenv["wsgi_server"] = ("http://127.0.0.1:" + str(testenv["wsgi_port"]))
+testenv["wsgi_server"] = "http://127.0.0.1:" + str(testenv["wsgi_port"])
 
 app = default_app()
 
+
 @app.route("/")
 def hello():
     return "<center><h1>🐍 Hello Stan! 🦄</h1></center>"
 
+
 @app.route("/response_headers")
 def response_headers():
     response.set_header("X-Capture-This", "this")
     response.set_header("X-Capture-That", "that")
     return "Stan wuz here with headers!"
 
+
 # Wrap the application with the Instana WSGI Middleware
 app = InstanaWSGIMiddleware(app)
-bottle_server = make_server('127.0.0.1', testenv["wsgi_port"], app)
+bottle_server = make_server("127.0.0.1", testenv["wsgi_port"], app)
 
 if __name__ == "__main__":
     bottle_server.request_queue_size = 20

tests/w3c_trace_context/test_traceparent.py

@@ -5,6 +5,7 @@
 import unittest
 from instana.util.ids import header_to_long_id, header_to_id
 
+
 class TestTraceparent(unittest.TestCase):
     def setUp(self):
         self.tp = Traceparent()
@@ -38,14 +39,18 @@ def test_validate_traceparent_None(self):
 
     def test_get_traceparent_fields(self):
         traceparent = f"00-{self.w3cTraceId}-00f067aa0ba902b7-01"
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertEqual(trace_id, header_to_long_id(self.w3cTraceId))
         self.assertEqual(parent_id, 67667974448284343)
         self.assertTrue(sampled_flag)
 
     def test_get_traceparent_fields_unsampled(self):
         traceparent = f"00-{self.w3cTraceId}-00f067aa0ba902b7-00"
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertEqual(trace_id, header_to_long_id(self.w3cTraceId))
         self.assertEqual(parent_id, 67667974448284343)
         self.assertFalse(sampled_flag)
@@ -54,28 +59,36 @@ def test_get_traceparent_fields_newer_version(self):
         # Although the incoming traceparent header sports a newer version number, we should still be able to parse the
         # parts that we understand (and consider it valid).
         traceparent = f"fe-{self.w3cTraceId}-00f067aa0ba902b7-01-12345-abcd"
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertEqual(trace_id, header_to_long_id(self.w3cTraceId))
         self.assertEqual(parent_id, 67667974448284343)
         self.assertTrue(sampled_flag)
 
     def test_get_traceparent_fields_unknown_flags(self):
         traceparent = f"00-{self.w3cTraceId}-00f067aa0ba902b7-ff"
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertEqual(trace_id, header_to_long_id(self.w3cTraceId))
         self.assertEqual(parent_id, 67667974448284343)
         self.assertTrue(sampled_flag)
 
     def test_get_traceparent_fields_None_input(self):
         traceparent = None
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertIsNone(trace_id)
         self.assertIsNone(parent_id)
         self.assertFalse(sampled_flag)
 
     def test_get_traceparent_fields_string_input_no_dash(self):
         traceparent = "invalid"
-        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(traceparent)
+        version, trace_id, parent_id, sampled_flag = self.tp.get_traceparent_fields(
+            traceparent
+        )
         self.assertIsNone(trace_id)
         self.assertIsNone(parent_id)
         self.assertFalse(sampled_flag)
@@ -86,12 +99,22 @@ def test_update_traceparent(self):
         in_span_id = "1234567890abcdef"
         level = 1
         expected_traceparent = "00-4bf92f3577b34da6a3ce929d0e0e4736-1234567890abcdef-01"
-        self.assertEqual(expected_traceparent, self.tp.update_traceparent(traceparent, in_trace_id, header_to_id(in_span_id), level))
+        self.assertEqual(
+            expected_traceparent,
+            self.tp.update_traceparent(
+                traceparent, in_trace_id, header_to_id(in_span_id), level
+            ),
+        )
 
     def test_update_traceparent_None(self):
         traceparent = None
         in_trace_id = "1234d0e0e4736234"
         in_span_id = "7890abcdef"
         level = 0
         expected_traceparent = "00-00000000000000001234d0e0e4736234-0000007890abcdef-00"
-        self.assertEqual(expected_traceparent, self.tp.update_traceparent(traceparent, in_trace_id, header_to_id(in_span_id), level))
+        self.assertEqual(
+            expected_traceparent,
+            self.tp.update_traceparent(
+                traceparent, in_trace_id, header_to_id(in_span_id), level
+            ),
+        )

tests_autowrapt/test_autowrapt.py

@@ -1,6 +1,7 @@
 import os
 import sys
 
+
 def test_autowrapt_bootstrap():
     assert os.environ.get("AUTOWRAPT_BOOTSTRAP") == "instana"
     assert "instana" in sys.modules

tests_aws/01_lambda/test_lambda.py

@@ -24,6 +24,7 @@
 if TYPE_CHECKING:
     from instana.span.span import InstanaSpan
 
+
 # Mock Context object
 class MockContext(dict):
     def __init__(self, **kwargs: Dict[str, Any]) -> None:
@@ -81,7 +82,7 @@ def _resource(self) -> Generator[None, None, None]:
         self.agent: AWSLambdaAgent = get_agent()
         yield
         # tearDown
-        # Reset collector config 
+        # Reset collector config
         self.agent.collector.snapshot_data_sent = False
         # Reset all environment variables of consequence
         if "AWS_EXECUTION_ENV" in os.environ:
@@ -139,28 +140,28 @@ def test_get_handler(self) -> None:
         os.environ["LAMBDA_HANDLER"] = "tests.lambda_handler"
         handler_module, handler_function = get_aws_lambda_handler()
 
-        assert "tests" == handler_module
-        assert "lambda_handler" == handler_function
+        assert handler_module == "tests"
+        assert handler_function == "lambda_handler"
 
     def test_get_handler_with_multi_subpackages(self) -> None:
         os.environ["LAMBDA_HANDLER"] = "tests.one.two.three.lambda_handler"
         handler_module, handler_function = get_aws_lambda_handler()
 
-        assert "tests.one.two.three" == handler_module
-        assert "lambda_handler" == handler_function
+        assert handler_module == "tests.one.two.three"
+        assert handler_function == "lambda_handler"
 
     def test_get_handler_with_space_in_it(self) -> None:
         os.environ["LAMBDA_HANDLER"] = " tests.another_module.lambda_handler"
         handler_module, handler_function = get_aws_lambda_handler()
 
-        assert "tests.another_module" == handler_module
-        assert "lambda_handler" == handler_function
+        assert handler_module == "tests.another_module"
+        assert handler_function == "lambda_handler"
 
         os.environ["LAMBDA_HANDLER"] = "tests.another_module.lambda_handler    "
         handler_module, handler_function = get_aws_lambda_handler()
 
-        assert "tests.another_module" == handler_module
-        assert "lambda_handler" == handler_function
+        assert handler_module == "tests.another_module"
+        assert handler_function == "lambda_handler"
 
     def test_agent_extra_http_headers(self) -> None:
         os.environ["INSTANA_EXTRA_HTTP_HEADERS"] = (
@@ -184,7 +185,7 @@ def test_custom_service_name(self, trace_id: int, span_id: int) -> None:
         os.environ["INSTANA_AGENT_KEY"] = "Fake_Key"
         # We need reset the AWSLambdaOptions with new INSTANA_SERVICE_NAME
         self.agent.options = AWSLambdaOptions()
-        
+
         with open(
             self.pwd + "/../data/lambda/api_gateway_event.json", "r"
         ) as json_file:
@@ -779,7 +780,9 @@ def test_arn_parsing(self) -> None:
     def test_agent_default_log_level(self) -> None:
         assert self.agent.options.log_level == logging.WARNING
 
-    def __validate_result_and_payload_for_gateway_v2_trace(self, result: Dict[str, Any], payload: defaultdict) -> "InstanaSpan":
+    def __validate_result_and_payload_for_gateway_v2_trace(
+        self, result: Dict[str, Any], payload: defaultdict
+    ) -> "InstanaSpan":
         assert isinstance(result, dict)
         assert "headers" in result
         assert "Server-Timing" in result["headers"]
@@ -835,4 +838,4 @@ def __validate_result_and_payload_for_gateway_v2_trace(self, result: Dict[str, A
         assert span.data["http"]["path_tpl"] == "/my/{resource}"
         assert span.data["http"]["params"] == "secret=key&q=term"
 
-        return span
+        return span