Upgrade GoLang version and Prometheus client module (#132)

datastax · Nov 8, 2024 · 84e9db9 · 84e9db9
1 parent 7e7b1f2
commit 84e9db9
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 31 deletions.
diff --git a/.github/workflows/release-binary.yml b/.github/workflows/release-binary.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     name: Build and Upload Release Assets
     runs-on: ubuntu-latest
-    container: golang:1.19-bullseye
+    container: golang:1.22-bullseye
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Start docker-compose
         id: compose
         run: |
-          docker-compose -f docker-compose-tests.yml up --abort-on-container-exit --exit-code-from=nosqlbench
+          docker compose -f docker-compose-tests.yml up --abort-on-container-exit --exit-code-from=nosqlbench
       - name: Test Summary
         if: ${{ failure() }}
         run: |
@@ -36,7 +36,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install default-jre gcc git wget
-          wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
+          wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
           sudo tar -xzf go*.tar.gz -C /usr/local/
           export PATH=$PATH:/usr/local/go/bin
           export PATH=$PATH:`go env GOPATH`/bin
@@ -59,7 +59,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install openjdk-8-jdk gcc git wget
-          wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
+          wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
           sudo tar -xzf go*.tar.gz -C /usr/local/
           export PATH=$PATH:/usr/local/go/bin
           export PATH=$PATH:`go env GOPATH`/bin
@@ -83,7 +83,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install openjdk-8-jdk gcc git wget pip
-          wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
+          wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
           sudo tar -xzf go*.tar.gz -C /usr/local/
           export PATH=$PATH:/usr/local/go/bin
           export PATH=$PATH:`go env GOPATH`/bin
@@ -113,7 +113,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install openjdk-8-jdk gcc git pip wget
-          wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
+          wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
           sudo tar -xzf go*.tar.gz -C /usr/local/
           export PATH=$PATH:/usr/local/go/bin
           export PATH=$PATH:`go env GOPATH`/bin
@@ -138,7 +138,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt -y install openjdk-8-jdk gcc git pip wget
-          wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
+          wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
           sudo tar -xzf go*.tar.gz -C /usr/local/
           export PATH=$PATH:/usr/local/go/bin
           export PATH=$PATH:`go env GOPATH`/bin

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 # $ docker build . -f ./Dockerfile -t zdm-proxy
 ##########
 
-FROM golang:1.19-bullseye AS builder
+FROM golang:1.22-bullseye AS builder
 
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \

diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml
@@ -29,7 +29,7 @@ services:
         ipv4_address: 192.168.100.102
 
   proxy:
-    image: golang:1.21.11-bookworm
+    image: golang:1.22.8-bookworm
     restart: unless-stopped
     tty: true
     ports:

diff --git a/docker-compose-tests.yml b/docker-compose-tests.yml
@@ -27,7 +27,7 @@ services:
         ipv4_address: 192.168.100.102
 
   proxy:
-    image: golang:1.21.11-bookworm
+    image: golang:1.22.8-bookworm
     container_name: zdm_tests_proxy
     restart: unless-stopped
     tty: true

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/datastax/zdm-proxy
 
-go 1.19
+go 1.22
 
 require (
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211106181442-e4c1a74c66bd
@@ -10,29 +10,29 @@ require (
 	github.com/jpillora/backoff v1.0.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/mcuadros/go-defaults v1.2.0
-	github.com/prometheus/client_golang v1.3.0
-	github.com/prometheus/client_model v0.1.0
+	github.com/prometheus/client_golang v1.11.1
+	github.com/prometheus/client_model v0.2.0
 	github.com/rs/zerolog v1.20.0
 	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.8.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
-	github.com/google/go-cmp v0.5.2 // indirect
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pierrec/lz4/v4 v4.0.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/common v0.7.0 // indirect
-	github.com/prometheus/procfs v0.0.8 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	golang.org/x/sys v0.3.0 // indirect
+	google.golang.org/protobuf v1.26.0-rc.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )