sanic: refactor tests

Signed-off-by: Varsha GS <[email protected]>
(cherry picked from commit b4968d031793fbf76b15b6d1456f45c54f0c744c)

Author: GSVarsha

src/instana/instrumentation/sanic_inst.py

@@ -4,6 +4,7 @@
 Instrumentation for Sanic
 https://sanicframework.org/en/
 """
+
 try:
     import sanic
     import wrapt
@@ -27,7 +28,6 @@
         from sanic.request import Request
         from sanic.response import HTTPResponse
 
-
     @wrapt.patch_function_wrapper("sanic.app", "Sanic.__init__")
     def init_with_instana(
         wrapped: Callable[..., sanic.app.Sanic.__init__],
@@ -43,7 +43,7 @@ def request_with_instana(request: Request) -> None:
             try:
                 if "http" not in request.scheme:
                     return
-                
+
                 headers = request.headers.copy()
                 parent_context = tracer.extract(Format.HTTP_HEADERS, headers)
 
@@ -54,8 +54,8 @@ def request_with_instana(request: Request) -> None:
                 token = context.attach(ctx)
                 request.ctx.token = token
 
-                span.set_attribute('span.kind', SpanKind.CLIENT)
-                span.set_attribute('http.path', request.path)
+                span.set_attribute("span.kind", SpanKind.CLIENT)
+                span.set_attribute("http.path", request.path)
                 span.set_attribute(SpanAttributes.HTTP_METHOD, request.method)
                 span.set_attribute(SpanAttributes.HTTP_HOST, request.host)
                 if hasattr(request, "url"):
@@ -65,9 +65,10 @@ def request_with_instana(request: Request) -> None:
 
                 if isinstance(query, (str, bytes)) and len(query):
                     if isinstance(query, bytes):
-                        query = query.decode('utf-8')
-                    scrubbed_params = strip_secrets_from_query(query, agent.options.secrets_matcher,
-                                                                agent.options.secrets_list)
+                        query = query.decode("utf-8")
+                    scrubbed_params = strip_secrets_from_query(
+                        query, agent.options.secrets_matcher, agent.options.secrets_list
+                    )
                     span.set_attribute("http.params", scrubbed_params)
 
                 if agent.options.extra_http_headers:
@@ -77,7 +78,6 @@ def request_with_instana(request: Request) -> None:
             except Exception:
                 logger.debug("request_with_instana: ", exc_info=True)
 
-
         @app.exception(Exception)
         def exception_with_instana(request: Request, exception: Exception) -> None:
             try:
@@ -95,7 +95,6 @@ def exception_with_instana(request: Request, exception: Exception) -> None:
             except Exception:
                 logger.debug("exception_with_instana: ", exc_info=True)
 
-
         @app.middleware("response")
         def response_with_instana(request: Request, response: HTTPResponse) -> None:
             try:
@@ -107,12 +106,14 @@ def response_with_instana(request: Request, response: HTTPResponse) -> None:
                 if status_code:
                     if int(status_code) >= 500:
                         span.mark_as_errored()
-                    span.set_attribute('http.status_code', status_code)
+                    span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
 
                 if hasattr(response, "headers"):
                     extract_custom_headers(span, response.headers)
                     tracer.inject(span.context, Format.HTTP_HEADERS, response.headers)
-                response.headers['Server-Timing'] = "intid;desc=%s" % span.context.trace_id
+                response.headers["Server-Timing"] = (
+                    "intid;desc=%s" % span.context.trace_id
+                )
 
                 if span.is_recording():
                     span.end()
@@ -125,4 +126,4 @@ def response_with_instana(request: Request, response: HTTPResponse) -> None:
                 logger.debug("response_with_instana: ", exc_info=True)
 
 except ImportError:
-    pass
+    pass

tests/apps/sanic_app/__init__.py

@@ -4,11 +4,10 @@
 
 import uvicorn
 
-from ...helpers import testenv
-from instana.log import logger
+from tests.helpers import testenv
 
 testenv["sanic_port"] = 1337
-testenv["sanic_server"] = ("http://127.0.0.1:" + str(testenv["sanic_port"]))
+testenv["sanic_server"] = f"http://127.0.0.1:{testenv['sanic_port']}"
 
 
 def launch_sanic():

tests/apps/sanic_app/name.py

@@ -7,8 +7,5 @@
 
 
 class NameView(HTTPMethodView):
-
     def get(self, request, name):
         return text("Hello {}".format(name))
-
-

tests/apps/sanic_app/server.py

@@ -10,32 +10,35 @@
 from tests.apps.sanic_app.simpleview import SimpleView
 from tests.apps.sanic_app.name import NameView
 
-app = Sanic('test')
+app = Sanic("test")
+
 
 @app.get("/foo/<foo_id:int>")
 async def uuid_handler(request, foo_id: int):
     return text("INT - {}".format(foo_id))
 
+
 @app.route("/response_headers")
 async def response_headers(request):
-    headers = {
-        'X-Capture-This-Too': 'this too',
-        'X-Capture-That-Too': 'that too'
-    }
+    headers = {"X-Capture-This-Too": "this too", "X-Capture-That-Too": "that too"}
     return text("Stan wuz here with headers!", headers=headers)
 
+
 @app.route("/test_request_args")
-async def test_request_args(request):
+async def test_request_args_500(request):
     raise SanicException("Something went wrong.", status_code=500)
 
+
 @app.route("/instana_exception")
-async def test_request_args(request):
+async def test_instana_exception(request):
     raise SanicException(description="Something went wrong.", status_code=500)
 
+
 @app.route("/wrong")
-async def test_request_args(request):
+async def test_request_args_400(request):
     raise SanicException(message="Something went wrong.", status_code=400)
 
+
 @app.get("/tag/<tag>")
 async def tag_handler(request, tag):
     return text("Tag - {}".format(tag))
@@ -45,8 +48,5 @@ async def tag_handler(request, tag):
 app.add_route(NameView.as_view(), "/<name>")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     app.run(host="0.0.0.0", port=8000, debug=True, access_log=True)
-
-
-

tests/apps/sanic_app/simpleview.py

@@ -5,20 +5,20 @@
 from sanic.views import HTTPMethodView
 from sanic.response import text
 
-class SimpleView(HTTPMethodView):
 
-  def get(self, request):
-      return text("I am get method")
+class SimpleView(HTTPMethodView):
+    def get(self, request):
+        return text("I am get method")
 
-  # You can also use async syntax
-  async def post(self, request):
-      return text("I am post method")
+    # You can also use async syntax
+    async def post(self, request):
+        return text("I am post method")
 
-  def put(self, request):
-      return text("I am put method")
+    def put(self, request):
+        return text("I am put method")
 
-  def patch(self, request):
-      return text("I am patch method")
+    def patch(self, request):
+        return text("I am patch method")
 
-  def delete(self, request):
-      return text("I am delete method")
+    def delete(self, request):
+        return text("I am delete method")

tests/conftest.py

@@ -48,7 +48,6 @@
 collect_ignore_glob.append("*frameworks/test_gevent*")
 collect_ignore_glob.append("*frameworks/test_grpcio*")
 collect_ignore_glob.append("*frameworks/test_pyramid*")
-collect_ignore_glob.append("*frameworks/test_sanic*")
 collect_ignore_glob.append("*frameworks/test_tornado*")
 
 # # Cassandra and gevent tests are run in dedicated jobs on CircleCI and will