Skip to content

Commit 0746efc

Browse files
johnseekinsJohn Seekins
and
John Seekins
authored
Vendor go updates (#119)
* bump vendor deps Signed-off-by: John Seekins <john@civiceagle.com> * update go versions, fix a few bugs in tests, and use buildx for build (better logging0 Signed-off-by: John Seekins <john@civiceagle.com> * bump dependencies again - (buster -> bullseye, alpine update, Golang update, vendor updates) Signed-off-by: John Seekins <john@robot-house.us> * add missing files Signed-off-by: John Seekins <john@robot-house.us> * fix CI Signed-off-by: John Seekins <john@robot-house.us> * nicer output for tests Signed-off-by: John Seekins <john@robot-house.us> --------- Signed-off-by: John Seekins <john@civiceagle.com> Signed-off-by: John Seekins <john@robot-house.us> Co-authored-by: John Seekins <john@civiceagle.com>
1 parent 6a1dbf5 commit 0746efc

File tree

878 files changed

+240527
-18444
lines changed

Some content is hidden

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

878 files changed

+240527
-18444
lines changed

.github/workflows/go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.17
19+
go-version: 1.20.6
2020

2121
- name: Build
2222
run: go build -v ./...

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.1-alpine as build
1+
FROM golang:1.20.6-alpine as build
22
WORKDIR /src/prometheus-kafka-adapter
33

44
COPY go.mod go.sum vendor *.go ./
@@ -8,7 +8,7 @@ ADD . /src/prometheus-kafka-adapter
88
RUN apk add --no-cache gcc musl-dev
99
RUN go build -ldflags='-w -s -extldflags "-static"' -tags musl,static,netgo -mod=vendor -o /prometheus-kafka-adapter
1010

11-
FROM alpine:3.16
11+
FROM alpine:3.18
1212

1313
COPY schemas/metric.avsc /schemas/metric.avsc
1414
COPY --from=build /prometheus-kafka-adapter /

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NAME := prometheus-kafka-adapter
22
PACKAGE_NAME := github.com/Telefonica/prometheus-kafka-adapter
3-
GO_VER := 1.19.1
4-
LIBC_GO_VER := $(GO_VER)-buster
3+
GO_VER := 1.20.6
4+
LIBC_GO_VER := $(GO_VER)-bullseye
55
MUSL_GO_VER := $(GO_VER)-alpine
66

77
all: fmt test build

go.mod

+34-28
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,54 @@
11
module github.com/Telefonica/prometheus-kafka-adapter
22

3-
go 1.17
3+
go 1.20
44

55
require (
66
github.com/confluentinc/confluent-kafka-go v1.9.2
7-
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
8-
github.com/gin-gonic/gin v1.8.1
7+
github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2
8+
github.com/gin-gonic/gin v1.9.1
99
github.com/gogo/protobuf v1.3.2
1010
github.com/golang/snappy v0.0.4
1111
github.com/linkedin/goavro v2.1.0+incompatible
12-
github.com/prometheus/client_golang v1.13.0
13-
github.com/prometheus/client_model v0.2.0
14-
github.com/prometheus/common v0.37.0
15-
github.com/prometheus/prometheus v0.38.0
16-
github.com/sirupsen/logrus v1.9.0
17-
github.com/stretchr/testify v1.8.0
12+
github.com/prometheus/client_golang v1.16.0
13+
github.com/prometheus/client_model v0.4.0
14+
github.com/prometheus/common v0.44.0
15+
github.com/prometheus/prometheus v0.46.0
16+
github.com/sirupsen/logrus v1.9.3
17+
github.com/stretchr/testify v1.8.4
1818
gopkg.in/yaml.v2 v2.4.0
1919
)
2020

2121
require (
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24-
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/bytedance/sonic v1.9.1 // indirect
24+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
25+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
26+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27+
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
2528
github.com/gin-contrib/sse v0.1.0 // indirect
26-
github.com/go-playground/locales v0.14.0 // indirect
27-
github.com/go-playground/universal-translator v0.18.0 // indirect
28-
github.com/go-playground/validator/v10 v10.10.0 // indirect
29-
github.com/goccy/go-json v0.9.7 // indirect
30-
github.com/golang/protobuf v1.5.2 // indirect
29+
github.com/go-playground/locales v0.14.1 // indirect
30+
github.com/go-playground/universal-translator v0.18.1 // indirect
31+
github.com/go-playground/validator/v10 v10.14.0 // indirect
32+
github.com/goccy/go-json v0.10.2 // indirect
33+
github.com/golang/protobuf v1.5.3 // indirect
3134
github.com/json-iterator/go v1.1.12 // indirect
32-
github.com/leodido/go-urn v1.2.1 // indirect
33-
github.com/mattn/go-isatty v0.0.14 // indirect
34-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
35+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
36+
github.com/leodido/go-urn v1.2.4 // indirect
37+
github.com/mattn/go-isatty v0.0.19 // indirect
38+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3539
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3640
github.com/modern-go/reflect2 v1.0.2 // indirect
37-
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
38-
github.com/pmezard/go-difflib v1.0.0 // indirect
39-
github.com/prometheus/procfs v0.8.0 // indirect
40-
github.com/ugorji/go/codec v1.2.7 // indirect
41-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
42-
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
43-
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
44-
golang.org/x/text v0.3.7 // indirect
45-
google.golang.org/protobuf v1.28.1 // indirect
41+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
42+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
43+
github.com/prometheus/procfs v0.11.0 // indirect
44+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
45+
github.com/ugorji/go/codec v1.2.11 // indirect
46+
golang.org/x/arch v0.3.0 // indirect
47+
golang.org/x/crypto v0.11.0 // indirect
48+
golang.org/x/net v0.12.0 // indirect
49+
golang.org/x/sys v0.10.0 // indirect
50+
golang.org/x/text v0.11.0 // indirect
51+
google.golang.org/protobuf v1.31.0 // indirect
4652
gopkg.in/linkedin/goavro.v1 v1.0.5 // indirect
4753
gopkg.in/yaml.v3 v3.0.1 // indirect
4854
)

0 commit comments

Comments
 (0)