Add metric logic for expected errors. (#221)

* Add logic for expected error metrics.

* Update adpex_perf.

* Update apdex logic.

* Update expected conditional logic.

Author: umaannamalai

newrelic/core/stats_engine.py

@@ -732,8 +732,13 @@ def notice_error(self, error=None, attributes={}, expected=None, ignore=None, st
             self.__transaction_errors.append(error_details)
 
         # Regardless of whether we record the trace or the event we still
-        # want to increment the metric Errors/all
-        self.record_time_metric(TimeMetric(name='Errors/all', scope='',
+        # want to increment the metric Errors/all unless the error was marked
+        # as expected
+        if is_expected:
+            self.record_time_metric(TimeMetric(name='ErrorsExpected/all', scope='',
+                duration=0.0, exclusive=None))
+        else:
+            self.record_time_metric(TimeMetric(name='Errors/all', scope='',
                 duration=0.0, exclusive=None))
 
     def _error_event(self, error):

newrelic/core/transaction_node.py

@@ -209,26 +209,33 @@ def time_metrics(self, stats):
         # Generate Error metrics
 
         if self.errors:
-            # Generate overall rollup metric indicating if errors present.
-            yield TimeMetric(
+            if False in (error.expected for error in self.errors):
+                # Generate overall rollup metric indicating if errors present.
+                yield TimeMetric(
                     name='Errors/all',
                     scope='',
                     duration=0.0,
                     exclusive=None)
 
-            # Generate individual error metric for transaction.
-            yield TimeMetric(
+                # Generate individual error metric for transaction.
+                yield TimeMetric(
                     name='Errors/%s' % self.path,
                     scope='',
                     duration=0.0,
                     exclusive=None)
 
-            # Generate rollup metric for WebTransaction errors.
-            yield TimeMetric(
+                # Generate rollup metric for WebTransaction errors.
+                yield TimeMetric(
                     name='Errors/all%s' % metric_suffix,
                     scope='',
                     duration=0.0,
                     exclusive=None)
+            else:
+                yield TimeMetric(
+                    name='ErrorsExpected/all',
+                    scope='',
+                    duration=0.0,
+                    exclusive=None)
 
         # Now for the children.
         for child in self.root.children:
@@ -260,7 +267,7 @@ def apdex_metrics(self, stats):
         tolerating = 0
         frustrating = 0
 
-        if self.errors:
+        if self.errors and False in (error.expected for error in self.errors):
             frustrating = 1
         else:
             if self.duration <= self.apdex_t:
@@ -397,7 +404,7 @@ def apdex_perf_zone(self):
         if self.type != 'WebTransaction':
             return None
 
-        if self.errors:
+        if self.errors and False in (error.expected for error in self.errors):
             return 'F'
         else:
             if self.duration <= self.apdex_t: