mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1448 from ywwg/owilliams/content-negotiation 

deps: bump prometheus/common version
This commit is contained in:
Arthur Silva Sens 2024-02-23 15:58:37 -03:00 committed by GitHub
parent 353395b3b6 6d039205b8
commit 14259fa70c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -8,7 +8,7 @@ require (
github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew v1.1.1
github.com/json-iterator/go v1.1.12 github.com/json-iterator/go v1.1.12
github.com/prometheus/client_model v0.5.0 github.com/prometheus/client_model v0.5.0
github.com/prometheus/common v0.46.0 github.com/prometheus/common v0.48.0
github.com/prometheus/procfs v0.12.0 github.com/prometheus/procfs v0.12.0
golang.org/x/sys v0.16.0 golang.org/x/sys v0.16.0
google.golang.org/protobuf v1.32.0 google.golang.org/protobuf v1.32.0

6
go.sum
View File

@ -11,7 +11,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@ -33,8 +33,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=

2
prometheus/push/push.go
View File

@ -109,7 +109,7 @@ func New(url, job string) *Pusher {
gatherers: prometheus.Gatherers{reg}, gatherers: prometheus.Gatherers{reg},
registerer: reg, registerer: reg,
client: &http.Client{}, client: &http.Client{},
expfmt: expfmt.FmtProtoDelim, expfmt: expfmt.NewFormat(expfmt.TypeProtoDelim),
} }
} }

2
prometheus/push/push_test.go
View File

@ -84,7 +84,7 @@ func TestPush(t *testing.T) {
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
enc := expfmt.NewEncoder(buf, expfmt.FmtProtoDelim) enc := expfmt.NewEncoder(buf, expfmt.NewFormat(expfmt.TypeProtoDelim))
for _, mf := range mfs { for _, mf := range mfs {
if err := enc.Encode(mf); err != nil { if err := enc.Encode(mf); err != nil {

40
prometheus/registry_test.go
View File

@ -92,7 +92,7 @@ func testHandler(t testing.TB) {
}, },
} }
externalBuf := &bytes.Buffer{} externalBuf := &bytes.Buffer{}
enc := expfmt.NewEncoder(externalBuf, expfmt.FmtProtoDelim) enc := expfmt.NewEncoder(externalBuf, expfmt.NewFormat(expfmt.TypeProtoDelim))
if err := enc.Encode(externalMetricFamily); err != nil { if err := enc.Encode(externalMetricFamily); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -162,7 +162,7 @@ metric: <
}, },
} }
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
enc = expfmt.NewEncoder(buf, expfmt.FmtProtoDelim) enc = expfmt.NewEncoder(buf, expfmt.NewFormat(expfmt.TypeProtoDelim))
if err := enc.Encode(expectedMetricFamily); err != nil { if err := enc.Encode(expectedMetricFamily); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -361,7 +361,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: []byte{}, body: []byte{},
}, },
@ -372,7 +372,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: []byte{}, body: []byte{},
}, },
@ -383,7 +383,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: []byte{}, body: []byte{},
}, },
@ -394,7 +394,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=values`,
}, },
body: []byte{}, body: []byte{},
}, },
@ -405,7 +405,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: expectedMetricFamilyAsText, body: expectedMetricFamilyAsText,
}, },
@ -417,7 +417,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=values`,
}, },
body: expectedMetricFamilyAsBytes, body: expectedMetricFamilyAsBytes,
}, },
@ -429,7 +429,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: externalMetricFamilyAsText, body: externalMetricFamilyAsText,
}, },
@ -441,7 +441,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=values`,
}, },
body: externalMetricFamilyAsBytes, body: externalMetricFamilyAsBytes,
}, },
@ -453,7 +453,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -472,7 +472,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: []byte{}, body: []byte{},
}, },
@ -483,7 +483,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: expectedMetricFamilyAsText, body: expectedMetricFamilyAsText,
}, },
@ -495,7 +495,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -514,7 +514,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -533,7 +533,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=text`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=text; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -552,7 +552,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -571,7 +571,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text`, "Content-Type": `application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=compact-text; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{
@ -609,7 +609,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: expectedMetricFamilyAsText, body: expectedMetricFamilyAsText,
}, },
@ -666,7 +666,7 @@ collected metric "broken_metric" { label:<name:"foo" value:"bar" > label:<name:"
}, },
out: output{ out: output{
headers: map[string]string{ headers: map[string]string{
"Content-Type": `text/plain; version=0.0.4; charset=utf-8`, "Content-Type": `text/plain; version=0.0.4; charset=utf-8; escaping=values`,
}, },
body: bytes.Join( body: bytes.Join(
[][]byte{ [][]byte{

2
prometheus/testutil/promlint/promlint.go
View File

@ -68,7 +68,7 @@ func (l *Linter) Lint() ([]Problem, error) {
var problems []Problem var problems []Problem
if l.r != nil { if l.r != nil {
d := expfmt.NewDecoder(l.r, expfmt.FmtText) d := expfmt.NewDecoder(l.r, expfmt.NewFormat(expfmt.TypeTextPlain))
mf := &dto.MetricFamily{} mf := &dto.MetricFamily{}
for { for {

4
prometheus/testutil/testutil.go
View File

@ -265,13 +265,13 @@ func compareMetricFamilies(got, expected []*dto.MetricFamily, metricNames ...str
// result. // result.
func compare(got, want []*dto.MetricFamily) error { func compare(got, want []*dto.MetricFamily) error {
var gotBuf, wantBuf bytes.Buffer var gotBuf, wantBuf bytes.Buffer
enc := expfmt.NewEncoder(&gotBuf, expfmt.FmtText) enc := expfmt.NewEncoder(&gotBuf, expfmt.NewFormat(expfmt.TypeTextPlain))
for _, mf := range got { for _, mf := range got {
if err := enc.Encode(mf); err != nil { if err := enc.Encode(mf); err != nil {
return fmt.Errorf("encoding gathered metrics failed: %w", err) return fmt.Errorf("encoding gathered metrics failed: %w", err)
} }
} }
enc = expfmt.NewEncoder(&wantBuf, expfmt.FmtText) enc = expfmt.NewEncoder(&wantBuf, expfmt.NewFormat(expfmt.TypeTextPlain))
for _, mf := range want { for _, mf := range want {
if err := enc.Encode(mf); err != nil { if err := enc.Encode(mf); err != nil {
return fmt.Errorf("encoding expected metrics failed: %w", err) return fmt.Errorf("encoding expected metrics failed: %w", err)