diff options
| author | Diego <diegolparra@gmail.com> | 2014-08-29 02:44:47 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-08-29 02:44:47 -0300 |
| commit | c058e1b8f459f134f2409c06a57d01febfa0dc84 (patch) | |
| tree | 80d629faa27f544a157888e88a761e92a986f800 /kamon-core/src/main/scala/kamon/metric | |
| parent | 50d89e2a25b331e953a03ad8d91a18b9e8c0b121 (diff) | |
| download | Kamon-c058e1b8f459f134f2409c06a57d01febfa0dc84.tar.gz Kamon-c058e1b8f459f134f2409c06a57d01febfa0dc84.tar.bz2 Kamon-c058e1b8f459f134f2409c06a57d01febfa0dc84.zip | |
= core: fix errors in last commit
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala index adb2a18b..9660b6ff 100644 --- a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala @@ -17,11 +17,7 @@ package kamon.metric import akka.actor.ActorSystem import com.typesafe.config.Config -<<<<<<< Updated upstream import kamon.metric.instrument.{ Counter, Histogram } -======= -import kamon.metric.instrument.{Counter, Histogram} ->>>>>>> Stashed changes case class RouterMetrics(name: String) extends MetricGroupIdentity { val category = RouterMetrics @@ -46,12 +42,7 @@ object RouterMetrics extends MetricGroupCategory { } } - case class RouterMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot, -<<<<<<< Updated upstream - errors: Counter.Snapshot) extends MetricGroupSnapshot { -======= - errors: Counter.Snapshot) extends MetricGroupSnapshot { ->>>>>>> Stashed changes + case class RouterMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot, errors: Counter.Snapshot) extends MetricGroupSnapshot { type GroupSnapshotType = RouterMetricSnapshot |