Bye bye wpt (#4085)

* Bye WebPageTest

* remove more

Author: soulgalore

.github/workflows/building-docker-release.yml

@@ -48,17 +48,6 @@ jobs:
           push: true
           provenance: false
           tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-plus1
-      -
-        name: Build and push sitespeed.io+wpt
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-webpagetest
-          build-args: version=${{steps.tag.outputs.tag}} 
-          push: true
-          provenance: false
-          tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-webpagetest
       -
         name: Build and push sitespeed.io-slim
         uses: docker/build-push-action@v5

docker/Dockerfile-webpagetest

@@ -26,11 +26,6 @@ Michael Mrowetz has updated [PerfCascade](https://github.com/micmro/PerfCascade)
 
 The video now uses video.js making it easier to slow the video down.
 
-## Slack and WebPageTest
-If you slack after a run we now default sends firstVisualChange, lastVisualChange and fullyLoaded metrics. You can also choose which metric that will decide if your slack will be a warning or error message (and set the limit).
-
-Finally we support custom metrics for WebPageTest. You will see them on the HTML pages and the metrics will automatically be sent to Graphite. Thank you [jpvincent](https://github.com/jpvincent) for the initial PR!
-
 ## Important bug fixes
 * Running multiple URLs in WebPageTest failed because of a "feature" in the WebPageTest NodeJS API where options in s are change to ms.
 

docs/_posts/2016-12-14-friendly-url-names.md

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path';
 import { platform } from 'node:os';
 import { createRequire } from 'node:module';
-import { readFileSync, statSync, existsSync } from 'node:fs';
+import { readFileSync, statSync } from 'node:fs';
 
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
@@ -1213,7 +1213,7 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean',
       describe:
-        'Include screenshot (from Browsertime/WebPageTest) in the annotation. You need to specify a --resultBaseURL for this to work.',
+        'Include screenshot (from Browsertime) in the annotation. You need to specify a --resultBaseURL for this to work.',
       group: 'Grafana'
     })
 
@@ -1280,7 +1280,7 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean',
       describe:
-        'Include screenshot (from Browsertime/WebPageTest) in the annotation. You need to specify a --resultBaseURL for this to work.',
+        'Include screenshot (from Browsertime) in the annotation. You need to specify a --resultBaseURL for this to work.',
       group: 'Graphite'
     })
     .option('graphite.sendAnnotation', {
@@ -2076,28 +2076,6 @@ export async function parseCommandLine() {
         return plugins;
       }
     })
-    .coerce('webpagetest', function (argument) {
-      if (argument) {
-        // for backwards compatible reasons we check if the passed parameters is a path to a script, if so just us it (PR #1445)
-        if (argument.script && existsSync(argument.script)) {
-          argument.script = readFileSync(resolve(argument.script), 'utf8');
-          /* eslint no-console: off */
-          console.log(
-            '[WARNING] Since sitespeed.io 4.4 you should pass the path to the script file through the --webpagetest.file flag (https://github.com/sitespeedio/sitespeed.io/pull/1445).'
-          );
-          return argument;
-        }
-
-        if (argument.file) {
-          argument.script = readFileSync(resolve(argument.file), 'utf8');
-        } else if (argument.script) {
-          // because the escaped characters are passed re-escaped from the console
-          argument.script = argument.script.split('\\t').join('\t');
-          argument.script = argument.script.split('\\n').join('\n');
-        }
-        return argument;
-      }
-    })
     //     .describe('browser', 'Specify browser')
     .wrap(yargsInstance.terminalWidth())
     //  .check(validateInput)
@@ -2153,12 +2131,6 @@ export async function parseCommandLine() {
     explicitOptions = merge(explicitOptions, config);
   }
 
-  if (argv.webpagetest && argv.webpagetest.custom) {
-    argv.webpagetest.custom = readFileSync(resolve(argv.webpagetest.custom), {
-      encoding: 'utf8'
-    });
-  }
-
   if (argv.summaryDetail) argv.summary = true;
 
   if (

lib/cli/cli.js

@@ -17,8 +17,6 @@ function shouldIgnoreMessage(message) {
     'browsertime.asyncscripts',
     'compare.setup',
     'sitespeedio.setup',
-    'webpagetest.har',
-    'webpagetest.setup',
     'aggregateassets.summary',
     'slowestassets.summary',
     'largestassets.summary',

lib/plugins/analysisstorer/index.js

@@ -22,7 +22,6 @@ export default class BudgetPlugin extends SitespeedioPlugin {
     this.make = context.messageMaker('budget').make;
     this.budgetTypes = [
       'browsertime.pageSummary',
-      'webpagetest.pageSummary',
       'pagexray.pageSummary',
       'coach.pageSummary',
       'axe.pageSummary'

lib/plugins/budget/index.js

@@ -27,14 +27,6 @@ export default class DomainsPlugin extends SitespeedioPlugin {
         break;
       }
 
-      case 'webpagetest.har': {
-        // Only collect WebPageTest data if we don't run Browsertime
-        if (this.browsertime === false) {
-          this.domainsAggregator.addToAggregate(message.data, message.url);
-        }
-        break;
-      }
-
       case 'sitespeedio.summarize': {
         const summary = this.domainsAggregator.summarize();
         if (!isEmpty(summary)) {

lib/plugins/domains/index.js

@@ -3,7 +3,6 @@ import dayjs from 'dayjs';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
 import { send } from './send-annotation.js';
-import { toSafeKey } from '../../support/tsdbUtil.js';
 import { throwIfMissing } from '../../support/util.js';
 
 export default class GrafanaPlugin extends SitespeedioPlugin {
@@ -25,13 +24,6 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
   }
 
   processMessage(message, queue) {
-    if (message.type === 'webpagetest.pageSummary') {
-      this.wptExtras[message.url] = {};
-      this.wptExtras[message.url].webPageTestResultURL =
-        message.data.data.summary;
-      this.wptExtras[message.url].connectivity = message.connectivity;
-      this.wptExtras[message.url].location = toSafeKey(message.location);
-    }
     if (this.messageTypesToFireAnnotations.includes(message.type)) {
       this.receivedTypesThatFireAnnotations[message.url]
         ? this.receivedTypesThatFireAnnotations[message.url]++
@@ -46,11 +38,6 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
 
         break;
       }
-      case 'webpagetest.setup': {
-        this.messageTypesToFireAnnotations.push('webpagetest.pageSummary');
-
-        break;
-      }
       case 'sitespeedio.setup': {
         // Let other plugins know that the Grafana plugin is alive
         queue.postMessage(this.make('grafana.setup'));
@@ -77,10 +64,7 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
         break;
       }
       default: {
-        if (message.type === 'webpagetest.browser' && !this.usingBrowsertime) {
-          // We are only interested in WebPageTest browser if we run it standalone
-          this.browser = message.data.browser;
-        } else if (message.type === 'browsertime.alias') {
+        if (message.type === 'browsertime.alias') {
           this.alias[message.url] = message.data;
         } else if (
           this.receivedTypesThatFireAnnotations[message.url] ===

lib/plugins/grafana/index.js

@@ -65,19 +65,13 @@ export function send(
     tags.push(...extraTags);
   }
 
-  if (webPageTestExtraData) {
-    tags.push(webPageTestExtraData.connectivity, webPageTestExtraData.location);
-  }
-
   const tagsArray = getTagsAsArray(tags);
 
   const message = getAnnotationMessage(
     absolutePagePath,
     screenShotsEnabledInBrowsertime,
     screenshotType,
-    webPageTestExtraData
-      ? webPageTestExtraData.webPageTestResultURL
-      : undefined,
+    undefined,
     usingBrowsertime,
     options
   );

lib/plugins/grafana/send-annotation.js

@@ -27,13 +27,6 @@ function keyPathFromMessage(message, options, includeQueryParameters, alias) {
 
     typeParts.splice(1, 0, connectivity);
     typeParts.splice(1, 0, options.browser);
-  } else if (/(^webpagetest)/.test(message.type)) {
-    if (message.connectivity) {
-      typeParts.splice(2, 0, message.connectivity);
-    }
-    if (message.location) {
-      typeParts.splice(2, 0, toSafeKey(message.location));
-    }
   } else if (/(^gpsi)/.test(message.type)) {
     typeParts.splice(2, 0, options.mobile ? 'mobile' : 'desktop');
   }

lib/plugins/graphite/data-generator.js

@@ -7,7 +7,6 @@ import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
 import { send } from './send-annotation.js';
 import { GraphiteDataGenerator as DataGenerator } from './data-generator.js';
-import { toSafeKey } from '../../support/tsdbUtil.js';
 import { isStatsD } from './helpers/is-statsd.js';
 import { throwIfMissing } from '../../support/util.js';
 import { toArray } from '../../support/util.js';
@@ -67,19 +66,14 @@ export default class GraphitePlugin extends SitespeedioPlugin {
   }
 
   processMessage(message, queue) {
-    // First catch if we are running Browsertime and/or WebPageTest
+    // First catch if we are running Browsertime
     switch (message.type) {
       case 'browsertime.setup': {
         this.messageTypesToFireAnnotations.push('browsertime.pageSummary');
         this.usingBrowsertime = true;
 
         break;
       }
-      case 'webpagetest.setup': {
-        this.messageTypesToFireAnnotations.push('webpagetest.pageSummary');
-
-        break;
-      }
       case 'browsertime.config': {
         if (message.data.screenshot) {
           this.useScreenshots = message.data.screenshot;
@@ -104,12 +98,6 @@ export default class GraphitePlugin extends SitespeedioPlugin {
 
         break;
       }
-      default: {
-        if (message.type === 'webpagetest.browser' && !this.usingBrowsertime) {
-          // We are only interested in WebPageTest browser if we run it standalone
-          this.browser = message.data.browser;
-        }
-      }
     }
 
     if (message.type === 'browsertime.alias') {
@@ -129,14 +117,6 @@ export default class GraphitePlugin extends SitespeedioPlugin {
         : (this.receivedTypesThatFireAnnotations[message.url] = 1);
     }
 
-    if (message.type === 'webpagetest.pageSummary') {
-      this.wptExtras[message.url] = {};
-      this.wptExtras[message.url].webPageTestResultURL =
-        message.data.data.summary;
-      this.wptExtras[message.url].connectivity = message.connectivity;
-      this.wptExtras[message.url].location = toSafeKey(message.location);
-    }
-
     // we only sends individual groups to Graphite, not the
     // total of all groups (you can calculate that yourself)
     if (message.group === 'total') {
@@ -175,8 +155,7 @@ export default class GraphitePlugin extends SitespeedioPlugin {
             this.messageTypesToFireAnnotations.length &&
           this.resultUrls.hasBaseUrl() &&
           this.sendAnnotation &&
-          (message.type === 'browsertime.pageSummary' ||
-            message.type === 'webpagetest.pageSummary')
+          message.type === 'browsertime.pageSummary'
         ) {
           this.receivedTypesThatFireAnnotations[message.url] = 0;
           const absolutePagePath = this.resultUrls.absoluteSummaryPagePath(

lib/plugins/graphite/index.js

@@ -59,9 +59,6 @@ export function send(
   if (extraTags.length > 0) {
     tags.push(...extraTags);
   }
-  if (webPageTestExtraData) {
-    tags.push(webPageTestExtraData.connectivity, webPageTestExtraData.location);
-  }
   const theTags = options.graphite.arrayTags
     ? getTagsAsArray(tags)
     : getTagsAsString(tags);
@@ -70,9 +67,7 @@ export function send(
     absolutePagePath,
     screenShotsEnabledInBrowsertime,
     screenshotType,
-    webPageTestExtraData
-      ? webPageTestExtraData.webPageTestResultURL
-      : undefined,
+    undefined,
     usingBrowsertime,
     options
   );

lib/plugins/graphite/send-annotation.js

@@ -20,8 +20,7 @@ export default class HarstorerPlugin extends SitespeedioPlugin {
         this.alias[message.url] = message.data;
         break;
       }
-      case 'browsertime.har':
-      case 'webpagetest.har': {
+      case 'browsertime.har': {
         const json = JSON.stringify(message.data);
 
         return this.gzipHAR

lib/plugins/harstorer/index.js

@@ -42,13 +42,6 @@ export default {
       'transferSize.image',
       'thirdParty.transferSize',
       'thirdParty.requests',
-      'webpagetest.SpeedIndex',
-      'webpagetest.lastVisualChange',
-      'webpagetest.render',
-      'webpagetest.visualComplete',
-      'webpagetest.visualComplete95',
-      'webpagetest.TTFB',
-      'webpagetest.fullyLoaded',
       'axe.critical',
       'axe.serious',
       'axe.minor',

lib/plugins/html/defaultConfig.js

@@ -198,7 +198,6 @@ export class HTMLBuilder {
     let ios;
     let connectivity;
     let usingBrowsertime;
-    let usingWebPageTest;
     let cpuBenchmark;
     let windowSize;
     const urlPageRenders = [];
@@ -215,7 +214,6 @@ export class HTMLBuilder {
       pageNumber++;
       // In the future we can fix so we just pickup the setup messages
       usingBrowsertime = pageInfo.data.browsertime;
-      usingWebPageTest = pageInfo.data.webpagetest;
       // if we don't use Browsertime, we don't get the browser version
       browser = usingBrowsertime
         ? {
@@ -463,7 +461,7 @@ export class HTMLBuilder {
             android,
             ios,
             usingBrowsertime,
-            usingWebPageTest,
+            usingWebPageTest: false,
             headers: this.summary,
             version: version,
             browsertimeVersion: dependencies.browsertime,

lib/plugins/html/htmlBuilder.js

@@ -34,8 +34,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
       'pagexray.pageSummary',
       'coach.run',
       'coach.pageSummary',
-      'webpagetest.run',
-      'webpagetest.pageSummary',
       'thirdparty.run',
       'thirdparty.pageSummary',
       'crux.pageSummary'
@@ -70,7 +68,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
           break;
         }
         // we always want to add data from our HARs
-        case 'webpagetest.har':
         case 'browsertime.har': {
           dataCollector.addDataForUrl(
             message.url,
@@ -204,7 +201,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
           }
           break;
         }
-        case 'webpagetest.summary':
         case 'coach.summary':
         case 'pagexray.summary':
         case 'browsertime.summary':