fix(stats): Remove synthetic stages from Stages list

spinnaker · Sep 12, 2019 · 500d45b · 500d45b
1 parent 239e691
commit 500d45b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/...-telemetry/src/main/java/com/netflix/spinnaker/echo/telemetry/TelemetryEventListener.java b/...-telemetry/src/main/java/com/netflix/spinnaker/echo/telemetry/TelemetryEventListener.java
@@ -33,6 +33,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -109,8 +110,14 @@ public void processEvent(Event event) {
           Execution.Trigger.Type.valueOf(
               trigger.getOrDefault("type", "UNKNOWN").toString().toUpperCase());
 
-      List<Map> stages = (List<Map>) execution.getOrDefault("stages", new ArrayList<>());
-      List<Stage> protoStages = stages.stream().map(this::toStage).collect(Collectors.toList());
+      List<Map<String, Object>> stages =
+          (List<Map<String, Object>>) execution.getOrDefault("stages", new ArrayList<>());
+      List<Stage> protoStages =
+          stages.stream()
+              .map(this::toStage)
+              .filter(Optional::isPresent)
+              .map(Optional::get)
+              .collect(Collectors.toList());
 
       Execution.Builder executionBuilder =
           Execution.newBuilder()
@@ -147,7 +154,15 @@ public void processEvent(Event event) {
     }
   }
 
-  private Stage toStage(Map stage) {
+  @SuppressWarnings("unchecked")
+  private Optional<Stage> toStage(Map<String, Object> stage) {
+    // Only interested in user-configured stages.
+    if (stage.get("syntheticStageOwner") != null
+        && !stage.get("syntheticStageOwner").toString().isEmpty()) {
+      log.debug("Discarding synthetic stage");
+      return Optional.empty();
+    }
+
     Status status =
         Status.valueOf(stage.getOrDefault("status", "UNKNOWN").toString().toUpperCase());
     Stage.Builder stageBuilder =
@@ -164,7 +179,7 @@ private Stage toStage(Map stage) {
       // TODO(ttomsu): Figure out how to detect Kubernetes "flavor" - i.e. GKE, EKS, vanilla, etc.
     }
 
-    return stageBuilder.build();
+    return Optional.of(stageBuilder.build());
   }
 
   private String hash(String clearText) {

diff --git a/...ry/src/test/groovy/com/netflix/spinnaker/echo/telemetry/TelemetryEventListenerSpec.groovy b/...ry/src/test/groovy/com/netflix/spinnaker/echo/telemetry/TelemetryEventListenerSpec.groovy
@@ -106,6 +106,15 @@ class TelemetryEventListenerSpec extends Specification {
           stages : [
             [
               type  : "deploy",
+              status: "SUCCEEDED",
+              syntheticStageOwner: null,
+              context: [
+                "cloudProvider": "nine"
+              ]
+            ],
+            [
+              type: "removed",
+              syntheticStageOwner: "somethingNonNull",
               status: "SUCCEEDED"
             ],
             [
@@ -151,6 +160,7 @@ class TelemetryEventListenerSpec extends Specification {
       Stage stage1 = stages.get(0)
       assert stage1.type == "deploy"
       assert stage1.status == Status.SUCCEEDED
+      assert stage1.cloudProvider.id == "nine"
 
       Stage stage2 = stages.get(1)
       assert stage2.type == "wait"