Merge branch '7.17' into fix/synthetics-remove-full-screenshots

Author: dominiqueclarke

package.json

@@ -320,7 +320,7 @@
     "prop-types": "^15.7.2",
     "proxy-from-env": "1.0.0",
     "puid": "1.0.7",
-    "puppeteer": "22.8.1",
+    "puppeteer": "22.13.1",
     "query-string": "^6.13.2",
     "random-word-slugs": "^0.0.5",
     "raw-loader": "^3.1.0",

x-pack/plugins/reporting/server/browsers/chromium/driver_factory/args.ts

@@ -73,12 +73,11 @@ export const args = ({
     flags.push('--no-sandbox');
   }
 
-  // Since chromium v111 headless mode in arm based macs is not working with `--disable-gpu`
+  // Headless mode in arm based macs is not working with `--disable-gpu`
   // This is a known issue: headless uses swiftshader by default and swiftshader's support for WebGL is currently disabled on Arm pending the resolution of https://issuetracker.google.com/issues/165000222.
-  // As a workaround, we force hardware GL drivers on mac: v111 and older versions should work with --use-angle.
-  // The best way to do this when the issue is resolved will be to pass --enable-gpu,
+  // As a workaround, we pass --enable-gpu to stop forcing swiftshader, see https://issues.chromium.org/issues/40256775#comment4
   if (os.arch() === 'arm64' && process.platform === 'darwin') {
-    flags.push('--use-angle');
+    flags.push('--enable-gpu');
   } else {
     flags.push('--disable-gpu');
   }

x-pack/plugins/reporting/server/browsers/chromium/paths.ts

@@ -44,10 +44,10 @@ export class ChromiumArchivePaths {
       platform: 'darwin',
       architecture: 'x64',
       archiveFilename: 'chrome-mac.zip',
-      archiveChecksum: 'f69bb2f5f402aa2bdd28ccab3a9b36857d1591a1f443fa5b8865df644805cb96',
-      binaryChecksum: 'c6289a1a1d45021b2259ea0c9ae65ea37199452b5457831680a5e192a3f19add',
+      archiveChecksum: 'fa8004f3c8c5574c089c901e48429d1b01720bf3dd25e05ac56c41d0ab470c10',
+      binaryChecksum: '56f25cb6881e5c2b1aac0d8e87630517d1af8effdc9319d35f872add048df1ca',
       binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
-      revision: 1274550, // 1274542 is not available
+      revision: 1300317, // 1300313 is not available for Mac_x64
       location: 'common',
       archivePath: 'Mac',
       isPreInstalled: false,
@@ -56,44 +56,44 @@ export class ChromiumArchivePaths {
       platform: 'darwin',
       architecture: 'arm64',
       archiveFilename: 'chrome-mac.zip',
-      archiveChecksum: '55d8cfe56d4461645a663de263ae670f78cc69b69aee16a62c47f361fa9a62f2',
-      binaryChecksum: 'e5d4ccdbf3b66532c7c0973be2d5bbd3189079646ced55fe4db61d8e7e7bfc7e',
+      archiveChecksum: 'bea49fd3ccd6aaccd7cdc4df38306f002a2934aaa2c044f3b5a3272b31ec77ca',
+      binaryChecksum: '4c55d9e47deb1179c377c9785afdcdb5f3d3f351bff62b414d43e32ff195bd55',
       binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
-      revision: 1274557, // 1274542 is not available for Mac_Arm
+      revision: 1300314, // 1300313 is not available for Mac_Arm
       location: 'common',
       archivePath: 'Mac_Arm',
       isPreInstalled: false,
     },
     {
       platform: 'linux',
       architecture: 'x64',
-      archiveFilename: 'chromium-46cf136-locales-linux_x64.zip',
-      archiveChecksum: '8ea5f2d72352230f7927725a6ffd6d5fb462a0c8ad76e320003748b62df6d221',
-      binaryChecksum: 'e7f8109ef7535dab500166b335524dfa4e92324fa31a2a61f510a5fa5afc2eee',
+      archiveFilename: 'chromium-5b5d829-locales-linux_x64.zip',
+      archiveChecksum: '799e8fd5f47ea70b8a3972d39b2617c9cbebc7fc433a89251dae312a7c77534b',
+      binaryChecksum: '216b8f7ff9b41e985397342c2df54e4f8e07a01a3b8a929f39b9a10931d26ff5',
       binaryRelativePath: 'headless_shell-linux_x64/headless_shell',
-      revision: 1274542,
+      revision: 1300313,
       location: 'custom',
       isPreInstalled: true,
     },
     {
       platform: 'linux',
       architecture: 'arm64',
-      archiveFilename: 'chromium-46cf136-locales-linux_arm64.zip',
-      archiveChecksum: '7d01fe8a78a019cf714c913d37353f85d54c4c7d4fde91d6c96605d259a66414',
-      binaryChecksum: 'd1a8b8708dc5ced8a9c526a0d823a4074325573f9c06fabe14e18fd3a36691c9',
+      archiveFilename: 'chromium-5b5d829-locales-linux_arm64.zip',
+      archiveChecksum: '961e20c45c61f8e948efdc4128bb17c23217bbcb28537f270ccf5bf0826981e7',
+      binaryChecksum: 'fc4027fb6b1c96bef9374d5d9f791097fae2ec2ddc4e0134167075bd52d1458f',
       binaryRelativePath: 'headless_shell-linux_arm64/headless_shell',
-      revision: 1274542,
+      revision: 1300313,
       location: 'custom',
       isPreInstalled: true,
     },
     {
       platform: 'win32',
       architecture: 'x64',
       archiveFilename: 'chrome-win.zip',
-      archiveChecksum: 'd5e9691fb9d378ae13c8956be0d9eb45674d033e8b38125ace2f2fdd458e5ca0',
-      binaryChecksum: '4d8f95e4f218fc3010ab2f0d8f8674f16d554622218e73f9a7c8a22dbba2e078',
+      archiveChecksum: '27a2ed1473cefc6f48ff5665faa1fbcc69ef5be47ee21777a60e87c8379fdd93',
+      binaryChecksum: 'd603401a5e6f8bd734b329876e4221a4d24a1999f14df6e32eeb5e6a72520d96',
       binaryRelativePath: path.join('chrome-win', 'chrome.exe'),
-      revision: 1274557,
+      revision: 1300320, // 1300313 is not available for win32
       location: 'common',
       archivePath: 'Win',
       isPreInstalled: true,