Skip to content

Commit c78701f

Browse files
Revert "Bump jaeger version with thrift 0.13 (#1203)" (#1248)
This reverts commit 1e6596b. Reverting because it prevents Contrib from building and blocks the release.
1 parent 5e78b2b commit c78701f

File tree

4 files changed

+127
-161
lines changed

4 files changed

+127
-161
lines changed

go.mod

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require (
77
contrib.go.opencensus.io/exporter/ocagent v0.6.0
88
contrib.go.opencensus.io/exporter/prometheus v0.1.0
99
contrib.go.opencensus.io/resource v0.1.2
10-
github.com/apache/thrift v0.13.0
10+
github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
1111
github.com/cenkalti/backoff v2.2.1+incompatible
1212
github.com/census-instrumentation/opencensus-proto v0.2.1
1313
github.com/client9/misspell v0.3.4
14-
github.com/go-kit/kit v0.10.0
14+
github.com/go-kit/kit v0.9.0
1515
github.com/gogo/googleapis v1.3.0 // indirect
1616
github.com/gogo/protobuf v1.3.1
1717
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
@@ -21,20 +21,21 @@ require (
2121
github.com/google/go-github v17.0.0+incompatible
2222
github.com/google/uuid v1.1.1
2323
github.com/gorilla/mux v1.7.4
24-
github.com/grpc-ecosystem/grpc-gateway v1.14.6
25-
github.com/jaegertracing/jaeger v1.18.2-0.20200626141145-be17169a4179
24+
github.com/grpc-ecosystem/grpc-gateway v1.14.5
25+
github.com/hashicorp/consul/api v1.2.0 // indirect
26+
github.com/jaegertracing/jaeger v1.18.0
2627
github.com/joshdk/go-junit v0.0.0-20200312181801-e5d93c0f31a8
27-
github.com/jstemmer/go-junit-report v0.9.1
28+
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024
2829
github.com/mjibson/esc v0.2.0
2930
github.com/open-telemetry/opentelemetry-proto v0.3.0
30-
github.com/openzipkin/zipkin-go v0.2.2
31+
github.com/openzipkin/zipkin-go v0.2.1
3132
github.com/orijtech/prometheus-go-metrics-exporter v0.0.5
3233
github.com/ory/go-acc v0.2.1
3334
github.com/ory/x v0.0.109 // indirect
3435
github.com/pavius/impi v0.0.0-20180302134524-c1cbdcb8df2b
3536
github.com/pkg/errors v0.9.1
3637
github.com/prometheus/client_golang v1.5.1
37-
github.com/prometheus/common v0.10.0
38+
github.com/prometheus/common v0.9.1
3839
github.com/prometheus/procfs v0.0.11
3940
github.com/prometheus/prometheus v1.8.2-0.20190924101040-52e0504f83ea
4041
github.com/rs/cors v1.7.0
@@ -49,14 +50,16 @@ require (
4950
github.com/tcnksm/ghr v0.13.0
5051
github.com/uber/jaeger-lib v2.2.0+incompatible
5152
go.opencensus.io v0.22.3
52-
go.uber.org/atomic v1.6.0
53+
go.uber.org/atomic v1.5.1
5354
go.uber.org/zap v1.13.0
54-
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
55-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
56-
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980
55+
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
56+
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
57+
golang.org/x/sys v0.0.0-20200408040146-ea54a3c99b9b
5758
golang.org/x/text v0.3.2
58-
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
59+
golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect
60+
google.golang.org/api v0.10.0 // indirect
61+
google.golang.org/genproto v0.0.0-20200408120641-fbb3ad325eb7
5962
google.golang.org/grpc v1.29.1
60-
gopkg.in/yaml.v2 v2.3.0
63+
gopkg.in/yaml.v2 v2.2.8
6164
honnef.co/go/tools v0.0.1-2020.1.3
6265
)

0 commit comments

Comments
 (0)