remove canaryScope and require metrics to have scope names (#175)

spinnaker · Dec 21, 2017 · 563566a · 563566a
1 parent 3b4882b
commit 563566a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryExecutionRequest.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryExecutionRequest.java
@@ -25,25 +25,14 @@
 
 @Data
 public class CanaryExecutionRequest {
-  protected Map<String, CanaryScopePair> scopes;
-
-  @NotNull
-  protected CanaryScope experimentScope;
-
   @NotNull
-  protected CanaryScope controlScope;
+  protected Map<String, CanaryScopePair> scopes;
 
   protected CanaryClassifierThresholdsConfig thresholds;
 
   public Duration calculateDuration() {
     Set<Duration> durationsFound = new HashSet<>();
 
-    if (experimentScope != null) {
-      durationsFound.add(experimentScope.calculateDuration());
-    }
-    if (controlScope != null) {
-      durationsFound.add(controlScope.calculateDuration());
-    }
     if (scopes != null) {
       scopes.values().forEach(scope -> {
         durationsFound.add(scope.controlScope.calculateDuration());

diff --git a/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java b/kayenta-web/src/main/java/com/netflix/kayenta/controllers/CanaryController.java
@@ -316,10 +316,6 @@ private CanaryScopeFactory getScopeFactoryForServiceType(String serviceType) {
   }
 
   private CanaryScope getScopeForNamedScope(CanaryExecutionRequest executionRequest, String scopeName, boolean isCanary) {
-    if (scopeName == null) {
-      return isCanary ? executionRequest.getExperimentScope() : executionRequest.getControlScope();
-    }
-
     CanaryScopePair canaryScopePair = executionRequest.getScopes().get(scopeName);
     CanaryScope canaryScope = isCanary ? canaryScopePair.getExperimentScope() : canaryScopePair.getControlScope();
     if (canaryScope == null) {
@@ -338,6 +334,9 @@ private List<Map<String, Object>> generateFetchScopes(CanaryConfig canaryConfig,
         CanaryMetricConfig metric = canaryConfig.getMetrics().get(index);
         String serviceType = metric.getQuery().getServiceType();
         CanaryScopeFactory canaryScopeFactory = getScopeFactoryForServiceType(serviceType);
+        if (metric.getScopeName() == null) {
+          throw new IllegalArgumentException("Canary scope for metric named '" + metric.getName() + "' is null.");
+        }
         CanaryScope inspecificScope = getScopeForNamedScope(executionRequest, metric.getScopeName(), isCanary);
         CanaryScope scopeModel = canaryScopeFactory.buildCanaryScope(inspecificScope);
         String stagePrefix = (isCanary ? REFID_FETCH_EXPERIMENT_PREFIX : REFID_FETCH_CONTROL_PREFIX);