Merge remote-tracking branch 'origin/bugfix/S3UTILS-207' into w/1.16/bugfix/S3UTILS-207

Author: dvasilas

service-level-sidecar/bucketd.js

@@ -50,7 +50,11 @@ async function* listBuckets(log) {
         log.debug('got list of buckets from bucketd', { length: res.length });
 
         yield res.map(data => {
-            const { key, value } = data;
+            const { value, key: rawKey } = data;
+            let key = rawKey;
+            if (key.startsWith('\x7fM')) {
+                key = key.slice(2);
+            }
             const [account, name] = key.split(mdKeySplitter);
             return {
                 account,

service-level-sidecar/report.js

@@ -73,8 +73,8 @@ async function getMetricsForBucket(sessionIds, timestamp, bucket, log) {
         return logResults
             .filter(result => result !== null)
             .reduce((acc, result) => ({
-                count: acc.count + result.value.metrics.objectsTotal,
-                bytes: acc.bytes + result.value.metrics.bytesTotal,
+                count: acc.count + parseInt(result.value.metrics.objectsTotal, 10),
+                bytes: acc.bytes + parseInt(result.value.metrics.bytesTotal, 10),
             }), { count: 0, bytes: 0 });
     }
     return warp10.getMetricsForBucket(timestamp, bucket.name, log);