1 files changed, 4 insertions, 19 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala b/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
index 68b14223..32e88764 100644
--- a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
+++ b/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
@@ -13,7 +13,8 @@
  * =========================================================================================
  */
 
-package kamon.metric
+package kamon
+package metric
 
 import kamon.util.MeasurementUnit
 
@@ -38,14 +39,13 @@ case class MetricsSnapshot(
   * Snapshot for instruments that internally track a single value. Meant to be used for counters and gauges.
   *
   */
-case class MetricValue(name: String, tags: Map[String, String], measurementUnit: MeasurementUnit, value: Long)
+case class MetricValue(name: String, tags: Tags, unit: MeasurementUnit, value: Long)
 
 /**
   * Snapshot for instruments that internally the distribution of values in a defined dynamic range. Meant to be used
   * with histograms and min max counters.
   */
-case class MetricDistribution(name: String, tags: Map[String, String], measurementUnit: MeasurementUnit,
-  dynamicRange: DynamicRange, distribution: Distribution)
+case class MetricDistribution(name: String, tags: Tags, unit: MeasurementUnit,  dynamicRange: DynamicRange, distribution: Distribution)
 
 
 trait Distribution {
@@ -73,18 +73,3 @@ trait Percentile {
   def countUnderQuantile: Long
 }
 
-//
-//trait DistributionSnapshotInstrument {
-//  private[kamon] def snapshot(resetState: Boolean): MetricDistribution
-//}
-//
-//trait SingleValueSnapshotInstrument {
-//  private[kamon] def snapshot(resetState: Boolean): MetricValue
-//}
-//
-//trait SnapshotableHistogram extends Histogram with DistributionSnapshotInstrument
-//trait SnapshotableMinMaxCounter extends MinMaxCounter with DistributionSnapshotInstrument
-//trait SnapshotableCounter extends Counter with SingleValueSnapshotInstrument
-//trait SnapshotableGauge extends Gauge with SingleValueSnapshotInstrument
-
-