1 files changed, 22 insertions, 32 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala b/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
index 10b409d9..a09a8f02 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
@@ -22,52 +22,42 @@ import scala.concurrent.duration.Duration
 
 trait MetricLookup {
 
-  def histogram(name: String): Histogram =
-    histogram(name, MeasurementUnit.none, Map.empty[String, String], None)
+  def histogram(name: String): HistogramMetric =
+    histogram(name, MeasurementUnit.none, None)
 
-  def histogram(name: String, unit: MeasurementUnit): Histogram =
-    histogram(name, unit, Map.empty[String, String], None)
+  def histogram(name: String, unit: MeasurementUnit): HistogramMetric =
+    histogram(name, unit, None)
 
-  def histogram(name: String, unit: MeasurementUnit, tags: Map[String, String]): Histogram =
-    histogram(name, unit, tags, None)
+  def histogram(name: String, unit: MeasurementUnit, dynamicRange: DynamicRange): HistogramMetric =
+    histogram(name, unit, Some(dynamicRange))
 
-  def histogram(name: String, unit: MeasurementUnit, tags: Map[String, String], dynamicRange: DynamicRange): Histogram =
-    histogram(name, unit, tags, Some(dynamicRange))
 
-  def counter(name: String): Counter =
-    counter(name, MeasurementUnit.none, Map.empty[String, String])
+  def counter(name: String): CounterMetric =
+    counter(name, MeasurementUnit.none)
 
-  def counter(name: String, unit: MeasurementUnit): Counter =
-    counter(name, unit, Map.empty[String, String])
 
-  def gauge(name: String): Gauge =
-    gauge(name, MeasurementUnit.none, Map.empty[String, String])
+  def gauge(name: String): GaugeMetric =
+    gauge(name, MeasurementUnit.none)
 
-  def gauge(name: String, unit: MeasurementUnit): Gauge =
-    gauge(name, unit, Map.empty[String, String])
 
-  def minMaxCounter(name: String): MinMaxCounter =
-    minMaxCounter(name, MeasurementUnit.none, Map.empty[String, String], None, None)
+  def minMaxCounter(name: String): MinMaxCounterMetric =
+    minMaxCounter(name, MeasurementUnit.none, None, None)
 
-  def minMaxCounter(name: String, unit: MeasurementUnit): MinMaxCounter =
-    minMaxCounter(name, unit, Map.empty[String, String], None, None)
+  def minMaxCounter(name: String, unit: MeasurementUnit): MinMaxCounterMetric =
+    minMaxCounter(name, unit, None, None)
 
-  def minMaxCounter(name: String, unit: MeasurementUnit, tags: Map[String, String]): MinMaxCounter =
-    minMaxCounter(name, unit, tags, None, None)
+  def minMaxCounter(name: String, unit: MeasurementUnit, sampleInterval: Duration): MinMaxCounterMetric =
+    minMaxCounter(name, unit, Option(sampleInterval), None)
 
-  def minMaxCounter(name: String, unit: MeasurementUnit, tags: Map[String, String], sampleInterval: Duration): MinMaxCounter =
-    minMaxCounter(name, unit, tags, Option(sampleInterval), None)
+  def minMaxCounter(name: String, unit: MeasurementUnit, sampleInterval: Duration, dynamicRange: DynamicRange): MinMaxCounterMetric =
+    minMaxCounter(name, unit, Option(sampleInterval), Option(dynamicRange))
 
-  def minMaxCounter(name: String, unit: MeasurementUnit, tags: Map[String, String], sampleInterval: Duration,
-      dynamicRange: DynamicRange): MinMaxCounter =
-    minMaxCounter(name, unit, tags, Option(sampleInterval), Option(dynamicRange))
 
-  def histogram(name: String, unit: MeasurementUnit, tags: Map[String, String], dynamicRange: Option[DynamicRange]): Histogram
+  def histogram(name: String, unit: MeasurementUnit, dynamicRange: Option[DynamicRange]): HistogramMetric
 
-  def counter(name: String, unit: MeasurementUnit, tags: Map[String, String]): Counter
+  def counter(name: String, unit: MeasurementUnit): CounterMetric
 
-  def gauge(name: String, unit: MeasurementUnit, tags: Map[String, String]): Gauge
+  def gauge(name: String, unit: MeasurementUnit): GaugeMetric
 
-  def minMaxCounter(name: String, unit: MeasurementUnit, tags: Map[String, String], sampleInterval: Option[Duration],
-    dynamicRange: Option[DynamicRange]): MinMaxCounter
+  def minMaxCounter(name: String, unit: MeasurementUnit, sampleInterval: Option[Duration], dynamicRange: Option[DynamicRange]): MinMaxCounterMetric
 }