Skip to content
This repository was archived by the owner on Aug 23, 2023. It is now read-only.

Commit cf08cbf

Browse files
DieterbeDieterbe
authored
Merge pull request #1004 from grafana/fix-dep
Fix dep
2 parents 6d9f911 + 9c5f84c commit cf08cbf

File tree

1,623 files changed

+3496
-280524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,623 files changed

+3496
-280524
lines changed

‎Gopkg.lock

+303-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+34-14
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919
# name = "github.com/x/y"
2020
# version = "2.4.0"
2121

22+
[prune]
23+
go-tests = true
24+
non-go = true
25+
unused-packages = true
2226

2327
[[constraint]]
2428
name = "github.com/Dieterbe/artisanalhistogram"
29+
branch = "master"
2530

2631
[[constraint]]
2732
name = "github.com/Dieterbe/profiletrigger"
33+
branch = "master"
2834

2935
[[constraint]]
3036
name = "github.com/Shopify/sarama"
@@ -35,99 +41,116 @@
3541
version = "0.7.3"
3642

3743
[[constraint]]
38-
branch = "master"
3944
name = "github.com/alyu/configparser"
45+
branch = "master"
4046

4147
[[constraint]]
4248
name = "github.com/bitly/go-hostpool"
49+
branch = "master"
4350

4451
[[constraint]]
4552
name = "github.com/davecgh/go-spew"
4653
version = "1.1.0"
4754

4855
[[constraint]]
4956
name = "github.com/dgryski/go-linlog"
57+
branch = "master"
5058

5159
[[constraint]]
5260
name = "github.com/dgryski/go-tsz"
61+
revision = "5f4c484a9e838989c201ff437b3cab59cfdc46c8"
5362

5463
[[constraint]]
5564
name = "github.com/docker/docker"
65+
version = "v1.13.1"
5666

5767
[[constraint]]
5868
name = "github.com/go-macaron/binding"
69+
revision = "a453235199f8898e01647db8820f937a184fbd09"
5970

6071
[[constraint]]
6172
name = "github.com/gocql/gocql"
6273
revision = "d9815cdf0ff24e2efa9b8062f4f94a6dd347ae51"
6374

6475
[[constraint]]
65-
branch = "master"
6676
name = "github.com/golang/snappy"
77+
branch = "master"
6778

6879
[[constraint]]
69-
branch = "master"
7080
name = "github.com/hailocab/go-hostpool"
81+
branch = "master"
7182

7283
[[constraint]]
73-
branch = "master"
7484
name = "github.com/hashicorp/memberlist"
85+
branch = "master"
7586

7687
[[constraint]]
7788
name = "github.com/kisielk/og-rek"
89+
version = "v1.0.0"
7890

7991
[[constraint]]
80-
branch = "master"
8192
name = "github.com/kisielk/whisper-go"
93+
branch = "master"
8294

8395
[[constraint]]
84-
branch = "master"
8596
name = "github.com/metrics20/go-metrics20"
97+
branch = "master"
8698

8799
[[constraint]]
88-
branch = "master"
89100
name = "github.com/mitchellh/go-homedir"
101+
branch = "master"
90102

91103
[[constraint]]
92104
name = "github.com/nsqio/go-nsq"
105+
revision = "642a3f9935f12cb3b747294318d730f56f4c34b4"
93106

94107
[[constraint]]
95108
name = "github.com/opentracing/opentracing-go"
109+
branch = "master"
96110

97111
[[constraint]]
98-
branch = "v2"
99112
name = "github.com/raintank/dur"
113+
branch = "v2"
100114

101115
[[constraint]]
102-
branch = "master"
103116
name = "github.com/raintank/gziper"
117+
branch = "master"
104118

105119
[[constraint]]
106-
branch = "master"
107120
name = "github.com/raintank/met"
121+
branch = "master"
108122

109123
[[constraint]]
110-
branch = "master"
111124
name = "github.com/raintank/misc"
125+
branch = "master"
126+
127+
[[constraint]]
128+
name = "github.com/raintank/schema"
129+
branch = "deprecate-gopkg-in"
112130

113131
[[constraint]]
114132
name = "github.com/raintank/worldping-api"
133+
revision = "66b28f1160d1e0d7d236b5bd96a5d8eee627357c"
115134

116135
[[constraint]]
117136
name = "github.com/rakyll/globalconf"
137+
branch = "master"
118138

119139
[[constraint]]
120140
name = "github.com/rs/cors"
121141
version = "1.0.0"
122142

123143
[[constraint]]
124144
name = "github.com/sergi/go-diff"
145+
version = "v1.0.0"
125146

126147
[[constraint]]
127148
name = "github.com/smartystreets/goconvey"
149+
branch = "master"
128150

129151
[[constraint]]
130152
name = "github.com/syndtr/goleveldb"
153+
branch = "master"
131154

132155
[[constraint]]
133156
name = "github.com/tinylib/msgp"
@@ -145,9 +168,6 @@
145168
name = "gopkg.in/macaron.v1"
146169
version = "1.1.8"
147170

148-
[[constraint]]
149-
name = "gopkg.in/raintank/schema.v1"
150-
151171
[[constraint]]
152172
name = "github.com/prometheus/prometheus"
153173
version = "2.1.0"

‎api/ccache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/grafana/metrictank/mdata"
1717
"github.com/grafana/metrictank/mdata/cache"
1818
"github.com/grafana/metrictank/test"
19-
"gopkg.in/raintank/schema.v1"
19+
"github.com/raintank/schema"
2020
)
2121

2222
func newSrv(delSeries, delArchives int) (*Server, *cache.MockCache) {

‎api/dataprocessor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/grafana/metrictank/util"
1818
opentracing "github.com/opentracing/opentracing-go"
1919
tags "github.com/opentracing/opentracing-go/ext"
20+
"github.com/raintank/schema"
2021
"github.com/raintank/worldping-api/pkg/log"
21-
"gopkg.in/raintank/schema.v1"
2222
)
2323

2424
// doRecover is the handler that turns panics into returns from the top level of getTarget.

‎api/dataprocessor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/grafana/metrictank/mdata/cache/accnt"
1717
"github.com/grafana/metrictank/mdata/chunk"
1818
"github.com/grafana/metrictank/test"
19-
"gopkg.in/raintank/schema.v1"
19+
"github.com/raintank/schema"
2020
)
2121

2222
func init() {

‎api/graphite.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sync"
1111
"time"
1212

13+
"github.com/raintank/schema"
1314
macaron "gopkg.in/macaron.v1"
14-
schema "gopkg.in/raintank/schema.v1"
1515

1616
"github.com/grafana/metrictank/api/middleware"
1717
"github.com/grafana/metrictank/api/models"

‎api/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sync"
55

66
"github.com/grafana/metrictank/expr"
7-
"gopkg.in/raintank/schema.v1"
7+
"github.com/raintank/schema"
88
)
99

1010
// default size is probably bigger than what most responses need, but it saves [re]allocations

‎api/models/node.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package models
33
import (
44
"github.com/grafana/metrictank/cluster"
55
opentracing "github.com/opentracing/opentracing-go"
6-
schema "gopkg.in/raintank/schema.v1"
6+
"github.com/raintank/schema"
77
)
88

99
type NodeStatus struct {

‎api/models/request.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package models
33
import (
44
"fmt"
55

6-
schema "gopkg.in/raintank/schema.v1"
6+
"github.com/raintank/schema"
77

88
"github.com/grafana/metrictank/cluster"
99
"github.com/grafana/metrictank/consolidation"

‎api/models/series.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/grafana/metrictank/consolidation"
1010
pickle "github.com/kisielk/og-rek"
11-
"gopkg.in/raintank/schema.v1"
11+
"github.com/raintank/schema"
1212
)
1313

1414
//go:generate msgp

‎api/models/series_gen.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/models/series_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"gopkg.in/raintank/schema.v1"
7+
"github.com/raintank/schema"
88
)
99

1010
func TestJsonMarshal(t *testing.T) {

‎api/prometheus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/prometheus/prometheus/pkg/labels"
1818
"github.com/prometheus/prometheus/promql"
1919
"github.com/prometheus/prometheus/storage"
20-
schema "gopkg.in/raintank/schema.v1"
20+
"github.com/raintank/schema"
2121
)
2222

2323
type orgID string

‎api/response/fast_json_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/grafana/metrictank/api/models"
1010
"github.com/grafana/metrictank/idx"
11-
"gopkg.in/raintank/schema.v1"
11+
"github.com/raintank/schema"
1212
)
1313

1414
func TestFastJson(t *testing.T) {

‎api/response/json_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/grafana/metrictank/api/models"
1010
"github.com/grafana/metrictank/idx"
11-
"gopkg.in/raintank/schema.v1"
11+
"github.com/raintank/schema"
1212
)
1313

1414
func TestJson(t *testing.T) {

‎api/response/msgp_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/grafana/metrictank/api/models"
8-
"gopkg.in/raintank/schema.v1"
8+
"github.com/raintank/schema"
99
)
1010

1111
func BenchmarkHttpRespMsgpEmptySeries(b *testing.B) {

‎api/response/msgpack_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/grafana/metrictank/api/models"
8-
"gopkg.in/raintank/schema.v1"
8+
"github.com/raintank/schema"
99
)
1010

1111
func BenchmarkHttpRespMsgpackEmptySeries(b *testing.B) {

‎api/response/pickle_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/grafana/metrictank/api/models"
8-
"gopkg.in/raintank/schema.v1"
8+
"github.com/raintank/schema"
99
)
1010

1111
func BenchmarkHttpRespPickleEmptySeries(b *testing.B) {

‎api/response/response_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package response
22

33
import (
44
"github.com/grafana/metrictank/api/models"
5-
"gopkg.in/raintank/schema.v1"
5+
"github.com/raintank/schema"
66
)
77

88
type series struct {

‎batch/aggregator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package batch
44

55
// aggregation functions for batches of data
66
import (
7-
"gopkg.in/raintank/schema.v1"
7+
"github.com/raintank/schema"
88
"math"
99
"sort"
1010
)

‎cluster/partitioner/partitioner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55

66
"github.com/Shopify/sarama"
7-
"gopkg.in/raintank/schema.v1"
7+
"github.com/raintank/schema"
88
)
99

1010
type Partitioner interface {

‎cmd/mt-index-cat/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/grafana/metrictank/cmd/mt-index-cat/out"
1313
"github.com/grafana/metrictank/idx/cassandra"
1414
"github.com/raintank/dur"
15-
"gopkg.in/raintank/schema.v1"
15+
"github.com/raintank/schema"
1616
)
1717

1818
func perror(err error) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/davecgh/go-spew/spew"
1111

12-
"gopkg.in/raintank/schema.v1"
12+
"github.com/raintank/schema"
1313
)
1414

1515
var QueryTime int64

‎cmd/mt-index-migrate/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/gocql/gocql"
1111
"github.com/grafana/metrictank/cluster/partitioner"
1212
"github.com/grafana/metrictank/util"
13+
"github.com/raintank/schema"
1314
"github.com/raintank/worldping-api/pkg/log"
14-
"gopkg.in/raintank/schema.v1"
1515
)
1616

1717
var (

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515

1616
inKafkaMdm "github.com/grafana/metrictank/input/kafkamdm"
1717
"github.com/grafana/metrictank/stats"
18+
"github.com/raintank/schema"
19+
"github.com/raintank/schema/msg"
1820
"github.com/raintank/worldping-api/pkg/log"
1921
"github.com/rakyll/globalconf"
20-
"gopkg.in/raintank/schema.v1"
21-
"gopkg.in/raintank/schema.v1/msg"
2222
)
2323

2424
var (

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515

1616
inKafkaMdm "github.com/grafana/metrictank/input/kafkamdm"
1717
"github.com/grafana/metrictank/stats"
18+
"github.com/raintank/schema"
19+
"github.com/raintank/schema/msg"
1820
"github.com/raintank/worldping-api/pkg/log"
1921
"github.com/rakyll/globalconf"
20-
"gopkg.in/raintank/schema.v1"
21-
"gopkg.in/raintank/schema.v1/msg"
2222
)
2323

2424
var (

‎cmd/mt-store-cat/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
schema "gopkg.in/raintank/schema.v1"
12+
"github.com/raintank/schema"
1313

1414
log "github.com/Sirupsen/logrus"
1515
"github.com/grafana/metrictank/conf"

0 commit comments

Comments
 (0)