Pyramid (transaction naming): lower exception view precedence (#237)

* Pyramid (transaction naming): increased priority to 2 for non-exception views so they take precedence

* Correct transaction names in tests

* Fix cornice test transaction name

Co-authored-by: Tim Pansino <[email protected]>

Author: Sybret

newrelic/hooks/framework_pyramid.py

@@ -98,7 +98,11 @@ def view_handler_wrapper(wrapped, instance, args, kwargs):
 
     name = callable_name(view_callable)
 
-    transaction.set_transaction_name(name)
+    # set exception views to priority=1 so they won't take precedence over
+    # the original view callable
+    transaction.set_transaction_name(
+        name,
+        priority=1 if args and isinstance(args[0], Exception) else 2)
 
     with FunctionTrace(name) as trace:
         try:
@@ -157,15 +161,15 @@ def _wrapper(context, request):
                     inst = getattr(request, '__view__', None)
                     if inst is not None:
                         name = callable_name(getattr(inst, attr))
-                        transaction.set_transaction_name(name, priority=1)
+                        transaction.set_transaction_name(name, priority=2)
                         tracer.name = name
                 else:
                     inst = getattr(request, '__view__', None)
                     if inst is not None:
                         method = getattr(inst, '__call__')
                         if method:
                             name = callable_name(method)
-                            transaction.set_transaction_name(name, priority=1)
+                            transaction.set_transaction_name(name, priority=2)
                             tracer.name = name
 
     return _wrapper

tests/framework_pyramid/test_application.py

@@ -80,7 +80,7 @@ def _test():
 
 @validate_transaction_errors(errors=[])
 @validate_transaction_metrics(
-    'pyramid.httpexceptions:default_exceptionresponse_view',
+    '_test_application:not_found_exception_response',
     scoped_metrics=_test_not_found_as_exception_response_scoped_metrics)
 def test_not_found_as_exception_response():
     application = target_application()
@@ -98,7 +98,7 @@ def test_not_found_as_exception_response():
 
 @validate_transaction_errors(errors=[])
 @validate_transaction_metrics(
-    'pyramid.httpexceptions:default_exceptionresponse_view',
+    '_test_application:raise_not_found',
     scoped_metrics=_test_not_found_raises_NotFound_scoped_metrics)
 def test_application_not_found_raises_NotFound():
     application = target_application()
@@ -154,7 +154,7 @@ def test_application_unexpected_exception():
 
 @validate_transaction_errors(errors=[])
 @validate_transaction_metrics(
-    'pyramid.httpexceptions:default_exceptionresponse_view',
+    '_test_application:redirect',
     scoped_metrics=_test_redirect_scoped_metrics)
 def test_application_redirect():
     application = target_application()

tests/framework_pyramid/test_cornice.py

@@ -91,7 +91,7 @@ def test_cornice_resource_get():
     _test_cornice_error_errors = ['exceptions:RuntimeError']
 
 @validate_transaction_errors(errors=_test_cornice_error_errors)
-@validate_transaction_metrics('cornice.pyramidhook:handle_exceptions',
+@validate_transaction_metrics('_test_application:cornice_error_get_info',
         scoped_metrics=_test_cornice_error_scoped_metrics)
 def test_cornice_error():
     application = target_application()