Merge pull request #876 from mozilla-services/feat/875

feat: add tracking for content-encoding

autopush/tests/test_integration.py

@@ -751,6 +751,9 @@ def test_webpush_data_delivery_to_connected_client(self):
         eq_(result["data"], "wyigoeIooQ")
         ok_(self.logs.logged_ci(lambda ci: 'message_size' in ci),
             "message_size not logged")
+        ok_(self.logs.logged_ci(
+            lambda ci: ci['encoding'] == "aesgcm"
+        ))
         yield self.shut_down(client)
 
     @inlineCallbacks

autopush/web/webpush.py

@@ -411,16 +411,19 @@ def post(self,
                 self._client_info["jwt_" + i] = jwt["jwt_data"][i]
 
         user_data = subscription["user_data"]
+        encoding = ''
+        if notification.data and notification.headers:
+            encoding = notification.headers.get('encoding', '')
         self._client_info.update(
             message_id=notification.message_id,
             uaid=hasher(user_data.get("uaid")),
             channel_id=user_data.get("chid"),
             router_key=user_data["router_type"],
             message_size=len(notification.data or ""),
             ttl=notification.ttl,
-            version=notification.version
+            version=notification.version,
+            encoding=encoding,
         )
-
         router = self.ap_settings.routers[user_data["router_type"]]
         self._router_time = time.time()
         d = maybeDeferred(router.route_notification, notification, user_data)