return the metricSetPairList ID in the canary response

spinnaker · Nov 14, 2017 · 1edc513 · 1edc513
1 parent bf28136
commit 1edc513
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryExecutionStatusResponse.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryExecutionStatusResponse.java
@@ -36,4 +36,6 @@ public class CanaryExecutionStatusResponse {
   protected String status;
 
   protected CanaryResult result;
+
+  protected String metricSetPairListId;
 }
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
@@ -270,6 +270,12 @@ public CanaryExecutionStatusResponse getCanaryResults(@RequestParam(required = f
       .orElseThrow(() -> new IllegalArgumentException("Unable to find stage '" + REFID_JUDGE + "' in pipeline ID '" + canaryExecutionId + "'"));
     Map<String, Object> contextContext = contextStage.getContext();
 
+    Stage mixerStage = pipeline.getStages().stream()
+      .filter(stage -> stage.getRefId().equals(REFID_MIX_METRICS))
+      .findFirst()
+      .orElseThrow(() -> new IllegalArgumentException("Unable to find stage '" + REFID_JUDGE + "' in pipeline ID '" + canaryExecutionId + "'"));
+    Map<String, Object> mixerContext = mixerStage.getContext();
+
     if (!contextContext.containsKey("canaryConfigId")) {
       throw new IllegalArgumentException("The judge stage does not contain a canaryConfigId reference");
     }
@@ -289,6 +295,7 @@ public CanaryExecutionStatusResponse getCanaryResults(@RequestParam(required = f
     canaryExecutionStatusResponseBuilder.stageStatus(stageStatus);
     canaryExecutionStatusResponseBuilder.complete(isComplete);
     canaryExecutionStatusResponseBuilder.status(pipelineStatus);
+    canaryExecutionStatusResponseBuilder.metricSetPairListId((String)mixerContext.get("metricSetPairListId"));
 
     if (isComplete && pipelineStatus.equals("succeeded")) {
       if (judgeContext.containsKey("canaryJudgeResultId")) {