Fix dep

Gopkg.toml

@@ -19,12 +19,18 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
+[prune]
+go-tests = true
+non-go = true
+unused-packages = true
 
 [[constraint]]
   name = "github.com/Dieterbe/artisanalhistogram"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/Dieterbe/profiletrigger"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/Shopify/sarama"
@@ -35,99 +41,116 @@
   version = "0.7.3"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/alyu/configparser"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/bitly/go-hostpool"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/davecgh/go-spew"
   version = "1.1.0"
 
 [[constraint]]
   name = "github.com/dgryski/go-linlog"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/dgryski/go-tsz"
+  revision = "5f4c484a9e838989c201ff437b3cab59cfdc46c8"
 
 [[constraint]]
   name = "github.com/docker/docker"
+  version = "v1.13.1"
 
 [[constraint]]
   name = "github.com/go-macaron/binding"
+  revision = "a453235199f8898e01647db8820f937a184fbd09"
 
 [[constraint]]
   name = "github.com/gocql/gocql"
   revision = "d9815cdf0ff24e2efa9b8062f4f94a6dd347ae51"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/golang/snappy"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/hailocab/go-hostpool"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/hashicorp/memberlist"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/kisielk/og-rek"
+  version = "v1.0.0"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/kisielk/whisper-go"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/metrics20/go-metrics20"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/mitchellh/go-homedir"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/nsqio/go-nsq"
+  revision = "642a3f9935f12cb3b747294318d730f56f4c34b4"
 
 [[constraint]]
   name = "github.com/opentracing/opentracing-go"
+  branch = "master"
 
 [[constraint]]
-  branch = "v2"
   name = "github.com/raintank/dur"
+  branch = "v2"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/raintank/gziper"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/raintank/met"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/raintank/misc"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/raintank/schema"
+  branch = "deprecate-gopkg-in"
 
 [[constraint]]
   name = "github.com/raintank/worldping-api"
+  revision = "66b28f1160d1e0d7d236b5bd96a5d8eee627357c"
 
 [[constraint]]
   name = "github.com/rakyll/globalconf"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/rs/cors"
   version = "1.0.0"
 
 [[constraint]]
   name = "github.com/sergi/go-diff"
+  version = "v1.0.0"
 
 [[constraint]]
   name = "github.com/smartystreets/goconvey"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/syndtr/goleveldb"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/tinylib/msgp"
@@ -145,9 +168,6 @@
   name = "gopkg.in/macaron.v1"
   version = "1.1.8"
 
-[[constraint]]
-  name = "gopkg.in/raintank/schema.v1"
-
 [[constraint]]
   name = "github.com/prometheus/prometheus"
   version = "2.1.0"

api/ccache_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/grafana/metrictank/mdata"
 	"github.com/grafana/metrictank/mdata/cache"
 	"github.com/grafana/metrictank/test"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func newSrv(delSeries, delArchives int) (*Server, *cache.MockCache) {

api/dataprocessor.go

@@ -17,8 +17,8 @@ import (
 	"github.com/grafana/metrictank/util"
 	opentracing "github.com/opentracing/opentracing-go"
 	tags "github.com/opentracing/opentracing-go/ext"
+	"github.com/raintank/schema"
 	"github.com/raintank/worldping-api/pkg/log"
-	"gopkg.in/raintank/schema.v1"
 )
 
 // doRecover is the handler that turns panics into returns from the top level of getTarget.

api/dataprocessor_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/grafana/metrictank/mdata/cache/accnt"
 	"github.com/grafana/metrictank/mdata/chunk"
 	"github.com/grafana/metrictank/test"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func init() {

api/graphite.go

@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/raintank/schema"
 	macaron "gopkg.in/macaron.v1"
-	schema "gopkg.in/raintank/schema.v1"
 
 	"github.com/grafana/metrictank/api/middleware"
 	"github.com/grafana/metrictank/api/models"

api/init.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/grafana/metrictank/expr"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 // default size is probably bigger than what most responses need, but it saves [re]allocations

api/models/node.go

@@ -3,7 +3,7 @@ package models
 import (
 	"github.com/grafana/metrictank/cluster"
 	opentracing "github.com/opentracing/opentracing-go"
-	schema "gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 type NodeStatus struct {

api/models/request.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 
-	schema "gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 
 	"github.com/grafana/metrictank/cluster"
 	"github.com/grafana/metrictank/consolidation"

api/models/series.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/grafana/metrictank/consolidation"
 	pickle "github.com/kisielk/og-rek"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 //go:generate msgp

api/models/series_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func TestJsonMarshal(t *testing.T) {

api/prometheus.go

@@ -17,7 +17,7 @@ import (
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage"
-	schema "gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 type orgID string

api/response/fast_json_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/grafana/metrictank/api/models"
 	"github.com/grafana/metrictank/idx"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func TestFastJson(t *testing.T) {

api/response/json_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/grafana/metrictank/api/models"
 	"github.com/grafana/metrictank/idx"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func TestJson(t *testing.T) {

api/response/msgp_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/metrictank/api/models"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func BenchmarkHttpRespMsgpEmptySeries(b *testing.B) {

api/response/msgpack_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/metrictank/api/models"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func BenchmarkHttpRespMsgpackEmptySeries(b *testing.B) {

api/response/pickle_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/metrictank/api/models"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func BenchmarkHttpRespPickleEmptySeries(b *testing.B) {

api/response/response_test.go

@@ -2,7 +2,7 @@ package response
 
 import (
 	"github.com/grafana/metrictank/api/models"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 type series struct {

batch/aggregator.go

@@ -4,7 +4,7 @@ package batch
 
 // aggregation functions for batches of data
 import (
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 	"math"
 	"sort"
 )

cluster/partitioner/partitioner.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/Shopify/sarama"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 type Partitioner interface {

cmd/mt-index-cat/main.go

@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/metrictank/cmd/mt-index-cat/out"
 	"github.com/grafana/metrictank/idx/cassandra"
 	"github.com/raintank/dur"
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 func perror(err error) {

cmd/mt-index-cat/out/out.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	"gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 )
 
 var QueryTime int64

cmd/mt-index-migrate/main.go

@@ -10,8 +10,8 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/grafana/metrictank/cluster/partitioner"
 	"github.com/grafana/metrictank/util"
+	"github.com/raintank/schema"
 	"github.com/raintank/worldping-api/pkg/log"
-	"gopkg.in/raintank/schema.v1"
 )
 
 var (

cmd/mt-kafka-mdm-sniff-out-of-order/main.go

@@ -15,10 +15,10 @@ import (
 
 	inKafkaMdm "github.com/grafana/metrictank/input/kafkamdm"
 	"github.com/grafana/metrictank/stats"
+	"github.com/raintank/schema"
+	"github.com/raintank/schema/msg"
 	"github.com/raintank/worldping-api/pkg/log"
 	"github.com/rakyll/globalconf"
-	"gopkg.in/raintank/schema.v1"
-	"gopkg.in/raintank/schema.v1/msg"
 )
 
 var (

cmd/mt-kafka-mdm-sniff/main.go

@@ -15,10 +15,10 @@ import (
 
 	inKafkaMdm "github.com/grafana/metrictank/input/kafkamdm"
 	"github.com/grafana/metrictank/stats"
+	"github.com/raintank/schema"
+	"github.com/raintank/schema/msg"
 	"github.com/raintank/worldping-api/pkg/log"
 	"github.com/rakyll/globalconf"
-	"gopkg.in/raintank/schema.v1"
-	"gopkg.in/raintank/schema.v1/msg"
 )
 
 var (

cmd/mt-store-cat/main.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	schema "gopkg.in/raintank/schema.v1"
+	"github.com/raintank/schema"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/grafana/metrictank/conf"