Skip to content

Commit 84e9db9

Browse files
Upgrade GoLang version and Prometheus client module (#132)
1 parent 7e7b1f2 commit 84e9db9

File tree

7 files changed

+82
-31
lines changed

7 files changed

+82
-31
lines changed

.github/workflows/release-binary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
name: Build and Upload Release Assets
1313
runs-on: ubuntu-latest
14-
container: golang:1.19-bullseye
14+
container: golang:1.22-bullseye
1515
steps:
1616
- name: Checkout code
1717
uses: actions/checkout@v2

.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Start docker-compose
2121
id: compose
2222
run: |
23-
docker-compose -f docker-compose-tests.yml up --abort-on-container-exit --exit-code-from=nosqlbench
23+
docker compose -f docker-compose-tests.yml up --abort-on-container-exit --exit-code-from=nosqlbench
2424
- name: Test Summary
2525
if: ${{ failure() }}
2626
run: |
@@ -36,7 +36,7 @@ jobs:
3636
run: |
3737
sudo apt update
3838
sudo apt -y install default-jre gcc git wget
39-
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
39+
wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
4040
sudo tar -xzf go*.tar.gz -C /usr/local/
4141
export PATH=$PATH:/usr/local/go/bin
4242
export PATH=$PATH:`go env GOPATH`/bin
@@ -59,7 +59,7 @@ jobs:
5959
run: |
6060
sudo apt update
6161
sudo apt -y install openjdk-8-jdk gcc git wget
62-
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
62+
wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
6363
sudo tar -xzf go*.tar.gz -C /usr/local/
6464
export PATH=$PATH:/usr/local/go/bin
6565
export PATH=$PATH:`go env GOPATH`/bin
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
sudo apt update
8585
sudo apt -y install openjdk-8-jdk gcc git wget pip
86-
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
86+
wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
8787
sudo tar -xzf go*.tar.gz -C /usr/local/
8888
export PATH=$PATH:/usr/local/go/bin
8989
export PATH=$PATH:`go env GOPATH`/bin
@@ -113,7 +113,7 @@ jobs:
113113
run: |
114114
sudo apt update
115115
sudo apt -y install openjdk-8-jdk gcc git pip wget
116-
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
116+
wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
117117
sudo tar -xzf go*.tar.gz -C /usr/local/
118118
export PATH=$PATH:/usr/local/go/bin
119119
export PATH=$PATH:`go env GOPATH`/bin
@@ -138,7 +138,7 @@ jobs:
138138
run: |
139139
sudo apt update
140140
sudo apt -y install openjdk-8-jdk gcc git pip wget
141-
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
141+
wget https://go.dev/dl/go1.22.8.linux-amd64.tar.gz
142142
sudo tar -xzf go*.tar.gz -C /usr/local/
143143
export PATH=$PATH:/usr/local/go/bin
144144
export PATH=$PATH:`go env GOPATH`/bin

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# $ docker build . -f ./Dockerfile -t zdm-proxy
44
##########
55

6-
FROM golang:1.19-bullseye AS builder
6+
FROM golang:1.22-bullseye AS builder
77

88
ENV GO111MODULE=on \
99
CGO_ENABLED=0 \

docker-compose-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
ipv4_address: 192.168.100.102
3030

3131
proxy:
32-
image: golang:1.21.11-bookworm
32+
image: golang:1.22.8-bookworm
3333
restart: unless-stopped
3434
tty: true
3535
ports:

docker-compose-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ services:
2727
ipv4_address: 192.168.100.102
2828

2929
proxy:
30-
image: golang:1.21.11-bookworm
30+
image: golang:1.22.8-bookworm
3131
container_name: zdm_tests_proxy
3232
restart: unless-stopped
3333
tty: true

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/datastax/zdm-proxy
22

3-
go 1.19
3+
go 1.22
44

55
require (
66
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211106181442-e4c1a74c66bd
@@ -10,29 +10,29 @@ require (
1010
github.com/jpillora/backoff v1.0.0
1111
github.com/kelseyhightower/envconfig v1.4.0
1212
github.com/mcuadros/go-defaults v1.2.0
13-
github.com/prometheus/client_golang v1.3.0
14-
github.com/prometheus/client_model v0.1.0
13+
github.com/prometheus/client_golang v1.11.1
14+
github.com/prometheus/client_model v0.2.0
1515
github.com/rs/zerolog v1.20.0
1616
github.com/sirupsen/logrus v1.6.0
1717
github.com/stretchr/testify v1.8.0
18+
gopkg.in/yaml.v3 v3.0.1
1819
)
1920

2021
require (
2122
github.com/beorn7/perks v1.0.1 // indirect
2223
github.com/cespare/xxhash/v2 v2.1.1 // indirect
2324
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/golang/protobuf v1.3.2 // indirect
25+
github.com/golang/protobuf v1.4.3 // indirect
2526
github.com/golang/snappy v0.0.3 // indirect
26-
github.com/google/go-cmp v0.5.2 // indirect
2727
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
2828
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
2929
github.com/kr/pretty v0.2.1 // indirect
3030
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
3131
github.com/pierrec/lz4/v4 v4.0.3 // indirect
3232
github.com/pmezard/go-difflib v1.0.0 // indirect
33-
github.com/prometheus/common v0.7.0 // indirect
34-
github.com/prometheus/procfs v0.0.8 // indirect
33+
github.com/prometheus/common v0.26.0 // indirect
34+
github.com/prometheus/procfs v0.6.0 // indirect
3535
golang.org/x/sys v0.3.0 // indirect
36+
google.golang.org/protobuf v1.26.0-rc.1 // indirect
3637
gopkg.in/inf.v0 v0.9.1 // indirect
37-
gopkg.in/yaml.v3 v3.0.1 // indirect
3838
)

0 commit comments

Comments
 (0)