fix(metric): Correctly indicate execution type in execution metrics (s…

…pinnaker#3844)
Kaixiang-AWS · Aug 6, 2020 · 837207a · 837207a
1 parent 69b33e1
commit 837207a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/listeners/MetricsExecutionListener.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/listeners/MetricsExecutionListener.java
@@ -40,7 +40,7 @@ public void beforeExecution(Persister persister, PipelineExecution execution) {
     Id id =
         registry
             .createId("executions.started")
-            .withTag("executionType", execution.getClass().getSimpleName().toLowerCase())
+            .withTag("executionType", execution.getType().toString())
             .withTag("application", execution.getApplication().toLowerCase());
 
     registry.counter(id).increment();
@@ -68,7 +68,7 @@ public void afterExecution(
     Id id =
         registry
             .createId("executions.totalTime")
-            .withTag("executionType", "orchestration")
+            .withTag("executionType", execution.getType().toString())
             .withTag("successful", Boolean.valueOf(wasSuccessful).toString())
             .withTag("application", execution.getApplication().toLowerCase());
 

diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/config/EnhancedMonitoringConfiguration.java b/orca-web/src/main/groovy/com/netflix/spinnaker/config/EnhancedMonitoringConfiguration.java
@@ -19,6 +19,7 @@
 import com.netflix.spectator.api.Id;
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus;
+import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionType;
 import com.netflix.spinnaker.orca.api.pipeline.models.PipelineExecution;
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository;
 import java.util.HashMap;
@@ -58,7 +59,10 @@ public EnhancedMonitoringConfiguration(
     Id runningOrchestrationsId =
         registry
             .createId("executions.running")
-            .withTag("executionType", "Orchestration"); // similar to what MetricsTagHelper is doing
+            .withTag(
+                "executionType",
+                ExecutionType.ORCHESTRATION
+                    .toString()); // similar to what MetricsTagHelper is doing
 
     for (String application : configuration.getApplications()) {
       Id applicationSpecificId = runningOrchestrationsId.withTag("application", application);