Skip to content

Commit b519a9c

Browse files
tomwilkietomwilkie
committed
Update zipkin opentracing to remove problematic underscope from dir name.
Also involved updating / pinning a bunch of other dependancies.
1 parent b01754d commit b519a9c

File tree

265 files changed

+10234
-6076
lines changed

Some content is hidden

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

265 files changed

+10234
-6076
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

+16
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,19 @@
1313
name = "github.com/prometheus/prometheus"
1414
source = "github.com/weaveworks-experiments/prometheus"
1515
branch = "scrape-callback"
16+
17+
[[override]]
18+
name = "github.com/Azure/azure-sdk-for-go"
19+
revision = "bd73d950fa4440dae889bd9917bff7cef539f86e"
20+
21+
[[override]]
22+
name = "github.com/Azure/go-autorest"
23+
revision = "8a25372bbfec739b8719a9e3987400d15ef9e179"
24+
25+
[[override]]
26+
name = "github.com/ugorji/go"
27+
revision = "708a42d246822952f38190a8d8c4e6b16a0e600c"
28+
29+
[[override]]
30+
name = "github.com/apache/thrift"
31+
branch = "master"

‎pkg/api/conv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net"
99
_ "unsafe" // For math.Float64frombits
1010

11-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
11+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
1212

1313
"github.com/weaveworks-experiments/loki/pkg/storage"
1414
)

‎pkg/client/collector.go

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

1010
"github.com/apache/thrift/lib/go/thrift"
11-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
11+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
1212
)
1313

1414
// Want to be able to support a service doing 100 QPS with a 15s scrape interval

‎pkg/client/collector_test.go

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

1010
"github.com/davecgh/go-spew/spew"
11-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
11+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
1212
"github.com/pmezard/go-difflib/difflib"
1313
)
1414

‎pkg/scraper/scraper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strconv"
99
"time"
1010

11-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
11+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
1212
"github.com/prometheus/common/model"
1313
"github.com/prometheus/prometheus/config"
1414
"github.com/prometheus/prometheus/retrieval"

‎pkg/storage/boltdb.go

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

66
"github.com/apache/thrift/lib/go/thrift"
77
"github.com/boltdb/bolt"
8-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
8+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
99
"github.com/sburnett/lexicographic-tuples"
1010
"github.com/willf/bloom"
1111
)

‎pkg/storage/in_memory.go

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

7-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
7+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
88
log "github.com/sirupsen/logrus"
99
)
1010

‎pkg/storage/merge.go

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

7-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
7+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
88
)
99

1010
func mergeStringLists(a, b []string) []string {

‎pkg/storage/mutable_block.go

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

6-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
6+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
77
)
88

99
type mutableBlock struct {

‎pkg/storage/storage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package storage
22

33
import (
4-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
4+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
55
)
66

77
type SpanStore interface {

‎pkg/storage/trace.go

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

6-
"github.com/openzipkin/zipkin-go-opentracing/_thrift/gen-go/zipkincore"
6+
"github.com/openzipkin/zipkin-go-opentracing/thrift/gen-go/zipkincore"
77
log "github.com/sirupsen/logrus"
88
)
99

‎vendor/github.com/Azure/go-autorest/CHANGELOG.md

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

‎vendor/github.com/Azure/go-autorest/README.md

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

‎vendor/github.com/Azure/go-autorest/autorest/autorest.go

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

‎vendor/github.com/Azure/go-autorest/autorest/azure/async.go

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

‎vendor/github.com/Azure/go-autorest/autorest/azure/async_test.go

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

0 commit comments

Comments
 (0)