Update all framework instrumentation with new error logic (#218)

* Switch out error API and return status codes directly.

* Switch ignore_status_code calls with should_ignore_error.

* Fix tornado and bottle tests.

* Pass status code to notice_error directly.

* Pass ignore iterable to wrap_error_trace.

* Remove unused imports

Author: umaannamalai

newrelic/agent.py

@@ -15,9 +15,8 @@
 from newrelic.config import (
         initialize as __initialize,
         extra_settings as __extra_settings)
-from newrelic.core.config import (
-        global_settings as __global_settings,
-        ignore_status_code as __ignore_status_code)
+
+from newrelic.core.config import global_settings as __global_settings
 
 from newrelic.core.agent import (
         shutdown_agent as __shutdown_agent,
@@ -200,8 +199,6 @@ def __asgi_application(*args, **kwargs):
         'extra_settings')
 global_settings = __wrap_api_call(__global_settings,
         'global_settings')
-ignore_status_code = __wrap_api_call(__ignore_status_code,
-        'ignore_status_code')
 shutdown_agent = __wrap_api_call(__shutdown_agent,
         'shutdown_agent')
 register_data_source = __wrap_api_call(__register_data_source,

newrelic/hooks/application_gearman.py

@@ -156,7 +156,7 @@ def wrapper_callback_function(wrapped, instance, args, kwargs):
         try:
             return wrapped(*args, **kwargs)
         except:  # Catch all
-            trace.record_exception()
+            trace.notice_error()
             raise
 
 def wrapper_GearmanWorker_register_task(wrapped, instance, args, kwargs):

newrelic/hooks/component_flask_rest.py

@@ -13,21 +13,19 @@
 # limitations under the License.
 
 from newrelic.api.transaction import current_transaction
-from newrelic.api.time_trace import record_exception
-from newrelic.core.config import ignore_status_code
+from newrelic.api.time_trace import notice_error
 from newrelic.common.object_wrapper import wrap_function_wrapper
 
 
-def should_ignore(exc, value, tb):
+def status_code(exc, value, tb):
     from werkzeug.exceptions import HTTPException
 
     # Werkzeug HTTPException can be raised internally by Flask or in
     # user code if they mix Flask with Werkzeug. Filter based on the
     # HTTP status code.
 
     if isinstance(value, HTTPException):
-        if ignore_status_code(value.code):
-            return True
+        return value.code
 
 
 def _nr_wrap_Api_handle_error_(wrapped, instance, args, kwargs):
@@ -36,7 +34,7 @@ def _nr_wrap_Api_handle_error_(wrapped, instance, args, kwargs):
     # flask's exception handler and we will capture it there.
     resp = wrapped(*args, **kwargs)
 
-    record_exception(ignore_errors=should_ignore)
+    notice_error(status_code=status_code)
 
     return resp
 

newrelic/hooks/component_tastypie.py

@@ -17,17 +17,15 @@
 from newrelic.api.function_trace import FunctionTrace
 from newrelic.api.object_wrapper import ObjectWrapper, callable_name
 from newrelic.api.transaction import current_transaction
-from newrelic.api.time_trace import record_exception
+from newrelic.api.time_trace import notice_error
 from newrelic.common.object_wrapper import wrap_function_wrapper
-from newrelic.core.config import ignore_status_code
 
 
 def _nr_wrap_handle_exception(wrapped, instance, args, kwargs):
 
     response = wrapped(*args, **kwargs)
 
-    if not ignore_status_code(response.status_code):
-        record_exception()
+    notice_error(status_code=response.status_code)
 
     return response
 

newrelic/hooks/framework_aiohttp.py

@@ -23,7 +23,8 @@
 from newrelic.common.object_names import callable_name
 from newrelic.common.object_wrapper import (wrap_function_wrapper,
         function_wrapper, ObjectProxy)
-from newrelic.core.config import ignore_status_code
+from newrelic.core.config import should_ignore_error
+
 
 
 SUPPORTED_METHODS = ('connect', 'head', 'get', 'delete', 'options', 'patch',
@@ -51,7 +52,7 @@ def should_ignore(exc, value, tb):
 
     if isinstance(value, web.HTTPException):
         status_code = value.status_code
-        return ignore_status_code(status_code)
+        return should_ignore_error((exc, value, tb), status_code)
 
 
 def _nr_process_response_proxy(response, transaction):
@@ -345,7 +346,7 @@ def _coro(*_args, **_kwargs):
             response = yield from coro
             return response
 
-        # Patch in should_ignore to all record_exception calls
+        # Patch in should_ignore to all notice_error calls
         transaction._ignore_errors = should_ignore
 
         import aiohttp

newrelic/hooks/framework_bottle.py

@@ -26,26 +26,23 @@
 from newrelic.common.object_wrapper import (wrap_out_function,
         function_wrapper, ObjectProxy, wrap_object_attribute,
         wrap_function_wrapper)
-from newrelic.core.config import ignore_status_code
 
 module_bottle = None
 
-def should_ignore(exc, value, tb):
+def status_code(exc, value, tb):
     # The HTTPError class derives from HTTPResponse and so we do not
     # need to check for it seperately as isinstance() will pick it up.
 
     if isinstance(value, module_bottle.HTTPResponse):
         if hasattr(value, 'status_code'):
-            if ignore_status_code(value.status_code):
-                return True
+            return value.status_code
         elif hasattr(value, 'status'):
-            if ignore_status_code(value.status):
-                return True
+            return value.status
         elif hasattr(value, 'http_status_code'):
-            if ignore_status_code(value.http_status_code):
-                return True
+            return value.http_status_code
 
-    elif hasattr(module_bottle, 'RouteReset'):
+def should_ignore(exc, value, tb):
+    if hasattr(module_bottle, 'RouteReset'):
         if isinstance(value, module_bottle.RouteReset):
             return True
 
@@ -75,7 +72,7 @@ def callback_wrapper(wrapped, instance, args, kwargs):
             # return it instead. This doesn't always seem to be the case
             # though when plugins are used, although that may depend on
             # the specific bottle version being used.
-            trace.record_exception(ignore_errors=should_ignore)
+            trace.notice_error(status_code=status_code, ignore=should_ignore)
             raise
 
 def output_wrapper_Bottle_match(result):

newrelic/hooks/framework_cherrypy.py

@@ -39,12 +39,11 @@
 
 from newrelic.api.function_trace import FunctionTrace, wrap_function_trace
 from newrelic.api.transaction import current_transaction
-from newrelic.api.time_trace import record_exception
+from newrelic.api.time_trace import notice_error
 from newrelic.api.wsgi_application import wrap_wsgi_application
 from newrelic.common.object_names import callable_name
 from newrelic.common.object_wrapper import (ObjectProxy, function_wrapper,
         wrap_function_wrapper)
-from newrelic.core.config import ignore_status_code
 from newrelic.api.error_trace import wrap_error_trace
 
 
@@ -53,7 +52,7 @@ def framework_details():
     return ('CherryPy', getattr(cherrypy, '__version__', None))
 
 
-def should_ignore(exc, value, tb):
+def status_code(exc, value, tb):
     from cherrypy import HTTPError, HTTPRedirect
 
     # Ignore certain exceptions based on HTTP status codes.
@@ -64,20 +63,7 @@ def should_ignore(exc, value, tb):
         # HTTPError("10 Bad error")), value will not have a code attr.
         # In both of those cases, we fall back to value.status
         code = getattr(value, 'code', value.status)
-
-        if ignore_status_code(code):
-            return True
-
-    # Ignore certain exceptions based on their name.
-
-    module = value.__class__.__module__
-    name = value.__class__.__name__
-    fullname = '%s:%s' % (module, name)
-
-    ignore_exceptions = ('cherrypy._cperror:InternalRedirect',)
-
-    if fullname in ignore_exceptions:
-        return True
+        return code
 
 
 @function_wrapper
@@ -122,7 +108,7 @@ def wrapper_Dispatcher_find_handler(wrapped, instance, args, kwargs):
     except:  # Catch all
         # Can end up here when a custom _cp_dispatch() method is
         # used and that raises an exception.
-        record_exception()
+        notice_error()
         raise
 
     if obj:
@@ -173,7 +159,7 @@ def wrapper_RoutesDispatcher_find_handler(wrapped, instance, args, kwargs):
 
     except:  # Catch all
         # Can end up here when the URL was invalid in some way.
-        record_exception()
+        notice_error()
         raise
 
     if handler:
@@ -206,7 +192,7 @@ def instrument_cherrypy__cpdispatch(module):
     wrap_function_wrapper(module, 'RoutesDispatcher.find_handler',
             wrapper_RoutesDispatcher_find_handler)
     wrap_error_trace(module, 'PageHandler.__call__',
-            ignore=should_ignore)
+            ignore=['cherrypy._cperror:InternalRedirect'], status_code=status_code)
 
 
 def instrument_cherrypy__cpwsgi(module):

newrelic/hooks/framework_django.py

@@ -26,15 +26,15 @@
         FunctionTraceWrapper)
 from newrelic.api.html_insertion import insert_html_snippet
 from newrelic.api.transaction import current_transaction
-from newrelic.api.time_trace import record_exception
+from newrelic.api.time_trace import notice_error
 from newrelic.api.transaction_name import wrap_transaction_name
 from newrelic.api.wsgi_application import WSGIApplicationWrapper
 
 from newrelic.common.object_wrapper import (FunctionWrapper, wrap_in_function,
         wrap_post_function, wrap_function_wrapper, function_wrapper)
 from newrelic.common.object_names import callable_name
 from newrelic.config import extra_settings
-from newrelic.core.config import global_settings, ignore_status_code
+from newrelic.core.config import global_settings
 from newrelic.common.coroutine import is_coroutine_function, is_asyncio_coroutine
 
 if six.PY3:
@@ -445,8 +445,7 @@ def _nr_wrapper_BaseHandler_get_response_(wrapped, instance, args, kwargs):
     request = _bind_get_response(*args, **kwargs)
 
     if hasattr(request, '_nr_exc_info'):
-        if not ignore_status_code(response.status_code):
-            record_exception(*request._nr_exc_info)
+        notice_error(error=request._nr_exc_info, status_code=response.status_code)
         delattr(request, '_nr_exc_info')
 
     return response
@@ -496,13 +495,13 @@ def wrapper(wrapped, instance, args, kwargs):
 
         def _wrapped(request, resolver, exc_info):
             transaction.set_transaction_name(name, priority=1)
-            record_exception(*exc_info)
+            notice_error(exc_info)
 
             try:
                 return wrapped(request, resolver, exc_info)
 
             except:  # Catch all
-                record_exception()
+                notice_error()
                 raise
 
         with FunctionTrace(name=name):
@@ -569,7 +568,7 @@ def wrapper(wrapped, instance, args, kwargs):
                     # prior to reporting
                     args[0]._nr_exc_info = exc_info
                 except:
-                    record_exception(*exc_info)
+                    notice_error(exc_info)
                 raise
 
     result = FunctionWrapper(wrapped, wrapper)

newrelic/hooks/framework_django_py3.py

@@ -1,6 +1,5 @@
-from newrelic.api.time_trace import record_exception
+from newrelic.api.time_trace import notice_error
 from newrelic.api.transaction import current_transaction
-from newrelic.core.config import ignore_status_code
 from newrelic.common.object_wrapper import function_wrapper
 from newrelic.api.function_trace import FunctionTrace
 
@@ -19,8 +18,7 @@ async def _nr_wrapper_BaseHandler_get_response_async_(
     request = _bind_get_response(*args, **kwargs)
 
     if hasattr(request, '_nr_exc_info'):
-        if not ignore_status_code(response.status_code):
-            record_exception(*request._nr_exc_info)
+        notice_error(error=request._nr_exc_info, status_code=response.status_code)
         delattr(request, '_nr_exc_info')
 
     return response

newrelic/hooks/framework_falcon.py

@@ -17,9 +17,8 @@
 from newrelic.common.object_wrapper import (wrap_function_wrapper,
         function_wrapper)
 from newrelic.api.transaction import current_transaction
-from newrelic.api.time_trace import record_exception
+from newrelic.api.time_trace import notice_error
 from newrelic.api.wsgi_application import wrap_wsgi_application
-from newrelic.core.config import ignore_status_code
 from newrelic.api.function_trace import function_trace
 
 
@@ -47,11 +46,9 @@ def wrap_handle_exception(wrapped, instance, args, kwargs):
             try:
                 resp = bind_handle_exception(*args, **kwargs)
                 response_code = int(resp.status.split()[0])
-                if ignore_status_code(response_code):
-                    return result
-                record_exception(*exc_info)
+                notice_error(error=exc_info, status_code=response_code)
             except:
-                record_exception(*exc_info)
+                notice_error(exc_info)
             finally:
                 exc_info = None