Fix old slug automagic

sitespeedio · Jul 7, 2023 · a882cf0 · a882cf0
1 parent 0c74357
commit a882cf0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
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 (this.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);
   }