Skip to content

Commit 7aaecc6

Browse files
committed
Bump github.com/prometheus/common from 0.26.0 to 0.55.0 in /prometheus-to-sd
1 parent 5a7e5a0 commit 7aaecc6

File tree

227 files changed

+10494
-44337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+10494
-44337
lines changed

prometheus-to-sd/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ require (
66
cloud.google.com/go/compute/metadata v0.4.0
77
cloud.google.com/go/monitoring v1.20.2
88
github.com/golang/glog v1.2.1
9-
github.com/prometheus/client_golang v1.11.1
10-
github.com/prometheus/client_model v0.2.0
11-
github.com/prometheus/common v0.26.0
9+
github.com/prometheus/client_golang v1.19.1
10+
github.com/prometheus/client_model v0.6.1
11+
github.com/prometheus/common v0.55.0
1212
github.com/stretchr/testify v1.9.0
1313
golang.org/x/oauth2 v0.21.0
1414
google.golang.org/api v0.188.0
@@ -51,7 +51,7 @@ require (
5151
github.com/modern-go/reflect2 v1.0.2 // indirect
5252
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5353
github.com/pmezard/go-difflib v1.0.0 // indirect
54-
github.com/prometheus/procfs v0.6.0 // indirect
54+
github.com/prometheus/procfs v0.15.1 // indirect
5555
go.opencensus.io v0.24.0 // indirect
5656
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
5757
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect

prometheus-to-sd/go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,28 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
159159
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
160160
github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s=
161161
github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
162+
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
163+
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
162164
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
163165
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
164166
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
165167
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
166168
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
169+
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
170+
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
167171
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
168172
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
169173
github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
170174
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
175+
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
176+
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
171177
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
172178
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
173179
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
174180
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
175181
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
182+
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
183+
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
176184
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
177185
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
178186
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=

prometheus-to-sd/translator/prometheus.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ func doPrometheusRequest(url string, auth config.AuthConfig) (resp *http.Respons
8989
if err != nil {
9090
return nil, err
9191
}
92-
request.Header.Set("Accept", string(expfmt.FmtProtoDelim))
92+
contentType := expfmt.NewFormat(expfmt.TypeProtoDelim)
93+
request.Header.Set("Accept", string(contentType))
9394
if len(auth.Username) > 0 {
9495
request.SetBasicAuth(auth.Username, auth.Password)
9596
} else if len(auth.Token) > 0 {
@@ -101,7 +102,7 @@ func doPrometheusRequest(url string, auth config.AuthConfig) (resp *http.Respons
101102
// Build performs parsing and processing of the prometheus metrics response.
102103
func (p *PrometheusResponse) Build(ctx context.Context, config *config.CommonConfig, metricDescriptorCache *MetricDescriptorCache) (map[string]*dto.MetricFamily, error) {
103104
format := expfmt.ResponseFormat(p.header)
104-
if format == expfmt.FmtUnknown {
105+
if format.FormatType() == expfmt.TypeUnknown {
105106
return nil, fmt.Errorf("failed to parse format from header: %s", p.header.Get("Content-Type"))
106107
}
107108
decoder := expfmt.NewDecoder(bytes.NewReader(p.rawResponse), format)

prometheus-to-sd/vendor/cloud.google.com/go/auth/httptransport/httptransport.go

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

prometheus-to-sd/vendor/cloud.google.com/go/auth/httptransport/trace.go

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

0 commit comments

Comments
 (0)