Vendor go updates (#119)

* bump vendor deps

Signed-off-by: John Seekins <[email protected]>

* update go versions, fix a few bugs in tests, and use buildx for build (better logging0

Signed-off-by: John Seekins <[email protected]>

* bump dependencies again - (buster -> bullseye, alpine update, Golang update, vendor updates)

Signed-off-by: John Seekins <[email protected]>

* add missing files

Signed-off-by: John Seekins <[email protected]>

* fix CI

Signed-off-by: John Seekins <[email protected]>

* nicer output for tests

Signed-off-by: John Seekins <[email protected]>

---------

Signed-off-by: John Seekins <[email protected]>
Signed-off-by: John Seekins <[email protected]>
Co-authored-by: John Seekins <[email protected]>

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.17
+ go-version: 1.20.6
 
  - name: Build
  run: go build -v ./...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19.1-alpine as build
+FROM golang:1.20.6-alpine as build
 WORKDIR /src/prometheus-kafka-adapter
 
 COPY go.mod go.sum vendor *.go ./
@@ -8,7 +8,7 @@ ADD . /src/prometheus-kafka-adapter
 RUN apk add --no-cache gcc musl-dev
 RUN go build -ldflags='-w -s -extldflags "-static"' -tags musl,static,netgo -mod=vendor -o /prometheus-kafka-adapter
 
-FROM alpine:3.16
+FROM alpine:3.18
 
 COPY schemas/metric.avsc /schemas/metric.avsc
 COPY --from=build /prometheus-kafka-adapter /

Makefile

@@ -1,7 +1,7 @@
 NAME := prometheus-kafka-adapter
 PACKAGE_NAME := github.com/Telefonica/prometheus-kafka-adapter
-GO_VER := 1.19.1
-LIBC_GO_VER := $(GO_VER)-buster
+GO_VER := 1.20.6
+LIBC_GO_VER := $(GO_VER)-bullseye
 MUSL_GO_VER := $(GO_VER)-alpine
 
 all: fmt test build

go.mod

@@ -1,48 +1,54 @@
 module github.com/Telefonica/prometheus-kafka-adapter
 
-go 1.17
+go 1.20
 
 require (
  github.com/confluentinc/confluent-kafka-go v1.9.2
- github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
- github.com/gin-gonic/gin v1.8.1
+ github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2
+ github.com/gin-gonic/gin v1.9.1
  github.com/gogo/protobuf v1.3.2
  github.com/golang/snappy v0.0.4
  github.com/linkedin/goavro v2.1.0+incompatible
- github.com/prometheus/client_golang v1.13.0
- github.com/prometheus/client_model v0.2.0
- github.com/prometheus/common v0.37.0
- github.com/prometheus/prometheus v0.38.0
- github.com/sirupsen/logrus v1.9.0
- github.com/stretchr/testify v1.8.0
+ github.com/prometheus/client_golang v1.16.0
+ github.com/prometheus/client_model v0.4.0
+ github.com/prometheus/common v0.44.0
+ github.com/prometheus/prometheus v0.46.0
+ github.com/sirupsen/logrus v1.9.3
+ github.com/stretchr/testify v1.8.4
  gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
  github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
- github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/bytedance/sonic v1.9.1 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+ github.com/gabriel-vasile/mimetype v1.4.2 // indirect
  github.com/gin-contrib/sse v0.1.0 // indirect
- github.com/go-playground/locales v0.14.0 // indirect
- github.com/go-playground/universal-translator v0.18.0 // indirect
- github.com/go-playground/validator/v10 v10.10.0 // indirect
- github.com/goccy/go-json v0.9.7 // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/go-playground/locales v0.14.1 // indirect
+ github.com/go-playground/universal-translator v0.18.1 // indirect
+ github.com/go-playground/validator/v10 v10.14.0 // indirect
+ github.com/goccy/go-json v0.10.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/leodido/go-urn v1.2.1 // indirect
- github.com/mattn/go-isatty v0.0.14 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+ github.com/leodido/go-urn v1.2.4 // indirect
+ github.com/mattn/go-isatty v0.0.19 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/pelletier/go-toml/v2 v2.0.1 // indirect
- github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/procfs v0.8.0 // indirect
- github.com/ugorji/go/codec v1.2.7 // indirect
- golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
- golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
- golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
- golang.org/x/text v0.3.7 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+ github.com/prometheus/procfs v0.11.0 // indirect
+ github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+ github.com/ugorji/go/codec v1.2.11 // indirect
+ golang.org/x/arch v0.3.0 // indirect
+ golang.org/x/crypto v0.11.0 // indirect
+ golang.org/x/net v0.12.0 // indirect
+ golang.org/x/sys v0.10.0 // indirect
+ golang.org/x/text v0.11.0 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/linkedin/goavro.v1 v1.0.5 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
 )