Skip to content

Commit 3cd3985

Browse files
authored
Merge pull request #843 from prometheus/beorn7/release
Update dependencies
2 parents e8b72d0 + 6635a8f commit 3cd3985

File tree

8 files changed

+26
-119
lines changed

8 files changed

+26
-119
lines changed

.circleci/config.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,6 @@ workflows:
5050
client_golang:
5151
jobs:
5252
# Refer to README.md for the currently supported versions.
53-
- test:
54-
name: go-1-9
55-
go_version: "1.9"
56-
use_gomod_cache: false
57-
- test:
58-
name: go-1-10
59-
go_version: "1.10"
60-
use_gomod_cache: false
61-
- test:
62-
name: go-1-11
63-
go_version: "1.11"
64-
run_lint: true
65-
- test:
66-
name: go-1-12
67-
go_version: "1.12"
68-
run_lint: true
6953
- test:
7054
name: go-1-13
7155
go_version: "1.13"
@@ -78,6 +62,10 @@ workflows:
7862
name: go-1-15
7963
go_version: "1.15"
8064
run_lint: true
65+
- test:
66+
name: go-1-16
67+
go_version: "1.16"
68+
run_lint: true
8169
# Style and unused/missing packages are only checked against
8270
# the latest supported Go version.
8371
run_style_and_unused: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This is the [Go](http://golang.org) client library for
99
instrumenting application code, and one for creating clients that talk to the
1010
Prometheus HTTP API.
1111

12-
__This library requires Go1.9 or later.__ The minimum required patch releases for older Go versions are Go1.9.7 and Go1.10.3.
12+
__This library requires Go1.13 or later.__
1313

1414
## Important note about releases and stability
1515

api/prometheus/v1/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func ExampleAPI_queryRangeWithAuthBearerToken() {
164164
client, err := api.NewClient(api.Config{
165165
Address: "http://demo.robustperception.io:9090",
166166
// We can use amazing github.com/prometheus/common/config helper!
167-
RoundTripper: config.NewBearerAuthRoundTripper("secret_token", api.DefaultRoundTripper),
167+
RoundTripper: config.NewAuthorizationCredentialsRoundTripper("Bearer", "secret_token", api.DefaultRoundTripper),
168168
})
169169
if err != nil {
170170
fmt.Printf("Error creating client: %v\n", err)

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
github.com/golang/protobuf v1.4.3
77
github.com/json-iterator/go v1.1.10
88
github.com/prometheus/client_model v0.2.0
9-
github.com/prometheus/common v0.15.0
10-
github.com/prometheus/procfs v0.3.0
11-
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e
9+
github.com/prometheus/common v0.18.0
10+
github.com/prometheus/procfs v0.6.0
11+
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
1212
)
1313

14-
go 1.11
14+
go 1.13

go.sum

Lines changed: 10 additions & 45 deletions
Large diffs are not rendered by default.

prometheus/build_info.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

prometheus/build_info_pre_1.12.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

prometheus/go_collector.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,12 @@ type memStatsMetrics []struct {
384384
// https://github.com/povilasv/prommod for an example of a collector for the
385385
// module dependencies.
386386
func NewBuildInfoCollector() Collector {
387-
path, version, sum := readBuildInfo()
387+
path, version, sum := "unknown", "unknown", "unknown"
388+
if bi, ok := debug.ReadBuildInfo(); ok {
389+
path = bi.Main.Path
390+
version = bi.Main.Version
391+
sum = bi.Main.Sum
392+
}
388393
c := &selfCollector{MustNewConstMetric(
389394
NewDesc(
390395
"go_build_info",

0 commit comments

Comments
 (0)