= kamon-system-metrics: Initialization-on-demand holder idiom in order to load one instance of Sigar

26 files changed, 46 insertions, 16 deletions

diff --git a/kamon-system-metrics/src/main/java/kamon/system/SigarHolder.java b/kamon-system-metrics/src/main/java/kamon/system/SigarHolder.java
new file mode 100644
index 00000000..d00750df
--- /dev/null
+++ b/kamon-system-metrics/src/main/java/kamon/system/SigarHolder.java
@@ -0,0 +1,30 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2014 the kamon project <http://kamon.io/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ * =========================================================================================
+ */
+
+package kamon.system;
+
+import kamon.system.sigar.SigarLoader;
+import org.hyperic.sigar.SigarProxy;
+
+public class SigarHolder {
+    private static class LazySigarHolder {
+        static final SigarProxy instance = SigarLoader.sigarProxy();
+    }
+
+    public static SigarProxy instance() {
+        return LazySigarHolder.instance;
+    }
+}
diff --git a/kamon-system-metrics/src/main/scala/kamon/metrics/CPUMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/metrics/CPUMetrics.scala
index a45896ac..89ec5729 100644
--- a/kamon-system-metrics/src/main/scala/kamon/metrics/CPUMetrics.scala
+++ b/kamon-system-metrics/src/main/scala/kamon/metrics/CPUMetrics.scala
@@ -18,7 +18,7 @@ package kamon.metrics
 import akka.actor.ActorSystem
 import com.typesafe.config.Config
 import kamon.metric._
-import kamon.metric.instrument.{Gauge, Histogram}
+import kamon.metric.instrument.{ Gauge, Histogram }
 import kamon.system.SigarExtensionProvider
 
 case class CPUMetrics(name: String) extends MetricGroupIdentity {
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetrics.scala
index a46d8e1f..bd156c2a 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/SystemMetrics.scala
+++ b/kamon-system-metrics/src/main/scala/kamon/system/SystemMetrics.scala
@@ -22,7 +22,7 @@ import akka.event.Logging
 import kamon.Kamon
 import kamon.metric.Metrics
 import kamon.metrics._
-import kamon.system.native.SigarLoader
+
 import scala.collection.JavaConverters._
 
 object SystemMetrics extends ExtensionId[SystemMetricsExtension] with ExtensionIdProvider {
@@ -60,6 +60,6 @@ object SystemMetricsExtension {
 }
 
 trait SigarExtensionProvider {
-  lazy val sigar = SigarLoader.sigarProxy
+  lazy val sigar = SigarHolder.instance()
 }
 
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/SigarLoader.scala b/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarLoader.scala
index f1072f56..0c78504e 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/SigarLoader.scala
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/SigarLoader.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package kamon.system.native
+package kamon.system.sigar
 
 import java.io._
 import java.util
@@ -33,14 +33,14 @@ object SigarLoader {
   val Version = "1.6.4"
   val JavaLibraryPath = "java.library.path"
   val TmpDir = "java.io.tmpdir"
-  val IndexFile = "/kamon/system/native/index"
+  val IndexFile = "/kamon/system/sigar/index"
   val UsrPathField = "usr_paths"
 
   private val log = Logger.getLogger("SigarLoader")
 
-  lazy val sigarProxy = init(new File(System.getProperty(TmpDir)))
+  def sigarProxy = init(new File(System.getProperty(TmpDir)))
 
-  private[native] def init(baseTmp: File): SigarProxy = {
+  private[sigar] def init(baseTmp: File): SigarProxy = {
     val tmpDir = createTmpDir(baseTmp)
     for (lib ← loadIndex) copy(lib, tmpDir)
 
@@ -58,13 +58,13 @@ object SigarLoader {
     }
   }
 
-  private[native] val usrPathField = {
+  private[sigar] val usrPathField = {
     val usrPathField = classOf[ClassLoader].getDeclaredField(UsrPathField)
     usrPathField.setAccessible(true)
     usrPathField
   }
 
-  private[native] def attachToLibraryPath(dir: File): Unit = {
+  private[sigar] def attachToLibraryPath(dir: File): Unit = {
     val dirAbsolute = dir.getAbsolutePath
     System.setProperty(JavaLibraryPath, newLibraryPath(dirAbsolute))
     var paths = usrPathField.get(null).asInstanceOf[Array[String]]
@@ -75,17 +75,17 @@ object SigarLoader {
     usrPathField.set(null, newPaths)
   }
 
-  private[native] def newLibraryPath(dirAbsolutePath: String): String = {
+  private[sigar] def newLibraryPath(dirAbsolutePath: String): String = {
     Option(System.getProperty(JavaLibraryPath)).fold(dirAbsolutePath)(oldValue ⇒ s"$dirAbsolutePath${File.pathSeparator}$oldValue")
   }
 
-  private[native] def copy(lib: String, tmpDir: File) {
+  private[sigar] def copy(lib: String, tmpDir: File) {
     val target = new File(tmpDir, lib)
     if (target.exists()) return
     write(classOf[Loader].getResourceAsStream(lib), target)
   }
 
-  private[native] def createTmpDir(baseTmp: File): File = {
+  private[sigar] def createTmpDir(baseTmp: File): File = {
     val tmpDir = new File(baseTmp, s"sigar-$Version")
     if (!tmpDir.exists()) {
       if (!tmpDir.mkdirs()) throw new RuntimeException(s"Could not create temp sigar directory: ${tmpDir.getAbsolutePath}")
@@ -95,7 +95,7 @@ object SigarLoader {
     tmpDir
   }
 
-  private[native] def loadIndex(): List[String] = {
+  private[sigar] def loadIndex(): List[String] = {
     val libs = new ArrayList[String]()
     val is = classOf[Loader].getResourceAsStream(IndexFile)
 
@@ -106,7 +106,7 @@ object SigarLoader {
     libs
   }
 
-  private[native] def write(input: InputStream, to: File) {
+  private[sigar] def write(input: InputStream, to: File) {
     val out = new FileOutputStream(to)
     try {
       transfer(input, out)
@@ -115,7 +115,7 @@ object SigarLoader {
     }
   }
 
-  private[native] def transfer(input: InputStream, out: OutputStream) {
+  private[sigar] def transfer(input: InputStream, out: OutputStream) {
     val buffer = new Array[Byte](8192)
 
     @tailrec def transfer() {
@@ -128,5 +128,5 @@ object SigarLoader {
     transfer()
   }
 
-  class Loader private[native]
+  class Loader private[sigar]
 }
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/index b/kamon-system-metrics/src/main/scala/kamon/system/sigar/index
index ebc7f952..ebc7f952 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/index
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/index
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-freebsd-6.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-freebsd-6.so
index 3e94f0d2..3e94f0d2 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-freebsd-6.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-freebsd-6.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-linux.so
index 5a2e4c24..5a2e4c24 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-solaris.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-solaris.so
index 6396482a..6396482a 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-amd64-solaris.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-solaris.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ia64-hpux-11.sl b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-hpux-11.sl
index d92ea4a9..d92ea4a9 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ia64-hpux-11.sl
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-hpux-11.sl
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ia64-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-linux.so
index 2bd2fc8e..2bd2fc8e 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ia64-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-pa-hpux-11.sl b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-pa-hpux-11.sl
index 0dfd8a11..0dfd8a11 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-pa-hpux-11.sl
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-pa-hpux-11.sl
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc-aix-5.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-aix-5.so
index 7d4b5199..7d4b5199 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc-aix-5.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-aix-5.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-linux.so
index 4394b1b0..4394b1b0 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc64-aix-5.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-aix-5.so
index 35fd8288..35fd8288 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc64-aix-5.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-aix-5.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc64-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-linux.so
index a1ba2529..a1ba2529 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-ppc64-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-s390x-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-s390x-linux.so
index c275f4ac..c275f4ac 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-s390x-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-s390x-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-sparc-solaris.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc-solaris.so
index aa847d2b..aa847d2b 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-sparc-solaris.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc-solaris.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-sparc64-solaris.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc64-solaris.so
index 6c4fe809..6c4fe809 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-sparc64-solaris.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc64-solaris.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-universal-macosx.dylib b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal-macosx.dylib
index 27ab1071..27ab1071 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-universal-macosx.dylib
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal-macosx.dylib
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-universal64-macosx.dylib b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal64-macosx.dylib
index 0c721fec..0c721fec 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-universal64-macosx.dylib
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal64-macosx.dylib
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-freebsd-5.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-5.so
index 8c50c611..8c50c611 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-freebsd-5.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-5.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-freebsd-6.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-6.so
index f0800274..f0800274 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-freebsd-6.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-6.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-linux.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-linux.so
index a0b64edd..a0b64edd 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-linux.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-linux.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-solaris.so b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-solaris.so
index c6452e56..c6452e56 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/libsigar-x86-solaris.so
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-solaris.so
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/sigar-amd64-winnt.dll b/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-amd64-winnt.dll
index 1ec8a035..1ec8a035 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/sigar-amd64-winnt.dll
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-amd64-winnt.dll
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/native/sigar-x86-winnt.dll b/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-x86-winnt.dll
index 6afdc016..6afdc016 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/native/sigar-x86-winnt.dll
+++ b/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-x86-winnt.dll