Do not backfill the slug (#3901)

* Do not backfill the slug #3899
sitespeedio · Jul 7, 2023 · 9e215b8 · 9e215b8
1 parent c098331
commit 9e215b8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/lib/core/resultsStorage/index.js b/lib/core/resultsStorage/index.js
@@ -31,9 +31,6 @@ export function resultsStorage(input, timestamp, options) {
     storageBasePath = resolve('sitespeed-result', ...resultsSubFolders);
   }
 
-  // backfill the slug
-  options.slug = options.slug || getDomainOrFileName(input).replace(/\./g, '_');
-
   storagePathPrefix = join(...resultsSubFolders);
 
   if (resultBaseURL) {

diff --git a/lib/plugins/grafana/send-annotation.js b/lib/plugins/grafana/send-annotation.js
@@ -56,7 +56,7 @@ export function send(
     urlAndGroup[1]
   ];
   // Avoid having the same annotations twice https://github.com/sitespeedio/sitespeed.io/issues/3277#
-  if (options.slug && options.slug !== urlAndGroup[0]) {
+  if (options.slug) {
     tags.push(options.slug);
   }
   const extraTags = toArray(options.grafana.annotationTag);

diff --git a/lib/plugins/graphite/data-generator.js b/lib/plugins/graphite/data-generator.js
@@ -56,7 +56,7 @@ function keyPathFromMessage(message, options, includeQueryParameters, alias) {
     typeParts.splice(1, 0, toSafeKey(message.group));
   }
 
-  if (options.graphite && options.graphite.addSlugToKey) {
+  if (options.graphite && options.graphite.addSlugToKey && options.slug) {
     typeParts.unshift(options.slug);
   }
 

diff --git a/lib/plugins/graphite/send-annotation.js b/lib/plugins/graphite/send-annotation.js
@@ -50,8 +50,8 @@ export function send(
     urlAndGroup[0],
     urlAndGroup[1]
   ];
-  // See https://github.com/sitespeedio/sitespeed.io/issues/3277
-  if (options.slug && options.slug !== urlAndGroup[0]) {
+
+  if (options.slug) {
     tags.push(options.slug);
   }
   const extraTags = toArray(options.graphite.annotationTag);

diff --git a/lib/plugins/influxdb/data-generator.js b/lib/plugins/influxdb/data-generator.js
@@ -253,7 +253,9 @@ export class InfluxDBDataGenerator {
         tags.group = toSafeKey(message.group, options.influxdb.groupSeparator);
       }
 
-      tags.testName = options.slug;
+      if (options.slug) {
+        tags.testName = options.slug;
+      }
 
       return tags;
     }

diff --git a/lib/plugins/influxdb/send-annotation.js b/lib/plugins/influxdb/send-annotation.js
@@ -40,8 +40,7 @@ export function send(
   ).split('.');
   let tags = [connectivity, browser, urlAndGroup[0], urlAndGroup[1]];
 
-  // See https://github.com/sitespeedio/sitespeed.io/issues/3277
-  if (options.slug && options.slug !== urlAndGroup[0]) {
+  if (options.slug) {
     tags.push(options.slug);
   }
 

diff --git a/test/influxdbTests.js b/test/influxdbTests.js
@@ -355,5 +355,5 @@ test(`Test influxdb dataGenerator`, t => {
   const seriesName = data[0].seriesName;
   const numberOfTags = Object.keys(data[0].tags).length;
   t.is(seriesName, 'score');
-  t.is(numberOfTags, 7);
+  t.is(numberOfTags, 6);
 });