fix: Response class doesn't have exception attribute. Fixes: #819

Signed-off-by: Cagri Yonca <[email protected]>

Author: CagriYonca

src/instana/instrumentation/pyramid.py

@@ -1,28 +1,27 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2020
 
+
 try:
+    from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Tuple
+
+    import wrapt
+    from pyramid.config import Configurator
     from pyramid.httpexceptions import HTTPException
     from pyramid.path import caller_package
     from pyramid.settings import aslist
     from pyramid.tweens import EXCVIEW
-    from pyramid.config import Configurator
-    from typing import TYPE_CHECKING, Dict, Any, Callable, Tuple
-    import wrapt
-
-    from opentelemetry.semconv.trace import SpanAttributes
-    from opentelemetry.trace import SpanKind
 
     from instana.log import logger
-    from instana.singletons import tracer, agent
+    from instana.propagators.format import Format
+    from instana.singletons import agent, tracer
     from instana.util.secrets import strip_secrets_from_query
     from instana.util.traceutils import extract_custom_headers
-    from instana.propagators.format import Format
 
     if TYPE_CHECKING:
+        from pyramid.registry import Registry
         from pyramid.request import Request
         from pyramid.response import Response
-        from pyramid.registry import Registry
 
     class InstanaTweenFactory(object):
         """A factory that provides Instana instrumentation tween for Pyramid apps"""
@@ -32,13 +31,13 @@ def __init__(
         ) -> None:
             self.handler = handler
 
-        def __call__(self, request: "Request") -> "Response":
+        def __call__(self, request: "Request") -> Optional["Response"]:
             ctx = tracer.extract(Format.HTTP_HEADERS, dict(request.headers))
 
             with tracer.start_as_current_span("wsgi", span_context=ctx) as span:
                 span.set_attribute("http.host", request.host)
-                span.set_attribute(SpanAttributes.HTTP_METHOD, request.method)
-                span.set_attribute(SpanAttributes.HTTP_URL, request.path)
+                span.set_attribute("http.method", request.method)
+                span.set_attribute("http.url", request.path)
 
                 extract_custom_headers(span, request.headers)
 
@@ -57,34 +56,25 @@ def __call__(self, request: "Request") -> "Response":
                         span.set_attribute(
                             "http.path_tpl", request.matched_route.pattern
                         )
-
                     extract_custom_headers(span, response.headers)
-
                     tracer.inject(span.context, Format.HTTP_HEADERS, response.headers)
                 except HTTPException as e:
                     response = e
                     logger.debug(
                         "Pyramid InstanaTweenFactory HTTPException: ", exc_info=True
                     )
                 except BaseException as e:
-                    span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, 500)
+                    span.set_attribute("http.status_code", 500)
                     span.record_exception(e)
-
                     logger.debug(
                         "Pyramid InstanaTweenFactory BaseException: ", exc_info=True
                     )
                 finally:
                     if response:
-                        span.set_attribute(
-                            SpanAttributes.HTTP_STATUS_CODE, response.status_int
-                        )
-
-                        if 500 <= response.status_int:
-                            if response.exception:
-                                span.record_exception(response.exception)
-                            span.assure_errored()
-
-                return response
+                        span.set_attribute("http.status_code", response.status_code)
+                        if response.status_code >= 400:
+                            span.record_exception(response)
+                    return response
 
     INSTANA_TWEEN = __name__ + ".InstanaTweenFactory"