Skip to content

Commit

Permalink
Update prometheus client_golang and Go version (#49)
Browse files Browse the repository at this point in the history
Switch to Go 1.20 and also update prometheus client_golang library.
  • Loading branch information
adidenko authored Feb 28, 2023
1 parent 11607f9 commit 826eaef
Show file tree
Hide file tree
Showing 9 changed files with 409 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
strategy:
matrix:
go-version: [1.17]
go-version: ["1.20"]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: "1.20"
- name: Test
run: make test
2 changes: 1 addition & 1 deletion .github/workflows/publish-release-binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
package:
strategy:
matrix:
go-version: [1.17]
go-version: ["1.20"]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# @authors Minigun Maintainers
# @copyright 2020 Wayfair, LLC -- All rights reserved.

FROM golang:1.17 as test
FROM golang:1.20 as test
ENV GOPATH=/go
ENV PATH="$PATH:$GOPATH/bin"
WORKDIR /go/src/github.com/wayfair-incubator/minigun
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ local-build-wo-cgo: $(VENDOR_DIR) $(OUTPUT_DIR)
clean:
rm -f output/*

.PHONY: clean-all
clean-all:
rm -rf output/* vendor

.PHONY: test
test: $(VENDOR_DIR)
go test -v -timeout 30s github.com/wayfair-incubator/minigun
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Or by checking the [following documentation page](./docs/report-help.md)
This is an example of how to list things you need to use the software and how to install them.

- Docker for image build.
- Golang 1.17 for local binary build.
- Golang 1.20 for local binary build.

### Building a Docker image

Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
module github.com/wayfair-incubator/minigun

go 1.17
go 1.20

require (
github.com/dustin/go-humanize v1.0.0
github.com/google/logger v1.1.0
github.com/gorilla/mux v1.7.4
github.com/olekukonko/tablewriter v0.0.4
github.com/prometheus/client_golang v1.6.0
github.com/prometheus/client_golang v1.13.1
github.com/prometheus/client_model v0.2.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/golang/protobuf v1.4.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/mattn/go-runewidth v0.0.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/common v0.9.1 // indirect
github.com/prometheus/procfs v0.0.11 // indirect
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f // indirect
google.golang.org/protobuf v1.21.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
google.golang.org/protobuf v1.28.1 // indirect
)
405 changes: 391 additions & 14 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
)

// Constants and vars
const version = "0.4.2"
const version = "0.4.3"
const workersCannelSize = 1024
const errorBadHTTPCode = "Bad HTTP status code"

Expand Down

0 comments on commit 826eaef

Please sign in to comment.