aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego <diegolparra@gmail.com>2016-03-03 00:47:53 -0300
committerDiego <diegolparra@gmail.com>2016-03-03 00:47:53 -0300
commitd280c2f66072be77c5accac7304119a71d4d8ff8 (patch)
treef41195db8fb5d364a581589045a7d019e7f04209
parent783464d24f8e5a1877fc893eb991d0842c8128d7 (diff)
downloadKamon-d280c2f66072be77c5accac7304119a71d4d8ff8.tar.gz
Kamon-d280c2f66072be77c5accac7304119a71d4d8ff8.tar.bz2
Kamon-d280c2f66072be77c5accac7304119a71d4d8ff8.zip
= system-metrics: runSafe in UlimitMetrics and include a test
-rw-r--r--kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala6
-rw-r--r--kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala8
-rw-r--r--kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala2
-rw-r--r--kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala12
4 files changed, 14 insertions, 14 deletions
diff --git a/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala
index 04821923..902102cd 100644
--- a/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala
@@ -18,7 +18,7 @@ package kamon.metric
import kamon.Kamon
import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot
-import kamon.metric.instrument.{InstrumentFactory, Memory, Time, UnitOfMeasurement}
+import kamon.metric.instrument.{ InstrumentFactory, Memory, Time, UnitOfMeasurement }
import kamon.testkit.BaseKamonSpec
import kamon.util.MilliTimestamp
import org.scalatest.OptionValues._
@@ -62,10 +62,10 @@ class MetricScaleDecoratorSpec extends BaseKamonSpec("metrics-scale-decorator-sp
}
trait SnapshotFixtures {
- self: BaseKamonSpec =>
+ self: BaseKamonSpec ⇒
class ScaleDecoratorTestMetrics(instrumentFactory: InstrumentFactory)
- extends GenericEntityRecorder(instrumentFactory) {
+ extends GenericEntityRecorder(instrumentFactory) {
val nanoTime = histogram("nano-time", Time.Nanoseconds)
val microTime = counter("micro-time", Time.Microseconds)
val byteMemory = histogram("byte-memory", Memory.Bytes)
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
index ff71cd56..adfcd826 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
@@ -64,8 +64,8 @@ class HistogramSpec extends WordSpec with Matchers {
snapshot.sum should be(41300)
snapshot.numberOfMeasurements should be(203)
- val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq
- records.size should be (4)
+ val records = snapshot.recordsIterator.map(r ⇒ r.level -> r.count).toSeq
+ records.size should be(4)
records(0) should be(100 -> 1)
records(1) should be(200 -> 200)
records(2) should be(300 -> 1)
@@ -88,8 +88,8 @@ class HistogramSpec extends WordSpec with Matchers {
snapshot.sum should be(41300000)
snapshot.numberOfMeasurements should be(203)
- val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq
- records.size should be (4)
+ val records = snapshot.recordsIterator.map(r ⇒ r.level -> r.count).toSeq
+ records.size should be(4)
records(0) should be(100000 -> 1)
records(1) should be(200000 -> 200)
records(2) should be(300000 -> 1)
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala
index 7133579e..10604fe5 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala
@@ -17,7 +17,7 @@
package kamon.metric.instrument
import kamon.metric.instrument.UnitOfMeasurement.Unknown
-import org.scalatest.{Matchers, WordSpec}
+import org.scalatest.{ Matchers, WordSpec }
class UnitOfMeasurementSpec extends WordSpec with Matchers {
diff --git a/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala
index 3486a60c..a53451b6 100644
--- a/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala
+++ b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala
@@ -17,8 +17,8 @@
package kamon.util
import com.typesafe.config.ConfigFactory
-import kamon.metric.instrument.{Memory, Time}
-import org.scalatest.{Matchers, WordSpec}
+import kamon.metric.instrument.{ Memory, Time }
+import org.scalatest.{ Matchers, WordSpec }
class NeedToScaleSpec extends WordSpec with Matchers {
@@ -30,7 +30,7 @@ class NeedToScaleSpec extends WordSpec with Matchers {
""".stripMargin)
config match {
- case NeedToScale(timeUnits, memoryUnits) =>
+ case NeedToScale(timeUnits, memoryUnits) ⇒
timeUnits should be(Some(Time.Milliseconds))
memoryUnits should be(None)
}
@@ -42,7 +42,7 @@ class NeedToScaleSpec extends WordSpec with Matchers {
""".stripMargin)
config match {
- case NeedToScale(timeUnits, memoryUnits) =>
+ case NeedToScale(timeUnits, memoryUnits) ⇒
timeUnits should be(None)
memoryUnits should be(Some(Memory.KiloBytes))
}
@@ -54,9 +54,9 @@ class NeedToScaleSpec extends WordSpec with Matchers {
""".stripMargin)
config match {
- case NeedToScale(timeUnits, memoryUnits) =>
+ case NeedToScale(timeUnits, memoryUnits) ⇒
fail("Should not match")
- case _ =>
+ case _ ⇒
}
}
}