fix(metrics): num resources visited, gradle config (#155)

spinnaker · Nov 14, 2018 · 5e26d77 · 5e26d77
1 parent 6494e86
commit 5e26d77
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -81,6 +81,16 @@ subprojects {
   test {
     testLogging {
       exceptionFormat = "full"
+      events 'PASSED', 'FAILED', 'SKIPPED'
+    }
+    afterSuite { desc, result ->
+      if (!desc.parent) {
+        println "\nTest result: ${result.resultType}"
+        println "Test summary: ${result.testCount} tests, " +
+          "${result.successfulTestCount} succeeded, " +
+          "${result.failedTestCount} failed, " +
+          "${result.skippedTestCount} skipped"
+      }
     }
   }
 }

diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/AbstractResourceTypeHandler.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/AbstractResourceTypeHandler.kt
@@ -319,7 +319,7 @@ abstract class AbstractResourceTypeHandler<T : Resource>(
 
       printResult(candidateCounter, totalResourcesVisitedCounter, workConfiguration, markedResources, Action.MARK)
     } finally {
-      recordMarkMetrics(timerId, workConfiguration, violationCounter, candidateCounter)
+      recordMarkMetrics(timerId, workConfiguration, violationCounter, candidateCounter, totalResourcesVisitedCounter)
       postMark.invoke()
     }
   }

diff --git a/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/MetricsSupport.kt b/swabbie-core/src/main/kotlin/com/netflix/spinnaker/swabbie/MetricsSupport.kt
@@ -61,7 +61,8 @@ open class MetricsSupport(
   protected fun recordMarkMetrics(markerTimerId: Long,
                                   workConfiguration: WorkConfiguration,
                                   violationCounter: AtomicInteger,
-                                  candidateCounter: AtomicInteger) {
+                                  candidateCounter: AtomicInteger,
+                                  totalResourcesVisitedCounter: AtomicInteger) {
     markDurationTimer.stop(markerTimerId)
     registry.gauge(
       candidatesCountId.withTags(
@@ -83,6 +84,13 @@ open class MetricsSupport(
         "configuration", workConfiguration.namespace,
         "resourceTypeHandler", javaClass.simpleName
       )).set(exclusionCounters[Action.MARK]!!.toDouble())
+
+    registry.gauge(
+      resourcesVisitedId.withTags(
+        "resourceType", workConfiguration.resourceType,
+        "configuration", workConfiguration.namespace,
+        "resourceTypeHandler", javaClass.simpleName
+      )).set(totalResourcesVisitedCounter.toDouble())
   }
 
   protected fun recordFailureForAction(action: Action, workConfiguration: WorkConfiguration, e: Exception) {