Skip to content

Commit 455f296

Browse files
swiatekmswiatekm
authored
Bump prometheus/prometheus to 0.53.0 (open-telemetry#3071)
Some config defaults changed, needed to update tests.
1 parent addc709 commit 455f296

File tree

3 files changed

+89
-88
lines changed

3 files changed

+89
-88
lines changed

‎cmd/otel-allocator/config/config_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func TestLoad(t *testing.T) {
7575
ScrapeTimeout: model.Duration(10 * time.Second),
7676
EvaluationInterval: model.Duration(60 * time.Second),
7777
},
78+
Runtime: promconfig.DefaultRuntimeConfig,
7879
ScrapeConfigs: []*promconfig.ScrapeConfig{
7980
{
8081
JobName: "prometheus",
@@ -156,6 +157,7 @@ func TestLoad(t *testing.T) {
156157
ScrapeTimeout: model.Duration(10 * time.Second),
157158
EvaluationInterval: model.Duration(60 * time.Second),
158159
},
160+
Runtime: promconfig.DefaultRuntimeConfig,
159161
ScrapeConfigs: []*promconfig.ScrapeConfig{
160162
{
161163
JobName: "prometheus",

‎go.mod

+24-28
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/prometheus-operator/prometheus-operator/pkg/client v0.74.0
2626
github.com/prometheus/client_golang v1.19.1
2727
github.com/prometheus/common v0.54.0
28-
github.com/prometheus/prometheus v0.52.1
28+
github.com/prometheus/prometheus v0.53.0
2929
github.com/shirou/gopsutil v3.21.11+incompatible
3030
github.com/spf13/pflag v1.0.5
3131
github.com/stretchr/testify v1.9.0
@@ -53,22 +53,21 @@ require (
5353
)
5454

5555
require (
56-
cloud.google.com/go/auth v0.2.0 // indirect
57-
cloud.google.com/go/auth/oauth2adapt v0.2.0 // indirect
56+
cloud.google.com/go/auth v0.5.1 // indirect
57+
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
5858
cloud.google.com/go/compute/metadata v0.3.0 // indirect
5959
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
6060
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
6161
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
62-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.6.0 // indirect
62+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
6363
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
6464
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
6565
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
6666
github.com/Microsoft/go-winio v0.6.1 // indirect
6767
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
6868
github.com/armon/go-metrics v0.4.1 // indirect
6969
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
70-
github.com/aws/aws-sdk-go v1.51.25 // indirect
71-
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
70+
github.com/aws/aws-sdk-go v1.53.16 // indirect
7271
github.com/beorn7/perks v1.0.1 // indirect
7372
github.com/blang/semver/v4 v4.0.0 // indirect
7473
github.com/bytedance/sonic v1.11.6 // indirect
@@ -79,9 +78,9 @@ require (
7978
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
8079
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8180
github.com/dennwc/varint v1.0.0 // indirect
82-
github.com/digitalocean/godo v1.113.0 // indirect
81+
github.com/digitalocean/godo v1.117.0 // indirect
8382
github.com/distribution/reference v0.6.0 // indirect
84-
github.com/docker/docker v26.0.2+incompatible // indirect
83+
github.com/docker/docker v26.1.3+incompatible // indirect
8584
github.com/docker/go-connections v0.4.0 // indirect
8685
github.com/docker/go-units v0.5.0 // indirect
8786
github.com/edsrzf/mmap-go v1.1.0 // indirect
@@ -114,27 +113,26 @@ require (
114113
github.com/go-playground/locales v0.14.1 // indirect
115114
github.com/go-playground/universal-translator v0.18.1 // indirect
116115
github.com/go-playground/validator/v10 v10.20.0 // indirect
117-
github.com/go-resty/resty/v2 v2.12.0 // indirect
116+
github.com/go-resty/resty/v2 v2.13.1 // indirect
118117
github.com/go-zookeeper/zk v1.0.3 // indirect
119118
github.com/goccy/go-json v0.10.2 // indirect
120119
github.com/gogo/protobuf v1.3.2 // indirect
121120
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
122121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
123122
github.com/golang/protobuf v1.5.4 // indirect
124-
github.com/golang/snappy v0.0.4 // indirect
125123
github.com/google/gnostic-models v0.6.8 // indirect
126124
github.com/google/go-cmp v0.6.0 // indirect
127125
github.com/google/go-querystring v1.1.0 // indirect
128126
github.com/google/gofuzz v1.2.0 // indirect
129127
github.com/google/s2a-go v0.1.7 // indirect
130128
github.com/google/uuid v1.6.0 // indirect
131129
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
132-
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
133-
github.com/gophercloud/gophercloud v1.11.0 // indirect
130+
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
131+
github.com/gophercloud/gophercloud v1.12.0 // indirect
134132
github.com/gorilla/websocket v1.5.1 // indirect
135-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
133+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
136134
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
137-
github.com/hashicorp/consul/api v1.28.2 // indirect
135+
github.com/hashicorp/consul/api v1.29.1 // indirect
138136
github.com/hashicorp/cronexpr v1.1.2 // indirect
139137
github.com/hashicorp/errwrap v1.1.0 // indirect
140138
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -145,21 +143,20 @@ require (
145143
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
146144
github.com/hashicorp/go-version v1.7.0 // indirect
147145
github.com/hashicorp/golang-lru v0.6.0 // indirect
148-
github.com/hashicorp/nomad/api v0.0.0-20240418183417-ea5f2f6748c7 // indirect
146+
github.com/hashicorp/nomad/api v0.0.0-20240604134157-e73d8bb1140d // indirect
149147
github.com/hashicorp/serf v0.10.1 // indirect
150-
github.com/hetznercloud/hcloud-go/v2 v2.7.2 // indirect
148+
github.com/hetznercloud/hcloud-go/v2 v2.9.0 // indirect
151149
github.com/imdario/mergo v0.3.16 // indirect
152150
github.com/inconshreveable/mousetrap v1.1.0 // indirect
153151
github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect
154152
github.com/jmespath/go-jmespath v0.4.0 // indirect
155153
github.com/josharian/intern v1.0.0 // indirect
156154
github.com/jpillora/backoff v1.0.0 // indirect
157-
github.com/klauspost/compress v1.17.8 // indirect
158155
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
159156
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
160157
github.com/kylelemons/godebug v1.1.0 // indirect
161158
github.com/leodido/go-urn v1.4.0 // indirect
162-
github.com/linode/linodego v1.32.0 // indirect
159+
github.com/linode/linodego v1.35.0 // indirect
163160
github.com/mailru/easyjson v0.7.7 // indirect
164161
github.com/mattn/go-colorable v0.1.13 // indirect
165162
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -175,7 +172,7 @@ require (
175172
github.com/opencontainers/go-digest v1.0.0 // indirect
176173
github.com/opencontainers/image-spec v1.0.2 // indirect
177174
github.com/opentracing/opentracing-go v1.2.0 // indirect
178-
github.com/ovh/go-ovh v1.4.3 // indirect
175+
github.com/ovh/go-ovh v1.5.1 // indirect
179176
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
180177
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
181178
github.com/pkg/errors v0.9.1 // indirect
@@ -185,7 +182,7 @@ require (
185182
github.com/prometheus/client_model v0.6.1 // indirect
186183
github.com/prometheus/common/sigv4 v0.1.0 // indirect
187184
github.com/prometheus/procfs v0.15.0 // indirect
188-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26 // indirect
185+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.27 // indirect
189186
github.com/spf13/cobra v1.7.0 // indirect
190187
github.com/tklauser/go-sysconf v0.3.13 // indirect
191188
github.com/tklauser/numcpus v0.7.0 // indirect
@@ -195,27 +192,26 @@ require (
195192
github.com/yusufpapurcu/wmi v1.2.3 // indirect
196193
go.mongodb.org/mongo-driver v1.14.0 // indirect
197194
go.opencensus.io v0.24.0 // indirect
198-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
195+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
199196
go.opentelemetry.io/otel/trace v1.27.0 // indirect
200197
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
201198
go.uber.org/atomic v1.11.0 // indirect
202-
go.uber.org/goleak v1.3.0 // indirect
203199
golang.org/x/arch v0.8.0 // indirect
204200
golang.org/x/crypto v0.24.0 // indirect
205201
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
206-
golang.org/x/mod v0.17.0 // indirect
202+
golang.org/x/mod v0.18.0 // indirect
207203
golang.org/x/net v0.26.0 // indirect
208-
golang.org/x/oauth2 v0.20.0 // indirect
204+
golang.org/x/oauth2 v0.21.0 // indirect
209205
golang.org/x/sync v0.7.0 // indirect
210206
golang.org/x/sys v0.21.0 // indirect
211207
golang.org/x/term v0.21.0 // indirect
212208
golang.org/x/text v0.16.0 // indirect
213209
golang.org/x/time v0.5.0 // indirect
214-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
210+
golang.org/x/tools v0.22.0 // indirect
215211
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
216-
google.golang.org/api v0.174.0 // indirect
217-
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
218-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
212+
google.golang.org/api v0.183.0 // indirect
213+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
214+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
219215
google.golang.org/grpc v1.64.0 // indirect
220216
google.golang.org/protobuf v1.34.1 // indirect
221217
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)