sitespeed.io 24.0.0 → 24.1.0

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

@@ -9,7 +9,7 @@ jobs:
     steps:
       -
           name: Checkout
-          uses: actions/checkout@v2
+          uses: actions/checkout@v3
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

package/.github/workflows/crux-test.yml

@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: '16.x'
     - name: Install sitespeed.io

package/.github/workflows/docker-scan.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       
       - name: Build an image from Dockerfile
         run: |

package/.github/workflows/docker.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build Docker containers
       run: |
         docker buildx install

package/.github/workflows/linux.yml

@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: '16.x'
     - name: Install sitespeed.io

package/.github/workflows/safari.yml

@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: '16.x'
     - name: Install dependencies 

package/.github/workflows/sitespeed-io-action-example.yml

@@ -9,7 +9,7 @@ jobs:
     name: running sitespeed.io
     steps:
       - name: code checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       # Here we build our own container to make sure we test against our latest code
       # but YOU can just used the latest version by specifying 
       # sitespeedio/sitespeed.io:VERSION

package/.github/workflows/unittests.yml

@@ -13,9 +13,9 @@ jobs:
       matrix:
         node-version: [14.x, 16.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install dependencies and Chrome

package/.github/workflows/windows.yml

@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: '16.x'
     - name: Install sitespeed.io

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
 
+## 24.1.0 - 2022-04-22
+### Added
+* Update Grafana auth settings to allow api token or basic auth, thank you [Vladimir Stepanov](https://github.com/vs-odessa) for PR [#3627](https://github.com/sitespeedio/sitespeed.io/pull/3627).
+* Add TTFB to the metrics page [#3630](https://github.com/sitespeedio/sitespeed.io/pull/3630).
+* Use latest Coach core with updated PageXray and Third party web [#3629](https://github.com/sitespeedio/sitespeed.io/pull/3629).
+* Make it possible to disable annotations for Graphite. Set `--graphite.sendAnnotation false` to disable sending annotations [#3625](https://github.com/sitespeedio/sitespeed.io/pull/3625).
+* Show which run that is used in the metrics tab [#3631](https://github.com/sitespeedio/sitespeed.io/pull/3631).
+* Updated to [Browsertime 16.1.0](https://github.com/sitespeedio/browsertime/blob/main/CHANGELOG.md#1610---2022-04-20).
+### Updated
+* Update dependencies: google-cloud/storage, aws-sdk, dayjs, yargs [#3635](https://github.com/sitespeedio/sitespeed.io/pull/3635).
 
 ## 24.0.0 - 2022-04-06
 

package/lib/plugins/grafana/cli.js

@@ -10,7 +10,7 @@ module.exports = {
   },
   auth: {
     describe:
-      'The Grafana auth/bearer value used when sending annotations to Grafana. See http://docs.grafana.org/http_api/auth/#authentication-api',
+      'The Grafana auth/bearer value used when sending annotations to Grafana. If you do not set Bearer/Auth, Bearer is automatically set. See http://docs.grafana.org/http_api/auth/#authentication-api',
     group: 'Grafana'
   },
   annotationTitle: {

package/lib/plugins/grafana/send-annotation.js

@@ -98,7 +98,14 @@ module.exports = {
     // If Grafana is behind auth, use it!
     if (options.grafana.auth) {
       log.debug('Using auth for Grafana');
-      postOptions.headers.Authorization = 'Bearer ' + options.grafana.auth;
+      if (
+        options.grafana.auth.startsWith('Bearer') ||
+        options.grafana.auth.startsWith('Basic')
+      ) {
+        postOptions.headers.Authorization = options.grafana.auth;
+      } else {
+        postOptions.headers.Authorization = 'Bearer ' + options.grafana.auth;
+      }
     }
     log.verbose('Send annotation to Grafana: %j', postData);
     return new Promise((resolve, reject) => {

package/lib/plugins/graphite/cli.js

@@ -59,6 +59,13 @@ module.exports = {
       'Include screenshot (from Browsertime/WebPageTest) in the annotation. You need to specify a --resultBaseURL for this to work.',
     group: 'Graphite'
   },
+  sendAnnotation: {
+    default: true,
+    type: 'boolean',
+    describe:
+      'Send annotations when a run is finished. You need to specify a --resultBaseURL for this to work. However if you for example use a Prometheus exporter, you may want to make sure annotations are not sent, then set it to false.',
+    group: 'Graphite'
+  },
   annotationRetentionMinutes: {
     type: 'number',
     describe:

package/lib/plugins/graphite/index.js

@@ -60,7 +60,7 @@ module.exports = {
     this.messageTypesToFireAnnotations = [];
     this.receivedTypesThatFireAnnotations = {};
     this.make = context.messageMaker('graphite').make;
-    this.sendAnnotation = true;
+    this.sendAnnotation = opts.sendAnnotation || true;
     this.alias = {};
     this.wptExtras = {};
     this.usingBrowsertime = false;

package/lib/plugins/html/templates/url/metrics/index.pug

@@ -38,6 +38,9 @@ if browsertime
       a(href='#server-timings') Server timings
       |  | 
 
+  p
+    small #{ medianRun ? 'Data from run ' + medianRun.runIndex : ''}
+
   - baseHelpURL = rootPath + 'help.html#';
 
   - const defaultVisualMetrics = ['SpeedIndex','FirstVisualChange','LastVisualChange','VisualProgress', 'PerceptualSpeedIndexProgress', 'ContentfulSpeedIndexProgress', 'videoRecordingStart', 'PerceptualSpeedIndex', 'ContentfulSpeedIndex', 'LastMeaningfulPaint', 'LargestImage', 'Heading' ,'VisualReadiness','VisualComplete85', 'VisualComplete95','VisualComplete99'];
@@ -156,6 +159,10 @@ if browsertime
       table
         tr
           th(colspan='2') Extra timings
+        tr
+          td
+            a(href=baseHelpURL + 'ttfb') TTFB
+          td.number #{h.time.ms(timings.ttfb.toFixed(0))}
         if (timings.paintTiming && Object.keys(timings.paintTiming).length > 0)
           - const paintTimingHelper = { "first-contentful-paint": {"name": 'First Contentful Paint (FCP)', "friendly": "first-contentful-paint"},  "first-paint": {"name": 'First Paint', "friendly": "firstPaint" }};
           each value, name in timings.paintTiming
@@ -289,7 +296,10 @@ if browsertime
         td  #{element.name}
          if (element.filename)
           | (#{element.filename})
-        td #{visualMetrics[element.name] ? h.time.ms(visualMetrics[element.name].toFixed(0)): ''}
+        if element && visualMetrics && visualMetrics[element.name]
+          td #{visualMetrics[element.name] ? h.time.ms(visualMetrics[element.name].toFixed(0)): ''}
+        else 
+          td
         td  #{element.x}
         td  #{element.y}
         td  #{element.width}