Skip to content

Commit 032f363

Browse files
authored
Upgrade Librdkafka (digitalocean#13)
* Fix flakiness in kafkaconsumer recovery integration test * Use librdkafka and confluent-kafka-go 1.3.0
1 parent 68d5935 commit 032f363

File tree

5 files changed

+22
-359
lines changed

5 files changed

+22
-359
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ script: make cover
1212
before_install:
1313
- sudo apt-get install -y curl wget software-properties-common apt-transport-https ca-certificates gnupg2
1414
- sudo curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
15-
- sudo wget -qO - https://packages.confluent.io/deb/5.3/archive.key | sudo apt-key add -
16-
- sudo add-apt-repository "deb [arch=amd64] https://packages.confluent.io/deb/5.3 stable main"
15+
- sudo wget -qO - https://packages.confluent.io/deb/5.4/archive.key | sudo apt-key add -
16+
- sudo add-apt-repository "deb [arch=amd64] https://packages.confluent.io/deb/5.4 stable main"
1717
- sudo apt-get update
1818
- sudo apt-get install -y librdkafka1 librdkafka-dev

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ firebolt app (or working on firebolt itself), install it following the
9696

9797
An example for debian-based distros:
9898
```
99-
sudo wget -qO - https://packages.confluent.io/deb/5.3/archive.key | sudo apt-key add -
100-
sudo add-apt-repository "deb [arch=amd64] https://packages.confluent.io/deb/5.3 stable main"
99+
sudo wget -qO - https://packages.confluent.io/deb/5.4/archive.key | sudo apt-key add -
100+
sudo add-apt-repository "deb [arch=amd64] https://packages.confluent.io/deb/5.4 stable main"
101101
sudo apt-get update
102102
sudo apt-get install -y librdkafka1 librdkafka-dev
103103
```

go.mod

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,28 @@ go 1.13
44

55
require (
66
github.com/Comcast/go-leaderelection v0.0.0-20181102191523-272fd9e2bddc
7-
github.com/OpenPeeDeeP/depguard v1.0.1 // indirect
8-
github.com/confluentinc/confluent-kafka-go v1.1.0
7+
github.com/confluentinc/confluent-kafka-go v1.3.0
98
github.com/digitalocean/captainslog v0.0.0-20190610170928-cd175de8a6e2
10-
github.com/fatih/color v1.7.0 // indirect
11-
github.com/fogleman/gg v1.3.0 // indirect
12-
github.com/go-critic/go-critic v0.4.0 // indirect
13-
github.com/gogo/protobuf v1.3.1 // indirect
14-
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
15-
github.com/golang/mock v1.3.1 // indirect
16-
github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect
17-
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect
18-
github.com/golangci/golangci-lint v1.18.0 // indirect
19-
github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect
209
github.com/google/go-cmp v0.3.1 // indirect
21-
github.com/gostaticanalysis/analysisutil v0.0.3 // indirect
22-
github.com/jpoles1/gopherbadger v2.1.2-0.20190213200623-1f4eedb7a3f6+incompatible // indirect
2310
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
11+
github.com/kr/pretty v0.1.0 // indirect
2412
github.com/mailru/easyjson v0.7.0 // indirect
25-
github.com/mattn/go-colorable v0.1.4 // indirect
26-
github.com/mattn/go-isatty v0.0.11 // indirect
27-
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
2813
github.com/olivere/elastic/v7 v7.0.6
29-
github.com/pelletier/go-toml v1.6.0 // indirect
14+
github.com/pkg/errors v0.9.1 // indirect
3015
github.com/prometheus/client_golang v1.1.0
3116
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
3217
github.com/prometheus/procfs v0.0.4 // indirect
3318
github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
3419
github.com/sirupsen/logrus v1.4.2
35-
github.com/spf13/afero v1.2.2 // indirect
36-
github.com/spf13/cast v1.3.1 // indirect
37-
github.com/spf13/cobra v0.0.5 // indirect
38-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
39-
github.com/spf13/pflag v1.0.5 // indirect
40-
github.com/spf13/viper v1.6.1 // indirect
4120
github.com/stretchr/objx v0.2.0 // indirect
4221
github.com/stretchr/testify v1.4.0
4322
github.com/tidwall/gjson v1.2.1 // indirect
4423
github.com/tidwall/match v1.0.1 // indirect
4524
github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 // indirect
46-
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e // indirect
47-
github.com/ultraware/funlen v0.0.2 // indirect
48-
golang.org/x/image v0.0.0-20191214001246-9130b4cfad52 // indirect
49-
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f // indirect
50-
golang.org/x/text v0.3.2 // indirect
25+
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
5126
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
52-
golang.org/x/tools v0.0.0-20191220191006-75f8c4427ce5 // indirect
53-
gopkg.in/yaml.v2 v2.2.7
54-
mvdan.cc/unparam v0.0.0-20191111180625-960b1ec0f2c2 // indirect
55-
sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
27+
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
28+
gopkg.in/yaml.v2 v2.2.8
5629
)
5730

5831
replace git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

0 commit comments

Comments
 (0)