Skip to content

Commit a6c34a2

Browse files
DieterbeDieterbe
committed
just use dep instead of gopkg.in to pin raintank/schema
1 parent ba37313 commit a6c34a2

File tree

134 files changed

+628
-133
lines changed

Some content is hidden

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

134 files changed

+628
-133
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ unused-packages = true
124124
name = "github.com/raintank/misc"
125125
branch = "master"
126126

127+
[[constraint]]
128+
name = "github.com/raintank/schema"
129+
revision = "78381f04d5c0d113b4dc28ac30d6a8a34d4bc1dc"
130+
127131
[[constraint]]
128132
name = "github.com/raintank/worldping-api"
129133
revision = "66b28f1160d1e0d7d236b5bd96a5d8eee627357c"
@@ -164,10 +168,6 @@ unused-packages = true
164168
name = "gopkg.in/macaron.v1"
165169
version = "1.1.8"
166170

167-
[[constraint]]
168-
name = "gopkg.in/raintank/schema.v1"
169-
branch = "master"
170-
171171
[[constraint]]
172172
name = "github.com/prometheus/prometheus"
173173
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"

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

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

8-
schema "gopkg.in/raintank/schema.v1"
8+
"github.com/raintank/schema"
99

1010
"github.com/grafana/metrictank/store/cassandra"
1111
)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/grafana/metrictank/api"
1111
"github.com/grafana/metrictank/mdata/chunk"
1212
"github.com/grafana/metrictank/store/cassandra"
13-
"gopkg.in/raintank/schema.v1"
13+
"github.com/raintank/schema"
1414
)
1515

1616
func points(ctx context.Context, store *cassandra.CassandraStore, tables []cassandra.Table, metrics []Metric, fromUnix, toUnix, fix uint32) {

‎cmd/mt-whisper-importer-reader/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/grafana/metrictank/mdata/chunk"
2424
"github.com/grafana/metrictank/mdata/chunk/archive"
2525
"github.com/kisielk/whisper-go/whisper"
26-
"gopkg.in/raintank/schema.v1"
26+
"github.com/raintank/schema"
2727
)
2828

2929
var (

‎cmd/mt-whisper-importer-writer/main.go

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

13-
schema "gopkg.in/raintank/schema.v1"
13+
"github.com/raintank/schema"
1414

1515
log "github.com/Sirupsen/logrus"
1616
"github.com/gocql/gocql"

‎conf/retention.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strconv"
77
"strings"
88

9-
schema "gopkg.in/raintank/schema.v1"
9+
"github.com/raintank/schema"
1010

1111
"github.com/grafana/metrictank/mdata/chunk"
1212
"github.com/raintank/dur"

‎consolidation/consolidate.go

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

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

99
// ConsolidateContext wraps a Consolidate() call with a context.Context condition

‎consolidation/consolidate_test.go

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

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

1010
type testCase struct {

‎consolidation/consolidation.go

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

8-
schema "gopkg.in/raintank/schema.v1"
8+
"github.com/raintank/schema"
99

1010
"github.com/grafana/metrictank/batch"
1111
)

‎expr/data_test.go

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

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

99
var a = []schema.Point{

‎expr/func_aggregate.go

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

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

1010
type FuncAggregate struct {

‎expr/func_aggregate_test.go

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

88
"github.com/grafana/metrictank/api/models"
99
"github.com/grafana/metrictank/test"
10-
"gopkg.in/raintank/schema.v1"
10+
"github.com/raintank/schema"
1111
)
1212

1313
func TestAggregateIdentity(t *testing.T) {

‎expr/func_alias_test.go

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

88
"github.com/grafana/metrictank/api/models"
9-
"gopkg.in/raintank/schema.v1"
9+
"github.com/raintank/schema"
1010
)
1111

1212
func TestAliasSingle(t *testing.T) {

0 commit comments

Comments
 (0)