chore(orca): Populate stage outputs instead of context. (spinnaker#181)

xiahuai · Dec 21, 2017 · a046e29 · a046e29
1 parent eb2ac07
commit a046e29
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 58 deletions.
diff --git a/json-formats.md b/json-formats.md
@@ -40,18 +40,6 @@ Atlas and Stackdriver are used.
       "groups": ["requests"]
     }
   ],
-  "services": {
-    "atlas": {
-      "type": "atlas",
-      "name": "atlas",
-      "region": "us-east-1",
-      "environment": "prod",
-      "backend": {
-        "deployment": "main",
-        "dataset": "regional"
-      }
-    }
-  },
   "classifier": {
     "groupWeights": {
       "requests": 50.0,
@@ -84,12 +72,6 @@ Atlas and Stackdriver are used.
       "groups": ["system"]
     }
   ],
-  "services": {
-    "stackdriver": {
-      "type": "stackdriver",
-      "name": "stackdriver"
-    }
-  },
   "classifier": {
     "groupWeights": {
       "system": 100.0

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/orca/CanaryJudgeTask.java
@@ -40,6 +40,7 @@
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -142,6 +143,6 @@ public TaskResult execute(@Nonnull Stage stage) {
         .put("result", result)
         .build();
 
-    return new TaskResult(ExecutionStatus.SUCCEEDED, outputs);
+    return new TaskResult(ExecutionStatus.SUCCEEDED, Collections.emptyMap(), outputs);
   }
 }
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java b/kayenta-core/src/main/java/com/netflix/kayenta/metrics/orca/MetricSetMixerServiceTask.java
@@ -108,7 +108,7 @@ public TaskResult execute(@Nonnull Stage stage) {
 
     Map outputs = Collections.singletonMap("metricSetPairListId", aggregatedMetricSetPairListId);
 
-    return new TaskResult(ExecutionStatus.SUCCEEDED, outputs);
+    return new TaskResult(ExecutionStatus.SUCCEEDED, Collections.emptyMap(), outputs);
   }
 
   private List<String> getMetricSetListIds(Execution execution, String stagePrefix) {

diff --git a/kayenta-judge/src/test/resources/test-config.json b/kayenta-judge/src/test/resources/test-config.json
@@ -3,7 +3,6 @@
   "description": "Example Automated Canary Analysis (ACA) Configuration",
   "metrics": [
     {
-      "service": "atlas",
       "name": "cpu",
       "query": {
         "type": "atlas",
@@ -15,7 +14,6 @@
       "groups": ["system", "example"]
     },
     {
-      "service": "atlas",
       "name": "requests",
       "query": {
         "type": "atlas",
@@ -27,7 +25,6 @@
       "groups": ["requests", "example"]
     },
     {
-      "service": "atlas",
       "name": "foo",
       "query": {
         "type": "atlas",
@@ -39,18 +36,6 @@
       "groups": ["bar"]
     }
   ],
-  "services": {
-    "atlas": {
-      "type": "atlas",
-      "name": "atlas",
-      "region": "us-east-1",
-      "environment": "prod",
-      "backend": {
-        "deployment": "main",
-        "dataset": "regional"
-      }
-    }
-  },
   "classifier": {
     "groupWeights": {
       "requests": 50.0,

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
@@ -240,7 +240,7 @@ public CanaryExecutionStatusResponse getCanaryResults(@RequestParam(required = f
       .filter(stage -> stage.getRefId().equals(REFID_JUDGE))
       .findFirst()
       .orElseThrow(() -> new IllegalArgumentException("Unable to find stage '" + REFID_JUDGE + "' in pipeline ID '" + canaryExecutionId + "'"));
-    Map<String, Object> judgeContext = judgeStage.getContext();
+    Map<String, Object> judgeOutputs = judgeStage.getOutputs();
 
     Stage contextStage = pipeline.getStages().stream()
       .filter(stage -> stage.getRefId().equals(REFID_SET_CONTEXT))
@@ -285,8 +285,8 @@ public CanaryExecutionStatusResponse getCanaryResults(@RequestParam(required = f
     }
 
     if (isComplete && pipelineStatus.equals("succeeded")) {
-      if (judgeContext.containsKey("canaryJudgeResultId")) {
-        String canaryJudgeResultId = (String)judgeContext.get("canaryJudgeResultId");
+      if (judgeOutputs.containsKey("canaryJudgeResultId")) {
+        String canaryJudgeResultId = (String)judgeOutputs.get("canaryJudgeResultId");
         canaryExecutionStatusResponseBuilder.result(storageService.loadObject(resolvedStorageAccountName, ObjectType.CANARY_RESULT, canaryJudgeResultId));
       }
     }

diff --git a/scratch/atlas_canary_config.json b/scratch/atlas_canary_config.json
@@ -36,14 +36,6 @@
       }
     }
   ],
-  "services": {
-    "atlas": {
-      "name": "atlas",
-      "type": "atlas",
-      "region": "us-east-1",
-      "environment": "prod"
-    }
-  },
   "classifier": {
     "groupWeights": {
       "requests": 50.0,

diff --git a/scratch/prometheus_canary_config.json b/scratch/prometheus_canary_config.json
@@ -24,12 +24,6 @@
       ]
     }
   ],
-  "services": {
-    "prometheus": {
-      "type": "prometheus",
-      "name": "prometheus"
-    }
-  },
   "classifier": {
     "groupWeights": {
       "system": 100.0

diff --git a/scratch/stackdriver_canary_config.json b/scratch/stackdriver_canary_config.json
@@ -24,12 +24,6 @@
       ]
     }
   ],
-  "services": {
-    "stackdriver": {
-      "type": "stackdriver",
-      "name": "stackdriver"
-    }
-  },
   "classifier": {
     "groupWeights": {
       "system": 100.0