feat: add metric for all mobile bridge "unregistered" user drops

autopush/router/adm.py

@@ -191,7 +191,7 @@ def _route(self, notification, uaid_data):
             self.metrics.increment("notification.bridge.error",
                                    tags=make_tags(
                                        self._base_tags,
-                                       reason="connection_unavailable"))
+                                       reason="connection unavailable"))
             raise RouterException("Server error", status_code=502,
                                   errno=902,
                                   log_exception=False)

autopush/router/apnsrouter.py

@@ -164,21 +164,14 @@ def _route(self, notification, router_data):
             else:
                 reason = "unknown"
             if isinstance(e, RouterException) and e.status_code in [404, 410]:
-                self.metrics.increment(
-                    "notification.bridge.connection.error",
-                    tags=make_tags(
-                        self._base_tags,
-                        application=rel_channel,
-                        reason="unregistered"
-                        ))
                 raise RouterException(
                     str(e),
                     status_code=e.status_code,
                     errno=106,
                     response_body="User is no longer registered",
                     log_exception=False
                 )
-            self.metrics.increment("notification.bridge.connection.error",
+            self.metrics.increment("notification.bridge.error",
                                    tags=make_tags(self._base_tags,
                                                   application=rel_channel,
                                                   reason=reason))

autopush/tests/test_integration.py

@@ -2477,8 +2477,10 @@ def test_registration(self):
         assert ca_data['body'] == base64url_encode(data)
 
     @inlineCallbacks
-    def test_aaa_send_410(self):
+    def test_send_410(self):
         self._add_router()
+        mock_metrics = Mock()
+        self.ep.db.metrics = mock_metrics
         # get the senderid
         url = "{}/v1/{}/{}/registration".format(
             self.ep.conf.endpoint_url,
@@ -2515,6 +2517,8 @@ def test_aaa_send_410(self):
             body=data
         )
         assert response.code == 410
+        assert mock_metrics.increment.call_args[1]['tags'] == \
+            ['code:410', 'router:apns', 'vapid:True']
         self.assertRaises(
             ItemNotFound,
             self.ep.db.router.get_uaid,

autopush/tests/test_router.py

@@ -265,7 +265,7 @@ def test_bad_send(self):
             'User is no longer registered')
 
     @inlineCallbacks
-    def test_aaaa_fail_send(self):
+    def test_fail_send(self):
         def throw(*args, **kwargs):
             raise HTTP20Error("oops")
 
@@ -279,7 +279,7 @@ def throw(*args, **kwargs):
                                          'processing request'
         assert self.metrics.increment.called
         assert self.metrics.increment.call_args[0][0] == \
-            'notification.bridge.connection.error'
+            'notification.bridge.error'
         self.flushLoggedErrors()
 
     @inlineCallbacks
@@ -300,7 +300,7 @@ def throw(*args, **kwargs):
                                          'processing request'
         assert self.metrics.increment.called
         assert self.metrics.increment.call_args[0][0] == \
-            'notification.bridge.connection.error'
+            'notification.bridge.error'
         self.flushLoggedErrors()
 
     def test_too_many_connections(self):

autopush/web/base.py

@@ -335,6 +335,14 @@ def _router_fail_err(self, fail, router_type=None, vapid=False, uaid=None):
         # reporting a not found and they're mobile.
         if exc.status_code in [404, 410] and router_type in [
                 'apns', 'fcm', 'adm']:
+            self._base_tags.update({
+                "platform": router_type,
+                "reason": "unregistered",
+            })
+            self.metrics.increment(
+                    "notification.bridge.error",
+                    tags=self._base_tags)
+
             self.db.router.drop_user(uaid)
         self._router_response(exc, router_type, vapid)