reafactor(eventMonitor): create method for emitting metrics for overr…

…iding (#251)
spinnaker · Apr 5, 2018 · 393f1a6 · 393f1a6
1 parent c980168
commit 393f1a6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/.../src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/BuildEventMonitor.java b/.../src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/BuildEventMonitor.java
@@ -110,8 +110,7 @@ protected Predicate<Trigger> matchTriggerFor(final TriggerEvent event, final Pip
   }
 
   @Override
-  protected void onMatchingPipeline(Pipeline pipeline) {
-    super.onMatchingPipeline(pipeline);
+  protected void emitMetricsOnMatchingPipeline(Pipeline pipeline) {
     val id = registry.createId("pipelines.triggered")
       .withTag("application", pipeline.getApplication())
       .withTag("name", pipeline.getName());

diff --git a/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/DockerEventMonitor.java b/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/DockerEventMonitor.java
@@ -140,8 +140,8 @@ private boolean isMatchingTrigger(DockerEvent dockerEvent, Trigger trigger, fina
             anyArtifactsMatchExpected(getArtifacts(dockerEvent), trigger, pipeline);
   }
 
-  protected void onMatchingPipeline(Pipeline pipeline) {
-    super.onMatchingPipeline(pipeline);
+  @Override
+  protected void emitMetricsOnMatchingPipeline(Pipeline pipeline) {
     val id = registry.createId("pipelines.triggered")
       .withTag("application", pipeline.getApplication())
       .withTag("name", pipeline.getName());

diff --git a/...rs/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/GitEventMonitor.java b/...rs/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/GitEventMonitor.java
@@ -122,8 +122,7 @@ protected Function<Trigger, Pipeline> buildTrigger(Pipeline pipeline, TriggerEve
   }
 
   @Override
-  protected void onMatchingPipeline(Pipeline pipeline) {
-    super.onMatchingPipeline(pipeline);
+  protected void emitMetricsOnMatchingPipeline(Pipeline pipeline) {
     val id = registry.createId("pipelines.triggered")
       .withTag("application", pipeline.getApplication())
       .withTag("name", pipeline.getName());

diff --git a/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitor.java b/...src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitor.java
@@ -29,9 +29,6 @@
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.stereotype.Component;
 import rx.Observable;
 import rx.functions.Action1;
 
@@ -116,11 +113,10 @@ protected Predicate<Trigger> matchTriggerFor(final TriggerEvent event, final Pip
   }
 
   @Override
-  protected void onMatchingPipeline(Pipeline pipeline) {
-    super.onMatchingPipeline(pipeline);
+  protected void emitMetricsOnMatchingPipeline(Pipeline pipeline) {
     val id = registry.createId("pipelines.triggered")
-        .withTag("application", pipeline.getApplication())
-        .withTag("name", pipeline.getName());
+      .withTag("application", pipeline.getApplication())
+      .withTag("name", pipeline.getName());
 
     if (isPubsubTrigger(pipeline.getTrigger())) {
       id.withTag("pubsubSystem", pipeline.getTrigger().getPubsubSystem());

diff --git a/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/TriggerMonitor.java b/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/TriggerMonitor.java
@@ -24,7 +24,6 @@
 import com.netflix.spinnaker.echo.model.trigger.TriggerEvent;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
 import org.springframework.stereotype.Component;
 import rx.Observable;
 import rx.functions.Action1;
@@ -42,7 +41,7 @@
  */
 @Component
 @Slf4j
-abstract class TriggerMonitor implements EchoEventListener {
+public abstract class TriggerMonitor implements EchoEventListener {
 
   protected final Action1<Pipeline> subscriber;
   protected final Registry registry;
@@ -110,8 +109,11 @@ protected Func1<Pipeline, Optional<Pipeline>> withMatchingTrigger(final TriggerE
 
   protected abstract boolean isValidTrigger(final Trigger trigger);
 
+  protected abstract void emitMetricsOnMatchingPipeline(Pipeline pipeline);
+
   protected void onMatchingPipeline(Pipeline pipeline) {
     log.info("Found matching pipeline {}:{}", pipeline.getApplication(), pipeline.getName());
+    emitMetricsOnMatchingPipeline(pipeline);
   }
 
   protected void onEventProcessed(final TriggerEvent event) {

diff --git a/...rc/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/WebhookEventMonitor.java b/...rc/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/WebhookEventMonitor.java
@@ -125,8 +125,8 @@ protected Predicate<Trigger> matchTriggerFor(final TriggerEvent event, final Pip
         ArtifactMatcher.anyArtifactsMatchExpected(messageArtifacts, trigger, pipeline);
   }
 
-  protected void onMatchingPipeline(Pipeline pipeline) {
-    super.onMatchingPipeline(pipeline);
+  @Override
+  protected void emitMetricsOnMatchingPipeline(Pipeline pipeline) {
     val id = registry.createId("pipelines.triggered")
       .withTag("application", pipeline.getApplication())
       .withTag("name", pipeline.getName());