diff --git a/Gopkg.lock b/Gopkg.lock
index c42a7f0..13d22a0 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,113 +2,212 @@
 
 
 [[projects]]
+  digest = "1:8515c0ca4381246cf332cee05fc84070bbbb07bd679b639161506ba532f47128"
   name = "github.com/VividCortex/gohistogram"
   packages = ["."]
+  pruneopts = "UT"
   revision = "51564d9861991fb0ad0f531c99ef602d0f9866e6"
   version = "v1.0.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:5bb36304653e73c2ced864d49c9f344e7141a7ceef852442edcea212094ebc3c"
   name = "github.com/beorn7/perks"
   packages = ["quantile"]
+  pruneopts = "UT"
   revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
 
 [[projects]]
+  branch = "master"
+  digest = "1:4c4c33075b704791d6a7f09dfb55c66769e8a1dc6adf87026292d274fe8ad113"
   name = "github.com/codahale/hdrhistogram"
   packages = ["."]
-  revision = "f8ad88b59a584afeee9d334eff879b104439117b"
+  pruneopts = "UT"
+  revision = "3a0bb77429bd3a61596f5e8a3172445844342120"
 
 [[projects]]
+  digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
-  revision = "04cdfd42973bb9c8589fd6a731800cf222fde1a9"
+  pruneopts = "UT"
+  revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+  version = "v1.1.1"
 
 [[projects]]
   branch = "master"
+  digest = "1:5fe3f6ede1c208a2efd3b78fe4df0306aa9624edd39476143d14f0326e5a8d29"
   name = "github.com/facebookgo/clock"
   packages = ["."]
+  pruneopts = "UT"
   revision = "600d898af40aa09a7a93ecb9265d87b0504b6f03"
 
 [[projects]]
+  digest = "1:59e6f6cad7d4e1d11bacf9194fa051959cf6dbefb97a09dd2192d0271f8d51fa"
   name = "github.com/go-kit/kit"
-  packages = ["log","log/level","metrics","metrics/expvar","metrics/generic","metrics/influx","metrics/internal/lv","metrics/prometheus"]
+  packages = [
+    "log",
+    "log/level",
+    "metrics",
+    "metrics/expvar",
+    "metrics/generic",
+    "metrics/influx",
+    "metrics/internal/lv",
+  ]
+  pruneopts = "UT"
   revision = "a9ca6725cbbea455e61c6bc8a1ed28e81eb3493b"
   version = "v0.5.0"
 
 [[projects]]
+  digest = "1:31a18dae27a29aa074515e43a443abfd2ba6deb6d69309d8d7ce789c45f34659"
   name = "github.com/go-logfmt/logfmt"
   packages = ["."]
+  pruneopts = "UT"
   revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:1ecf6125aba01b53e87eef03594102941d7f96c106787b53683323bdebf70a0e"
   name = "github.com/go-stack/stack"
   packages = ["."]
+  pruneopts = "UT"
   revision = "817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
   version = "v1.6.0"
 
 [[projects]]
+  digest = "1:c53c0f117d427f9bbb9862f554a1570dfb30fa3a77891867252414f2c6e3a453"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
+  pruneopts = "UT"
   revision = "7cc19b78d562895b13596ddce7aafb59dd789318"
 
 [[projects]]
+  digest = "1:3122b59f62d3f4065217ae96d9a680ce313b64e5f86e79ba58682b980858dc1d"
   name = "github.com/influxdata/influxdb"
-  packages = ["client/v2","models","pkg/escape"]
+  packages = [
+    "client/v2",
+    "models",
+    "pkg/escape",
+  ]
+  pruneopts = "UT"
   revision = "f3f30726d822c4be8cd00137ba66b6e4fd68cca1"
 
 [[projects]]
   branch = "master"
+  digest = "1:a64e323dc06b73892e5bb5d040ced475c4645d456038333883f58934abbf6f72"
   name = "github.com/kr/logfmt"
   packages = ["."]
+  pruneopts = "UT"
   revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
 
 [[projects]]
   branch = "master"
+  digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc"
   name = "github.com/matttproud/golang_protobuf_extensions"
   packages = ["pbutil"]
+  pruneopts = "UT"
   revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
 
 [[projects]]
+  digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
   name = "github.com/pmezard/go-difflib"
   packages = ["difflib"]
-  revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
+  pruneopts = "UT"
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
 
 [[projects]]
+  digest = "1:b6221ec0f8903b556e127c449e7106b63e6867170c2d10a7c058623d086f2081"
   name = "github.com/prometheus/client_golang"
   packages = ["prometheus"]
+  pruneopts = "UT"
   revision = "c5b7fccd204277076155f10851dad72b76a49317"
   version = "v0.8.0"
 
 [[projects]]
+  digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b"
   name = "github.com/prometheus/client_model"
   packages = ["go"]
+  pruneopts = "UT"
   revision = "6f3806018612930941127f2a7c6c453ba2c527d2"
 
 [[projects]]
+  digest = "1:0d5f8e2195ad2beef202367f3217c4a7981582d96ccf4876b9aa2c5c9c9b3510"
   name = "github.com/prometheus/common"
-  packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"]
+  packages = [
+    "expfmt",
+    "internal/bitbucket.org/ww/goautoneg",
+    "model",
+  ]
+  pruneopts = "UT"
   revision = "49fee292b27bfff7f354ee0f64e1bc4850462edf"
 
 [[projects]]
+  digest = "1:73bb422d231d18bcdbb7d0f11da82f032af798f9197107f7cf64cdde1ce8eec4"
   name = "github.com/prometheus/procfs"
-  packages = [".","xfs"]
+  packages = [
+    ".",
+    "xfs",
+  ]
+  pruneopts = "UT"
   revision = "a1dba9ce8baed984a2495b658c82687f8157b98f"
 
 [[projects]]
+  digest = "1:5da8ce674952566deae4dbc23d07c85caafc6cfa815b0b3e03e41979cedb8750"
   name = "github.com/stretchr/testify"
-  packages = ["assert","require"]
-  revision = "05e8a0eda380579888eb53c394909df027f06991"
+  packages = [
+    "assert",
+    "require",
+  ]
+  pruneopts = "UT"
+  revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"
+  version = "v1.3.0"
 
 [[projects]]
+  digest = "1:e3521c6c8f39b482e953fd5bbe19a89d89916a173f421c3aded4c811033fe286"
   name = "github.com/uber-go/tally"
   packages = ["."]
+  pruneopts = "UT"
   revision = "be9e53c77349ae2dd4b8c03a6dc20ed9a88b9927"
   version = "v3.2.0"
 
+[[projects]]
+  digest = "1:34d2f773960fa81274e8378bb667060f49a66695cf527c8734977cdbd574e03f"
+  name = "github.com/uber/jaeger-lib"
+  packages = [
+    "metrics",
+    "metrics/adapters",
+    "metrics/go-kit",
+    "metrics/go-kit/expvar",
+    "metrics/metricstest",
+    "metrics/prometheus",
+  ]
+  pruneopts = "UT"
+  revision = "0e30338a695636fe5bcf7301e8030ce8dd2a8530"
+  version = "v2.0.0"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "6a38cb6e727212ac18ae744a1a3f17dcd79235e1947fac5f63b41d3162328e1f"
+  input-imports = [
+    "github.com/codahale/hdrhistogram",
+    "github.com/go-kit/kit/log",
+    "github.com/go-kit/kit/log/level",
+    "github.com/go-kit/kit/metrics",
+    "github.com/go-kit/kit/metrics/expvar",
+    "github.com/go-kit/kit/metrics/generic",
+    "github.com/go-kit/kit/metrics/influx",
+    "github.com/influxdata/influxdb/client/v2",
+    "github.com/prometheus/client_golang/prometheus",
+    "github.com/prometheus/client_model/go",
+    "github.com/stretchr/testify/assert",
+    "github.com/stretchr/testify/require",
+    "github.com/uber-go/tally",
+    "github.com/uber/jaeger-lib/metrics",
+    "github.com/uber/jaeger-lib/metrics/adapters",
+    "github.com/uber/jaeger-lib/metrics/go-kit",
+    "github.com/uber/jaeger-lib/metrics/go-kit/expvar",
+    "github.com/uber/jaeger-lib/metrics/metricstest",
+    "github.com/uber/jaeger-lib/metrics/prometheus",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index b97e1e3..58b83d1 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,23 +1,23 @@
-[[constraint]]
-  name = "github.com/codahale/hdrhistogram"
-
 [[constraint]]
   name = "github.com/go-kit/kit"
   version = "0.5.0"
 
 [[constraint]]
-  name = "github.com/influxdata/influxdb"
+  name = "github.com/codahale/hdrhistogram"
+  branch = "master"
 
 [[constraint]]
-  name = "github.com/prometheus/client_golang"
-  version = "0.8.0"
+  name = "github.com/uber-go/tally"
+  version = ">=2.1.0, <4.0.0"
 
 [[constraint]]
-  name = "github.com/prometheus/client_model"
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
+  version = "1.2.1"
 
-[[constraint]]
-  name = "github.com/uber-go/tally"
-  version = ">=2.1.0, <4.0.0"
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/Makefile b/Makefile
index da8b57e..815574d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,9 @@ test-and-lint: test fmt lint
 
 .PHONY: test
 test:
+ifeq ($(USE_DEP),true)
+	make verify-dep
+endif
 	$(GOTEST) $(PACKAGES) | $(COLORIZE)
 
 .PHONY: fmt
@@ -60,6 +63,9 @@ else
 	glide install
 endif
 
+.PHONY: verify-dep
+verify-dep:
+	dep check
 
 .PHONY: cover
 cover: