fix(dummy-judge): Propagate tags to canary analysis result. (#250)

spinnaker · Mar 15, 2018 · be8072e · be8072e
1 parent 70ec572
commit be8072e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/config/KayentaConfiguration.java b/kayenta-core/src/main/java/com/netflix/kayenta/config/KayentaConfiguration.java
@@ -32,12 +32,12 @@
 @ComponentScan({
   "com.netflix.kayenta.canary",
   "com.netflix.kayenta.config",
+  "com.netflix.kayenta.events",
+  "com.netflix.kayenta.external",
   "com.netflix.kayenta.index.config",
   "com.netflix.kayenta.metrics",
   "com.netflix.kayenta.persistence.config",
-  "com.netflix.kayenta.retrofit.config",
-  "com.netflix.kayenta.events",
-  "com.netflix.kayenta.external"
+  "com.netflix.kayenta.retrofit.config"
 })
 public class KayentaConfiguration {
 

diff --git a/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/RandomDummyJudge.scala b/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/RandomDummyJudge.scala
@@ -71,6 +71,7 @@ class RandomDummyJudge extends CanaryJudge {
       CanaryAnalysisResult.builder()
         .name(metricPair.getName)
         .id(metricPair.getId)
+        .tags(metricPair.getTags)
         .classification(classification)
         .groups(metricConfig.getGroups)
         .experimentMetadata(Map("stats" -> DescriptiveStatistics.toMap(experimentStats).asJava.asInstanceOf[Object]).asJava)

diff --git a/...etheus/src/main/java/com/netflix/kayenta/prometheus/metrics/PrometheusMetricsService.java b/...etheus/src/main/java/com/netflix/kayenta/prometheus/metrics/PrometheusMetricsService.java
@@ -104,10 +104,12 @@ private StringBuilder addScopeFilter(StringBuilder queryBuilder,
         addGCEFilters(scopeLabel, scope, projectId, region, filters);
       } else if ("aws_ec2_instance".equals(resourceType)) {
         addEC2Filters("asg_groupName", scope, region, filters);
-      } else {
+      } else if (!StringUtils.isEmpty(resourceType)) {
         throw new IllegalArgumentException("There is no explicit support for resourceType '" + resourceType + "'. " +
                                            "You may build whatever query makes sense for your environment via label " +
                                            "bindings and custom filter templates.");
+      } else {
+        throw new IllegalArgumentException("Either a resource type or a custom filter is required.");
       }
     } else {
       List<String> customFilterTokens = Arrays.asList(customFilter.split(","));