fix: use the right channel_id value in client_info

also quiet boto3's logging for tests

Closes: #1059

autopush/tests/__init__.py

@@ -20,7 +20,8 @@
 
 
 def setUp():
-    logging.getLogger('boto').setLevel(logging.CRITICAL)
+    for name in ('boto', 'boto3', 'botocore'):
+        logging.getLogger(name).setLevel(logging.CRITICAL)
     global ddb_process
     cmd = " ".join([
         "java", "-Djava.library.path=%s" % ddb_lib_dir,

autopush/tests/test_integration.py

@@ -40,7 +40,7 @@
 )
 from autopush.logging import begin_or_register
 from autopush.main import ConnectionApplication, EndpointApplication
-from autopush.utils import base64url_encode
+from autopush.utils import base64url_encode, normalize_id
 from autopush.metrics import SinkMetrics, DatadogMetrics
 from autopush.tests.support import TestingLogObserver
 from autopush.websocket import PushServerFactory
@@ -434,6 +434,8 @@ def test_webpush_data_delivery_to_connected_client(self):
         assert result["channelID"] == chan
         assert result["data"] == "wyigoeIooQ"
         assert self.logs.logged_ci(lambda ci: 'message_size' in ci)
+        assert self.logs.logged_ci(
+            lambda ci: normalize_id(ci['channel_id']) == chan)
         assert self.logs.logged_ci(
             lambda ci: ci['encoding'] == "aesgcm"
         )

autopush/web/webpush.py

@@ -497,7 +497,7 @@ def post(self,
         self._client_info.update(
             message_id=notification.message_id,
             uaid_hash=hasher(user_data.get("uaid")),
-            channel_id=user_data.get("chid"),
+            channel_id=notification.channel_id.hex,
             router_key=user_data["router_type"],
             message_size=notification.data_length,
             message_ttl=notification.ttl,