! sigar,sysmetrics: delete the kamon-sigar project and switch to sigar-loader

2 files changed, 31 insertions, 32 deletions

diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarLoader.scala b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsBanner.scala
index 1b33fd6f..99e09da9 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarLoader.scala
+++ b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsBanner.scala
@@ -14,29 +14,17 @@
  * =========================================================================================
  */
 
-package kamon.system.sigar
+package kamon.system
 
-import java.io._
-import java.util.logging.Logger
-import kamon.sigar.SigarAgent
+import akka.actor.ActorLogging
 import org.hyperic.sigar._
-import scala.util.control.{ NoStackTrace, NonFatal }
 
-object SigarLoader {
-  private val log = Logger.getLogger("SigarLoader")
+import scala.util.control.NoStackTrace
 
-  lazy val instance = init(new File(System.getProperty("java.io.tmpdir")))
+trait SystemMetricsBanner {
+  self: ActorLogging ⇒
 
-  private[sigar] def init(baseTmp: File): SigarProxy = try {
-    SigarAgent.provision(baseTmp)
-    val sigar = new Sigar()
-    printBanner(sigar)
-    sigar
-  } catch {
-    case NonFatal(t) ⇒ throw new UnexpectedSigarException("Failed to load sigar")
-  }
-
-  private[sigar] def printBanner(sigar: Sigar) = {
+  def printBanner(sigar: Sigar) = {
     val os = OperatingSystem.getInstance
 
     def loadAverage(sigar: Sigar) = try {
@@ -98,5 +86,6 @@ object SigarLoader {
       """.stripMargin.format(uptime(sigar), os.getDescription, loadAverage(sigar), os.getName, os.getVersion, os.getArch)
     log.info(message)
   }
+
   class UnexpectedSigarException(message: String) extends RuntimeException(message) with NoStackTrace
 }
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
index b1ebf402..bb7fa105 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
+++ b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetricsCollector.scala
@@ -15,7 +15,7 @@
  */
 package kamon.system
 
-import java.io.IOException
+import java.io.{ File, IOException }
 
 import akka.actor.{ Actor, ActorLogging, Props }
 import kamon.Kamon
@@ -26,19 +26,24 @@ import kamon.metrics.MemoryMetrics.MemoryMetricRecorder
 import kamon.metrics.NetworkMetrics.NetworkMetricRecorder
 import kamon.metrics.ProcessCPUMetrics.ProcessCPUMetricsRecorder
 import kamon.metrics._
-import kamon.system.sigar.SigarLoader
-import org.hyperic.sigar.{ Mem, NetInterfaceStat, SigarProxy }
+import kamon.sigar.SigarProvisioner
+import org.hyperic.sigar.{ Sigar, Mem, NetInterfaceStat, SigarProxy }
 
 import scala.concurrent.duration.FiniteDuration
 import scala.io.Source
+import scala.util.control.NonFatal
 
-class SystemMetricsCollector(collectInterval: FiniteDuration) extends Actor with ActorLogging with SigarExtensionProvider {
+class SystemMetricsCollector(collectInterval: FiniteDuration) extends Actor with ActorLogging with SystemMetricsBanner {
   import kamon.system.SystemMetricsCollector._
   import kamon.system.SystemMetricsExtension._
 
-  val collectSchedule = context.system.scheduler.schedule(collectInterval, collectInterval, self, Collect)(context.dispatcher)
+  lazy val sigar = createSigarInstance
+  def pid = sigar.getPid
+
+  val interfaces: Set[String] = sigar.getNetInterfaceList.toSet
 
   val systemMetricsExtension = Kamon(Metrics)(context.system)
+  val collectSchedule = context.system.scheduler.schedule(collectInterval, collectInterval, self, Collect)(context.dispatcher)
 
   val cpuRecorder = systemMetricsExtension.register(CPUMetrics(CPU), CPUMetrics.Factory)
   val processCpuRecorder = systemMetricsExtension.register(ProcessCPUMetrics(ProcessCPU), ProcessCPUMetrics.Factory)
@@ -152,6 +157,19 @@ class SystemMetricsCollector(collectInterval: FiniteDuration) extends Actor with
     rcs.perProcessNonVoluntary.record(perProcessNonVoluntary)
     rcs.global.record(contextSwitches)
   }
+
+  def createSigarInstance: SigarProxy = {
+    val tempFolder = new File(System.getProperty("java.io.tmpdir"))
+
+    try {
+      SigarProvisioner.provision(tempFolder)
+      val sigar = new Sigar()
+      printBanner(sigar)
+      sigar
+    } catch {
+      case NonFatal(t) ⇒ throw new UnexpectedSigarException("Failed to load sigar")
+    }
+  }
 }
 
 object SystemMetricsCollector {
@@ -162,12 +180,4 @@ object SystemMetricsCollector {
   }
 
   def props(collectInterval: FiniteDuration): Props = Props[SystemMetricsCollector](new SystemMetricsCollector(collectInterval))
-}
-
-trait SigarExtensionProvider {
-  lazy val sigar = SigarLoader.instance
-
-  def pid = sigar.getPid
-
-  val interfaces: Set[String] = sigar.getNetInterfaceList.toSet
-}
+}
\ No newline at end of file