fix(metrics): get more accurate queue lag metric

spinnaker · Mar 1, 2018 · 41f8000 · 41f8000
1 parent ab86cd4
commit 41f8000
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,4 @@ junitVersion=1.0.2
 jupiterVersion=5.0.2
 junitLegacyVersion=4.12.0
 spekVersion=1.1.5
-keikoVersion=2.4.2
+keikoVersion=2.4.3
diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/metrics/AtlasQueueMonitor.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/metrics/AtlasQueueMonitor.kt
@@ -50,7 +50,7 @@ class AtlasQueueMonitor
   fun onQueueEvent(event: QueueEvent) {
     when (event) {
       is QueuePolled -> _lastQueuePoll.set(clock.instant())
-      is MessageProcessing -> _messageLags.add(Duration.between(event.scheduledTime, clock.instant()))
+      is MessageProcessing -> _messageLags.add(event.lag)
       is RetryPolled -> _lastRetryPoll.set(clock.instant())
       is MessagePushed -> event.counter.increment()
       is MessageAcknowledged -> event.counter.increment()

diff --git a/orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/metrics/AtlasQueueMonitorTest.kt b/orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/metrics/AtlasQueueMonitorTest.kt
@@ -105,7 +105,7 @@ object AtlasQueueMonitorTest : SubjectSpek<AtlasQueueMonitor>({
         Duration.ofSeconds(7)
       )
       val events = lag.mapIndexed { i, lag ->
-        MessageProcessing(StartExecution(PIPELINE, "$i", "covfefe"), clock.instant().minus(lag))
+        MessageProcessing(StartExecution(PIPELINE, "$i", "covfefe"), lag)
       }
 
       on("receiving a ${events.first().javaClass.simpleName} event") {