From a6ea1aaa497c6cf45496b9c5283ce0be9dd0e54f Mon Sep 17 00:00:00 2001 From: SuperQ Date: Fri, 3 Jun 2022 14:08:32 +0200 Subject: [PATCH] Update minimum supported Go version Update minimum supported Go to 1.17 to support new module format. Signed-off-by: SuperQ --- .circleci/config.yml | 4 ---- README.md | 2 +- go.mod | 20 ++++++++++++++++---- go.sum | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d51e22d90..e00876eea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,10 +46,6 @@ workflows: client_golang: jobs: # Refer to README.md for the currently supported versions. - - test: - name: go-1-16 - go_version: "1.16" - run_lint: true - test: name: go-1-17 go_version: "1.17" diff --git a/README.md b/README.md index b95a67057..40c61468e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This is the [Go](http://golang.org) client library for instrumenting application code, and one for creating clients that talk to the Prometheus HTTP API. -__This library requires Go1.16 or later.__ +__This library requires Go1.17 or later.__ ## Important note about releases and stability diff --git a/go.mod b/go.mod index 1105fe8bb..df502b46c 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,31 @@ module github.com/prometheus/client_golang +go 1.17 + require ( github.com/beorn7/perks v1.0.1 github.com/cespare/xxhash/v2 v2.1.2 github.com/davecgh/go-spew v1.1.1 github.com/golang/protobuf v1.5.2 - github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 github.com/prometheus/client_model v0.2.0 github.com/prometheus/common v0.34.0 github.com/prometheus/procfs v0.7.3 - golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a google.golang.org/protobuf v1.28.0 ) -exclude github.com/prometheus/client_golang v1.12.1 +require ( + github.com/jpillora/backoff v1.0.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/text v0.3.7 // indirect + google.golang.org/appengine v1.6.6 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) -go 1.16 +exclude github.com/prometheus/client_golang v1.12.1 diff --git a/go.sum b/go.sum index 379f2c85e..7ec3b2cb3 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=