Remove possible exceptions in complete_root. (#181)

* Remove possible exceptions in complete_root.

* Correct tests to follow new logic in complete_root

* Add str method to trace cache

* Restore exception to complete_root, and catch

* Add repr method to time trace

Author: TimPansino

newrelic/api/time_trace.py

@@ -67,6 +67,13 @@ def settings(self):
     def _is_leaf(self):
         return self.child_count == len(self.children)
 
+    def __str__(self):
+        name = getattr(self, "name", None)
+        return "<id:%d name:%s __str__:%s>" % (id(self), name, super(TimeTrace, self).__str__())
+
+    def __repr__(self):
+        return str(self)
+
     def __enter__(self):
         self.parent = parent = self.parent or current_trace()
         if not parent:

newrelic/api/transaction.py

@@ -396,7 +396,11 @@ def __exit__(self, exc, value, tb):
                 _logger.exception('Runtime instrumentation error. Attempt to '
                         'drop the trace but where none is active. '
                         'Report this issue to New Relic support.'),
-                raise
+                return
+        except Exception:
+            _logger.exception('Runtime instrumentation error. Exception '
+                    'occurred during exit. Report this issue to New Relic support.')
+            return
 
         # Record error if one was registered.
 

newrelic/core/trace_cache.py

@@ -100,6 +100,12 @@ class TraceCache(object):
     def __init__(self):
         self._cache = weakref.WeakValueDictionary()
 
+    def __str__(self):
+        return "<newrelic.core.trace_cache.TraceCache object at 0x%x %s>" % (id(self), str(dict(self._cache.items())))
+
+    def __repr__(self):
+        return str(self)
+
     def current_thread_id(self):
         """Returns the thread ID for the caller.
 

tests/agent_features/test_background_task.py

@@ -31,24 +31,18 @@ def test_sentinel_exited_complete_root_exception():
     This test forces a transaction to exit while it still has an active trace
     this causes an exception to be raised in TraceCache complete_root(). It
     verifies that the sentinel.exited property is set to true if an exception
-    is raised in complete_root()
+    is raised in complete_root(), and that the exception is caught.
     """
-    expected_error = "not the current trace"
 
-    try:
-        txn = None
-        sentinel = None
-        txn = BackgroundTask(application_instance(), "Parent")
-        txn.__enter__()
-        sentinel = txn.root_span
-        trace = FunctionTrace("trace")
-        trace.__enter__()
-        txn.__exit__(None, None, None)
-        assert False, "Did not raise exception"
-    except RuntimeError as e:
-        assert str(e) == expected_error
-    finally:
-        assert sentinel.exited
-        # Make sure to exit properly so cleanup is performed
-        trace.__exit__(None, None, None)
-        txn.__exit__(None, None, None)
+    txn = None
+    sentinel = None
+    txn = BackgroundTask(application_instance(), "Parent")
+    txn.__enter__()
+    sentinel = txn.root_span
+    trace = FunctionTrace("trace")
+    trace.__enter__()
+    txn.__exit__(None, None, None)
+    assert sentinel.exited
+    # Make sure to exit properly so cleanup is performed
+    trace.__exit__(None, None, None)
+    txn.__exit__(None, None, None)