From 0a2b7f4bf0dde31c82482fbaf5153c22c84ada69 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Mon, 4 Feb 2019 19:15:43 +0100 Subject: cleanup the exposition of status data and ensure the module registry provides enough info --- .../src/main/scala/kamon/metric/MetricRegistry.scala | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/metric') diff --git a/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala b/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala index 11c5653f..fd0cd8b8 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala @@ -26,6 +26,7 @@ import scala.collection.concurrent.TrieMap import java.time.Duration import java.util.concurrent.ScheduledExecutorService +import kamon.status.Status import org.slf4j.LoggerFactory @@ -89,24 +90,19 @@ class MetricRegistry(initialConfig: Config, scheduler: ScheduledExecutorService) metric.asInstanceOf[T] } - private[kamon] def status(): MetricRegistry.Status = { - var metricInfos = Seq.empty[MetricRegistry.MetricInfo] + private[kamon] def status(): Status.MetricRegistry = { + var registeredMetrics = Seq.empty[Status.Metric] metrics.foreach { case (metricName, metric) => metric.incarnations().foreach(incarnation => { - metricInfos = metricInfos :+ MetricRegistry.MetricInfo(metricName, incarnation, metric.instrumentType) + registeredMetrics = registeredMetrics :+ Status.Metric(metricName, incarnation, metric.instrumentType) }) } - MetricRegistry.Status(metricInfos) + Status.MetricRegistry(registeredMetrics) } } -object MetricRegistry { - case class Status(metrics: Seq[MetricInfo]) - case class MetricInfo(name: String, tags: Map[String, String], instrumentType: InstrumentType) -} - trait MetricsSnapshotGenerator { def snapshot(): MetricsSnapshot } -- cgit v1.2.3