Merge pull request #645 from HTTPArchive/lightrider

Use a fast 4G profile when running desktop lighthouse tests
catchpoint · Apr 17, 2024 · 0521863 · 0521863
2 parents 4536ff0 + f904e55
commit 0521863
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/internal/devtools_browser.py b/internal/devtools_browser.py
@@ -854,7 +854,12 @@ def run_lighthouse_test(self, task):
             else:
                 cpu_throttle = '{:.3f}'.format(self.job['throttle_cpu']) if 'throttle_cpu' in self.job else '1'
                 if self.job['dtShaper']:
-                    command.extend(['--throttling-method', 'devtools', '--throttling.requestLatencyMs', '150', '--throttling.downloadThroughputKbps', '1600', '--throttling.uploadThroughputKbps', '768', '--throttling.cpuSlowdownMultiplier', cpu_throttle])
+                    if self.options.android or ('mobile' in self.job and self.job['mobile']):
+                        # 1.6Mbps down, 750Kbps up, 150ms RTT
+                        command.extend(['--throttling-method', 'devtools', '--throttling.requestLatencyMs', '150', '--throttling.downloadThroughputKbps', '1600', '--throttling.uploadThroughputKbps', '750', '--throttling.cpuSlowdownMultiplier', cpu_throttle])
+                    else:
+                        # 10Mbps, 40ms RTT
+                        command.extend(['--throttling-method', 'devtools', '--throttling.requestLatencyMs', '40', '--throttling.downloadThroughputKbps', '10240', '--throttling.uploadThroughputKbps', '10240', '--throttling.cpuSlowdownMultiplier', cpu_throttle])
                 elif 'throttle_cpu_requested' in self.job and self.job['throttle_cpu_requested'] > 1:
                     command.extend(['--throttling-method', 'devtools', '--throttling.requestLatencyMs', '0', '--throttling.downloadThroughputKbps', '0', '--throttling.uploadThroughputKbps', '0', '--throttling.cpuSlowdownMultiplier', cpu_throttle])
                 else:

diff --git a/internal/traffic_shaping.py b/internal/traffic_shaping.py
@@ -18,6 +18,7 @@ def __init__(self, options, root_path):
         shaper_name = options.shaper
         self.support_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "support")
         self.shaper = None
+        self.options = options
         plat = platform.system()
         if shaper_name is None and plat == "Linux":
             shaper_name = 'netem'
@@ -98,13 +99,20 @@ def configure(self, job, task):
         if 'shaperLimit' in job:
             shaperLimit = self._to_int(job['shaperLimit'])
         if self.shaper is not None:
-            # If a lighthouse test is running, force the Lighthouse 3G profile:
+            # If a lighthouse test is running, force the Lighthouse 3G profile for mobile
+            # or 4G for desktop:
             # https://github.com/GoogleChrome/lighthouse/blob/master/docs/throttling.md
-            # 1.6Mbps down, 750Kbps up, 150ms RTT
             if task['running_lighthouse'] and not job['lighthouse_throttle']:
-                rtt = 150
-                in_bps = 1600000
-                out_bps = 750000
+                if self.options.android or ('mobile' in job and job['mobile']):
+                    # 1.6Mbps down, 750Kbps up, 150ms RTT
+                    rtt = 150
+                    in_bps = 1600000
+                    out_bps = 750000
+                else:
+                    # 10Mbps, 40ms RTT
+                    rtt = 40
+                    in_bps = 10240000
+                    out_bps = 10240000
                 plr = .0
                 shaperLimit = 0
             logging.debug('Configuring traffic shaping: %d/%d - %d ms, %0.2f%% plr, %d tc-qdisc limit',