Skip to content

Commit b44a9b3

Browse files
authored
Merge pull request #565 from fabiolb/update-go-mod-for-pr-472
Update go.mod for #472
2 parents d63d7d4 + 4cc3523 commit b44a9b3

166 files changed

Lines changed: 12534 additions & 6388 deletions

File tree

Some content is hidden

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

config/config.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,18 @@ import (
77
)
88

99
type Config struct {
10-
1110
Proxy Proxy
1211
Registry Registry
1312
Listen []Listen
1413
Log Log
1514
Metrics Metrics
1615
UI UI
1716
Runtime Runtime
18-
Tracing Tracing
17+
Tracing Tracing
1918
ProfileMode string
2019
ProfilePath string
2120
Insecure bool
2221
GlobMatchingDisabled bool
23-
24-
2522
}
2623

2724
type CertSource struct {
@@ -160,4 +157,3 @@ type Tracing struct {
160157
SamplerRate float64
161158
SpanHost string
162159
}
163-

config/default.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,4 @@ var defaultConfig = &Config{
8888
SamplerRate: -1,
8989
SpanHost: "localhost:9998",
9090
},
91-
9291
}

config/load.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
196196
f.StringVar(&cfg.Tracing.SpanHost, "tracing.SpanHost", defaultConfig.Tracing.SpanHost, "Host:Port info to add to spans")
197197
f.BoolVar(&cfg.GlobMatchingDisabled, "glob.matching.disabled", defaultConfig.GlobMatchingDisabled, "Disable Glob Matching on routes, one of [true, false]")
198198

199-
200199
// deprecated flags
201200
var proxyLogRoutes string
202201
f.StringVar(&proxyLogRoutes, "proxy.log.routes", "", "deprecated. use log.routes.format instead")

go.mod

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
module github.com/fabiolb/fabio
22

33
require (
4+
github.com/Shopify/sarama v1.19.0 // indirect
5+
github.com/apache/thrift v0.0.0-20181028152738-da1169d75b15 // indirect
46
github.com/armon/go-proxyproto v0.0.0-20150207025855-609d6338d3a7
57
github.com/circonus-labs/circonus-gometrics v1.0.0
68
github.com/circonus-labs/circonusllhist v0.0.0-20160526043813-d724266ae527 // indirect
79
github.com/cyberdelia/go-metrics-graphite v0.0.0-20150826032200-b8345b7f01d5
10+
github.com/davecgh/go-spew v1.1.1 // indirect
11+
github.com/eapache/go-resiliency v1.1.0 // indirect
12+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
13+
github.com/eapache/queue v1.1.0 // indirect
814
github.com/fatih/structs v0.0.0-20160601093117-5ada2f449b10 // indirect
15+
github.com/go-logfmt/logfmt v0.3.0 // indirect
916
github.com/gobwas/glob v0.0.0-20180208211842-19c076cdf202
17+
github.com/gogo/protobuf v1.1.1 // indirect
18+
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
1019
github.com/hashicorp/consul v0.8.0
1120
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
1221
github.com/hashicorp/go-cleanhttp v0.0.0-20160407174126-ad28ea4487f0 // indirect
@@ -16,10 +25,15 @@ require (
1625
github.com/hashicorp/hcl v0.0.0-20160607001940-d7400db7143f // indirect
1726
github.com/hashicorp/serf v0.7.0 // indirect
1827
github.com/hashicorp/vault v0.6.0
28+
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
1929
github.com/magiconair/properties v0.0.0-20171031211101-49d762b9817b
2030
github.com/mitchellh/go-homedir v0.0.0-20160606030122-1111e456ffea // indirect
2131
github.com/mitchellh/mapstructure v0.0.0-20160212031839-d2dd02622084 // indirect
32+
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
33+
github.com/opentracing/opentracing-go v1.0.2
34+
github.com/openzipkin/zipkin-go-opentracing v0.3.4
2235
github.com/pascaldekloe/goe v0.0.0-20150719195608-f99183613f48
36+
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
2337
github.com/pkg/profile v1.2.1
2438
github.com/pubnub/go-metrics-statsd v0.0.0-20170124014003-7da61f429d6b
2539
github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165

go.sum

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s=
2+
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
3+
github.com/apache/thrift v0.0.0-20181028152738-da1169d75b15 h1:QMpU5E8/FWWRvfhkkX/R6hwoMbvVAV89qdKV/vfJogw=
4+
github.com/apache/thrift v0.0.0-20181028152738-da1169d75b15/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
15
github.com/armon/go-proxyproto v0.0.0-20150207025855-609d6338d3a7 h1:AuTQOaYRBRtfDwY9ksr2sLXBgNvI5Mi6nhPdKdLE8Uw=
26
github.com/armon/go-proxyproto v0.0.0-20150207025855-609d6338d3a7/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU=
37
github.com/circonus-labs/circonus-gometrics v0.0.0-20160830164725-f8c68ed96a06 h1:DHdPk46/oiLoYPQ7Dt10pRx74HaJVoyjS5Ea7eyROes=
@@ -8,10 +12,22 @@ github.com/circonus-labs/circonusllhist v0.0.0-20160526043813-d724266ae527 h1:g5
812
github.com/circonus-labs/circonusllhist v0.0.0-20160526043813-d724266ae527/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
913
github.com/cyberdelia/go-metrics-graphite v0.0.0-20150826032200-b8345b7f01d5 h1:TYSgSeiA3LfBi6son0KgHb4wcTXV1kB5wZtTorXQ914=
1014
github.com/cyberdelia/go-metrics-graphite v0.0.0-20150826032200-b8345b7f01d5/go.mod h1:xwIwAxMvYnVrGJPe2FKx5prTrnAjGOD8zvDOnxnrrkM=
15+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
16+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
17+
github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU=
18+
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
19+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
20+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
21+
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
22+
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
1123
github.com/fatih/structs v0.0.0-20160601093117-5ada2f449b10 h1:ajF8LGnOEaXJZD9XGNIawJ55pmntNqLiKdEFXo9/Bnk=
1224
github.com/fatih/structs v0.0.0-20160601093117-5ada2f449b10/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
25+
github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic=
26+
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
1327
github.com/gobwas/glob v0.0.0-20180208211842-19c076cdf202 h1:XcHVP1KCiY3CQI5oi8+7pRPD/5dC2NbhGZLn5CFGO74=
1428
github.com/gobwas/glob v0.0.0-20180208211842-19c076cdf202/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
29+
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
30+
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
1531
github.com/hashicorp/consul v0.8.0 h1:Z/JG7b8Djn1v4LwLT9YWSTrxMQwTidzT1sD6rJYF9Pc=
1632
github.com/hashicorp/consul v0.8.0/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI=
1733
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4=
@@ -30,14 +46,24 @@ github.com/hashicorp/serf v0.7.0 h1:9NBx0ZSoEtMrWrNf2ByXsmoKcpJyHIU7xGU/itMCtkg=
3046
github.com/hashicorp/serf v0.7.0/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE=
3147
github.com/hashicorp/vault v0.6.0 h1:wc/KN2SZ76imak5yOF4Utm6p0e4BNtSKLhWlYrzX+vQ=
3248
github.com/hashicorp/vault v0.6.0/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0=
49+
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
50+
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
3351
github.com/magiconair/properties v0.0.0-20171031211101-49d762b9817b h1:bR3tkU6ocnK5a0NsdgTMWc7sILt+BY0PceUYC6EpSqc=
3452
github.com/magiconair/properties v0.0.0-20171031211101-49d762b9817b/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
3553
github.com/mitchellh/go-homedir v0.0.0-20160606030122-1111e456ffea h1:6vbWobCwqTqcqPXwGOyVXdwdINhgsh7rEueNhT/89kM=
3654
github.com/mitchellh/go-homedir v0.0.0-20160606030122-1111e456ffea/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
3755
github.com/mitchellh/mapstructure v0.0.0-20160212031839-d2dd02622084 h1:Z2EJ6SUYrzx6J/YH/ltZthkUQTB/5+Ykpkew6y9DGJE=
3856
github.com/mitchellh/mapstructure v0.0.0-20160212031839-d2dd02622084/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
57+
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU=
58+
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
59+
github.com/opentracing/opentracing-go v1.0.2 h1:3jA2P6O1F9UOrWVpwrIo17pu01KWvNWg4X946/Y5Zwg=
60+
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
61+
github.com/openzipkin/zipkin-go-opentracing v0.3.4 h1:x/pBv/5VJNWkcHF1G9xqhug8Iw7X1y1zOMzDmyuvP2g=
62+
github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE=
3963
github.com/pascaldekloe/goe v0.0.0-20150719195608-f99183613f48 h1:8y3keSPOPy5pszxfE4wtwlAKuuIde8X6zcto98U4RYw=
4064
github.com/pascaldekloe/goe v0.0.0-20150719195608-f99183613f48/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
65+
github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
66+
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
4167
github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE=
4268
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
4369
github.com/pubnub/go-metrics-statsd v0.0.0-20170124014003-7da61f429d6b h1:xCVl8I01z+W/Q+z7napcXRrOhsFzxmYLiBxigDbNQcg=

vendor/github.com/Shopify/sarama/.gitignore

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Shopify/sarama/.travis.yml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Shopify/sarama/CHANGELOG.md

Lines changed: 132 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Shopify/sarama/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Shopify/sarama/Makefile

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)