aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2014-08-03 12:41:12 -0300
committerDiego <diegolparra@gmail.com>2014-08-03 12:41:12 -0300
commit54f78b3f4a7c50fd5a15837ea61cbea8ffb8fde5 (patch)
tree4d0f9038fb6a3d934548896f6bf002f2909cee39
parentcefc5c0e6cd0c5de49aa6bb748266d575fa4d728 (diff)
downloadKamon-54f78b3f4a7c50fd5a15837ea61cbea8ffb8fde5.tar.gz
Kamon-54f78b3f4a7c50fd5a15837ea61cbea8ffb8fde5.tar.bz2
Kamon-54f78b3f4a7c50fd5a15837ea61cbea8ffb8fde5.zip
= system-metrics: ensure all related sigar related files are included in the final jar, closes #70
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/index (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/index)0
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-freebsd-6.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-freebsd-6.so)bin210641 -> 210641 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-linux.so)bin246605 -> 246605 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-solaris.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-solaris.so)bin251360 -> 251360 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-hpux-11.sl (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-hpux-11.sl)bin577452 -> 577452 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-linux.so)bin494929 -> 494929 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-pa-hpux-11.sl (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-pa-hpux-11.sl)bin516096 -> 516096 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-aix-5.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-aix-5.so)bin400925 -> 400925 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-linux.so)bin258547 -> 258547 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-aix-5.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-aix-5.so)bin425077 -> 425077 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-linux.so)bin330767 -> 330767 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-s390x-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-s390x-linux.so)bin269932 -> 269932 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc-solaris.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc-solaris.so)bin285004 -> 285004 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc64-solaris.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc64-solaris.so)bin261896 -> 261896 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal-macosx.dylib (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal-macosx.dylib)bin377668 -> 377668 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal64-macosx.dylib (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal64-macosx.dylib)bin397440 -> 397440 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-5.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-5.so)bin179751 -> 179751 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-6.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-6.so)bin179379 -> 179379 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-linux.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-linux.so)bin233385 -> 233385 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-solaris.so (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-solaris.so)bin242880 -> 242880 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-amd64-winnt.dll (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-amd64-winnt.dll)bin402432 -> 402432 bytes
-rw-r--r--kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-x86-winnt.dll (renamed from kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-x86-winnt.dll)bin266240 -> 266240 bytes
-rw-r--r--kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala5
23 files changed, 2 insertions, 3 deletions
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/index b/kamon-system-metrics/src/main/resources/kamon/system/sigar/index
index cad1f326..cad1f326 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/index
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/index
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-freebsd-6.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-freebsd-6.so
index 3e94f0d2..3e94f0d2 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-freebsd-6.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-freebsd-6.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-linux.so
index 5a2e4c24..5a2e4c24 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-solaris.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-solaris.so
index 6396482a..6396482a 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-amd64-solaris.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-amd64-solaris.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-hpux-11.sl b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-hpux-11.sl
index d92ea4a9..d92ea4a9 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-hpux-11.sl
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-hpux-11.sl
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-linux.so
index 2bd2fc8e..2bd2fc8e 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ia64-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ia64-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-pa-hpux-11.sl b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-pa-hpux-11.sl
index 0dfd8a11..0dfd8a11 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-pa-hpux-11.sl
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-pa-hpux-11.sl
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-aix-5.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-aix-5.so
index 7d4b5199..7d4b5199 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-aix-5.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-aix-5.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-linux.so
index 4394b1b0..4394b1b0 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-aix-5.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-aix-5.so
index 35fd8288..35fd8288 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-aix-5.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-aix-5.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-linux.so
index a1ba2529..a1ba2529 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-ppc64-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-ppc64-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-s390x-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-s390x-linux.so
index c275f4ac..c275f4ac 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-s390x-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-s390x-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc-solaris.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc-solaris.so
index aa847d2b..aa847d2b 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc-solaris.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc-solaris.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc64-solaris.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc64-solaris.so
index 6c4fe809..6c4fe809 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-sparc64-solaris.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-sparc64-solaris.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal-macosx.dylib b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal-macosx.dylib
index 27ab1071..27ab1071 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal-macosx.dylib
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal-macosx.dylib
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal64-macosx.dylib b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal64-macosx.dylib
index 0c721fec..0c721fec 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-universal64-macosx.dylib
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-universal64-macosx.dylib
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-5.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-5.so
index 8c50c611..8c50c611 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-5.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-5.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-6.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-6.so
index f0800274..f0800274 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-freebsd-6.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-freebsd-6.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-linux.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-linux.so
index a0b64edd..a0b64edd 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-linux.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-linux.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-solaris.so b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-solaris.so
index c6452e56..c6452e56 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/libsigar-x86-solaris.so
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/libsigar-x86-solaris.so
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-amd64-winnt.dll b/kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-amd64-winnt.dll
index 1ec8a035..1ec8a035 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-amd64-winnt.dll
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-amd64-winnt.dll
Binary files differ
diff --git a/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-x86-winnt.dll b/kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-x86-winnt.dll
index 6afdc016..6afdc016 100644
--- a/kamon-system-metrics/src/main/scala/kamon/system/sigar/sigar-x86-winnt.dll
+++ b/kamon-system-metrics/src/main/resources/kamon/system/sigar/sigar-x86-winnt.dll
Binary files differ
diff --git a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
index 09904a5f..b4830ae5 100644
--- a/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
+++ b/kamon-system-metrics/src/test/scala/kamon/metrics/SystemMetricsSpec.scala
@@ -16,7 +16,7 @@
package kamon.metric
import akka.actor.ActorSystem
-import akka.testkit.{ TestKitBase, TestProbe }
+import akka.testkit.{TestKitBase, TestProbe}
import com.typesafe.config.ConfigFactory
import kamon.Kamon
import kamon.metric.Subscriptions.TickMetricSnapshot
@@ -28,11 +28,10 @@ import kamon.metrics.NetworkMetrics.NetworkMetricSnapshot
import kamon.metrics.ProcessCPUMetrics.ProcessCPUMetricsSnapshot
import kamon.metrics._
import kamon.system.SystemMetricsExtension
-import org.scalatest.{ Ignore, Matchers, WordSpecLike }
+import org.scalatest.{Matchers, WordSpecLike}
import scala.concurrent.duration._
-@Ignore
class SystemMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
implicit lazy val system: ActorSystem = ActorSystem("system-metrics-spec", ConfigFactory.parseString(
"""