Merge branch 'wip/improve-metric-recorders-infrastructure'

Conflicts:
	kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala

1 files changed, 36 insertions, 0 deletions

diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/NetworkMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/sigar/NetworkMetrics.scala
new file mode 100644
index 00000000..d9ba2bef
--- /dev/null
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/NetworkMetrics.scala
@@ -0,0 +1,36 @@
+package kamon.system.sigar
+
+import kamon.metric.GenericEntityRecorder
+import kamon.metric.instrument._
+import org.hyperic.sigar.{ NetInterfaceStat, Sigar }
+import scala.util.Try
+
+class NetworkMetrics(sigar: Sigar, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) with SigarMetric {
+  val receivedBytes = DiffRecordingHistogram(histogram("rx-bytes", Memory.Bytes))
+  val transmittedBytes = DiffRecordingHistogram(histogram("tx-bytes", Memory.Bytes))
+  val receiveErrors = DiffRecordingHistogram(histogram("rx-errors"))
+  val transmitErrors = DiffRecordingHistogram(histogram("tx-errors"))
+  val receiveDrops = DiffRecordingHistogram(histogram("rx-dropped"))
+  val transmitDrops = DiffRecordingHistogram(histogram("tx-dropped"))
+
+  val interfaces = sigar.getNetInterfaceList.toList.filter(_ != "lo")
+
+  def sumOfAllInterfaces(sigar: Sigar, thunk: NetInterfaceStat ⇒ Long): Long = Try {
+    interfaces.map(i ⇒ thunk(sigar.getNetInterfaceStat(i))).fold(0L)(_ + _)
+
+  } getOrElse (0L)
+
+  def update(): Unit = {
+    receivedBytes.record(sumOfAllInterfaces(sigar, _.getRxBytes))
+    transmittedBytes.record(sumOfAllInterfaces(sigar, _.getTxBytes))
+    receiveErrors.record(sumOfAllInterfaces(sigar, _.getRxErrors))
+    transmitErrors.record(sumOfAllInterfaces(sigar, _.getTxErrors))
+    receiveDrops.record(sumOfAllInterfaces(sigar, _.getRxDropped))
+    transmitDrops.record(sumOfAllInterfaces(sigar, _.getTxDropped))
+  }
+}
+
+object NetworkMetrics extends SigarMetricRecorderCompanion("network") {
+  def apply(sigar: Sigar, instrumentFactory: InstrumentFactory): NetworkMetrics =
+    new NetworkMetrics(sigar, instrumentFactory)
+}
\ No newline at end of file