[incubator-openwhisk] branch master updated: Add conditional statement to check metricsKamon flag. (#3316)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 8393180  Add conditional statement to check metricsKamon flag. (#3316)
8393180 is described below

commit 8393180d7fbd00c1d20b7de726ca698c7dd91d81
Author: Seong-hyun, Oh <ad...@upgle.com>
AuthorDate: Thu Feb 22 04:41:16 2018 +0900

    Add conditional statement to check metricsKamon flag. (#3316)
---
 .../scala/src/main/scala/whisk/common/Logging.scala   | 16 ++++++++++------
 .../src/main/scala/whisk/common/TransactionId.scala   | 19 +++++--------------
 .../src/main/scala/whisk/http/BasicHttpService.scala  |  7 +++----
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/common/scala/src/main/scala/whisk/common/Logging.scala b/common/scala/src/main/scala/whisk/common/Logging.scala
index 4f4a801..cce6b91 100644
--- a/common/scala/src/main/scala/whisk/common/Logging.scala
+++ b/common/scala/src/main/scala/whisk/common/Logging.scala
@@ -192,15 +192,19 @@ object MetricEmitter {
   val metrics = Kamon.metrics
 
   def emitCounterMetric(token: LogMarkerToken): Unit = {
-    metrics
-      .counter(token.toString)
-      .increment(1)
+    if (TransactionId.metricsKamon) {
+      metrics
+        .counter(token.toString)
+        .increment(1)
+    }
   }
 
   def emitHistogramMetric(token: LogMarkerToken, value: Long): Unit = {
-    metrics
-      .histogram(token.toString)
-      .record(value)
+    if (TransactionId.metricsKamon) {
+      metrics
+        .histogram(token.toString)
+        .record(value)
+    }
   }
 
 }
diff --git a/common/scala/src/main/scala/whisk/common/TransactionId.scala b/common/scala/src/main/scala/whisk/common/TransactionId.scala
index 4cbcd71..9b165d0 100644
--- a/common/scala/src/main/scala/whisk/common/TransactionId.scala
+++ b/common/scala/src/main/scala/whisk/common/TransactionId.scala
@@ -63,9 +63,7 @@ case class TransactionId private (meta: TransactionMetadata) extends AnyVal {
       logging.emit(logLevel, this, from, message)
     }
 
-    if (TransactionId.metricsKamon) {
-      MetricEmitter.emitCounterMetric(marker)
-    }
+    MetricEmitter.emitCounterMetric(marker)
 
   }
 
@@ -90,10 +88,7 @@ case class TransactionId private (meta: TransactionMetadata) extends AnyVal {
       logging.emit(logLevel, this, from, message)
     }
 
-    if (TransactionId.metricsKamon) {
-      MetricEmitter.emitCounterMetric(marker)
-    }
-
+    MetricEmitter.emitCounterMetric(marker)
     StartMarker(Instant.now, marker)
   }
 
@@ -128,9 +123,7 @@ case class TransactionId private (meta: TransactionMetadata) extends AnyVal {
       logging.emit(logLevel, this, from, message)
     }
 
-    if (TransactionId.metricsKamon) {
-      MetricEmitter.emitHistogramMetric(endMarker, deltaToEnd)
-    }
+    MetricEmitter.emitHistogramMetric(endMarker, deltaToEnd)
   }
 
   /**
@@ -158,10 +151,8 @@ case class TransactionId private (meta: TransactionMetadata) extends AnyVal {
       logging.emit(logLevel, this, from, message)
     }
 
-    if (TransactionId.metricsKamon) {
-      MetricEmitter.emitHistogramMetric(endMarker, deltaToEnd)
-      MetricEmitter.emitCounterMetric(endMarker)
-    }
+    MetricEmitter.emitHistogramMetric(endMarker, deltaToEnd)
+    MetricEmitter.emitCounterMetric(endMarker)
   }
 
   /**
diff --git a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
index 914c199..46b95e0 100644
--- a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
+++ b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
@@ -124,10 +124,9 @@ trait BasicHttpService extends Directives with TransactionCounter {
       val token = LogMarkerToken("http", s"${m.toLowerCase}.${res.status.intValue}", LoggingMarkers.count)
       val marker = LogMarker(token, tid.deltaToStart, Some(tid.deltaToStart))
 
-      if (TransactionId.metricsKamon) {
-        MetricEmitter.emitHistogramMetric(token, tid.deltaToStart)
-        MetricEmitter.emitCounterMetric(token)
-      }
+      MetricEmitter.emitHistogramMetric(token, tid.deltaToStart)
+      MetricEmitter.emitCounterMetric(token)
+
       if (TransactionId.metricsLog) {
         Some(LogEntry(s"[$tid] [$name] $marker", l))
       } else {

-- 
To stop receiving notification emails like this one, please contact
markusthoemmes@apache.org.