Update to support iOS minor versions for both user agent and OS versi…

…on, for web-features baseline
rum-archive · Apr 29, 2024 · a2f54fe · a2f54fe
1 parent b9eb459
commit a2f54fe
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/data-cache/recent_useragentversion_useragentfamily_devicetype.json b/data-cache/recent_useragentversion_useragentfamily_devicetype.json
diff --git a/data-output/recent_useragentversion_useragentfamily_devicetype.json b/data-output/recent_useragentversion_useragentfamily_devicetype.json
diff --git a/data-output/web-features.json b/data-output/web-features.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/queries/recent_useragentversion_useragentfamily_devicetype.jsonl b/queries/recent_useragentversion_useragentfamily_devicetype.jsonl
@@ -4,17 +4,18 @@
     "processingtype": "groupedMetricPerDevice",
     "extractmetric": "version",
     "groupby": "family",
-    "comments": "We exclude null values here due to the already high cardinality of results. We manually select the 'interesting' user agents for the same reason.",
+    "comments": "We exclude null values here due to the already high cardinality of results.",
     "sql": "
         SELECT DATE as date, 
         USERAGENTVERSION as version,
         USERAGENTFAMILY as family, 
+        OS as os,
+        OSVERSION as osversion,
         DEVICETYPE as device, 
         COUNT(*) as rowcount, 
         SUM(BEACONS) as beaconcount
-        FROM `akamai-mpulse-rumarchive.rumarchive.rumarchive_page_loads` 
-        WHERE DEVICETYPE IS NOT NULL and USERAGENTFAMILY IS NOT NULL AND USERAGENTVERSION IS NOT NULL AND {{DATES}}
-            AND USERAGENTFAMILY in ('Chrome', 'Chrome Mobile', 'Chrome Mobile WebView', 'Chrome Mobile iOS', 'Safari', 'Mobile Safari', 'Mobile Safari UI/WKWebView', 'Edge', 'Facebook', 'Firefox', 'Firefox Mobile', 'Opera', 'Opera Mini', 'Samsung Internet', 'Instagram')
-        GROUP BY DATE, DEVICETYPE, USERAGENTFAMILY, USERAGENTVERSION 
+        FROM `akamai-mpulse-rumarchive.rumarchive_test.rumarchive_page_loads` 
+        WHERE DEVICETYPE IS NOT NULL and OS IS NOT NULL and OSVERSION IS NOT NULL and USERAGENTFAMILY IS NOT NULL AND USERAGENTVERSION IS NOT NULL AND (DATE = \"2024-04-02\")
+        GROUP BY DATE, DEVICETYPE, USERAGENTFAMILY, USERAGENTVERSION, OS, OSVERSION 
         ORDER BY DATE ASC, DEVICETYPE ASC, USERAGENTFAMILY ASC, beaconcount DESC"
 }
diff --git a/src/processing.js b/src/processing.js
@@ -306,7 +306,11 @@ function processGroupedMetricPerDevicetype(rows, metricFieldName, groupbyFieldNa
         datapoint.timestamp = "" + (new Date( row.date.value ).getTime());
 
         if ( includeFullCount ) {
+            // TODO: full count now also implies os and osversion from hacking for the Baseline support
+            // this should be integrated properly, OR REMOVED ENTIRELY
             datapoint.count = row.beaconcount;
+            datapoint.os = row.os;
+            datapoint.osversion = row.osversion;
         }
 
         if( percent > 0.1 ) {