Skip to content

Commit 38c514b

Browse files
npordashnpordash
authored
Upgrade Prometheus to v0.302.1 (#40103)
#### Description This PR superseeds #38530 (as it went stale)~~, but goes to `v0.303.1` instead of `v0.302.x`~~. In order to workaround the behavior change when calling `prometheus.config.GetScrapeConfigs()` (mentioned [here](#38530 (comment))) I've made the following changes in `prometheusreceiver`: 1. Added a `reloadPromConfig` func that will marshal an input as yaml and then load it using `prometheus.config.Load` to ensure that the un-exported field `loaded` is set to `true` 2. Updated `PromConfig.Unmarshal` to delegate to `reloadPromConfig` 3. Added `PromConfig.Reload` which delegates to `reloadPromConfig` to reload itself 4. Updated `newPrometheusReceiver` to call `PromConfig.Reload` to ensure the Prometheus config is `loaded` 5. Updated `Config.Validate` to only check if scrape configs or files have been set instead of calling `GetScrapeConfigs` since it's not necessary they get built here 6. Updated `PromConfig.Validate` to only call `GetScrapeConfigs` if any where configured
1 parent 627de0d commit 38c514b

File tree

49 files changed

+1343
-4090
lines changed

Some content is hidden

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

49 files changed

+1343
-4090
lines changed

‎cmd/opampsupervisor/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,3 +314,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prome
314314
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stefexporter => ../../exporter/stefexporter
315315

316316
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stefreceiver => ../../receiver/stefreceiver
317+
318+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../processor/deltatocumulativeprocessor

‎connector/datadogconnector/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ require (
181181
github.com/go-logr/stdr v1.2.2 // indirect
182182
github.com/go-ole/go-ole v1.3.0 // indirect
183183
github.com/go-openapi/jsonpointer v0.21.0 // indirect
184-
github.com/go-openapi/jsonreference v0.20.4 // indirect
184+
github.com/go-openapi/jsonreference v0.21.0 // indirect
185185
github.com/go-openapi/swag v0.23.0 // indirect
186186
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
187187
github.com/gobwas/glob v0.2.3 // indirect
@@ -448,3 +448,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datad
448448
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters
449449

450450
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv => ../../internal/gopsutilenv
451+
452+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../processor/deltatocumulativeprocessor
453+
454+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../../internal/exp/metrics

‎connector/datadogconnector/go.sum

Lines changed: 44 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/datadogexporter/go.mod

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ require (
106106
cloud.google.com/go/auth v0.15.0 // indirect
107107
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
108108
cloud.google.com/go/compute/metadata v0.7.0 // indirect
109-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
110-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
109+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
110+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1 // indirect
111111
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
112112
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
113113
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
114-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
114+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
115115
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
116116
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
117117
github.com/DataDog/datadog-agent/comp/core/flare/types v0.66.0-devel.0.20250407180930-ebfcfa2817ce // indirect
@@ -213,14 +213,14 @@ require (
213213
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
214214
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
215215
github.com/dennwc/varint v1.0.0 // indirect
216-
github.com/digitalocean/godo v1.126.0 // indirect
216+
github.com/digitalocean/godo v1.132.0 // indirect
217217
github.com/distribution/reference v0.6.0 // indirect
218218
github.com/docker/docker v28.1.1+incompatible // indirect
219219
github.com/docker/go-connections v0.5.0 // indirect
220220
github.com/docker/go-units v0.5.0 // indirect
221221
github.com/dustin/go-humanize v1.0.1 // indirect
222222
github.com/ebitengine/purego v0.8.3 // indirect
223-
github.com/edsrzf/mmap-go v1.1.0 // indirect
223+
github.com/edsrzf/mmap-go v1.2.0 // indirect
224224
github.com/elastic/go-grok v0.3.1 // indirect
225225
github.com/elastic/lunes v0.1.0 // indirect
226226
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -238,16 +238,16 @@ require (
238238
github.com/go-logr/logr v1.4.2 // indirect
239239
github.com/go-logr/stdr v1.2.2 // indirect
240240
github.com/go-ole/go-ole v1.3.0 // indirect
241-
github.com/go-openapi/analysis v0.22.2 // indirect
241+
github.com/go-openapi/analysis v0.23.0 // indirect
242242
github.com/go-openapi/errors v0.22.0 // indirect
243243
github.com/go-openapi/jsonpointer v0.21.0 // indirect
244-
github.com/go-openapi/jsonreference v0.20.4 // indirect
245-
github.com/go-openapi/loads v0.21.5 // indirect
246-
github.com/go-openapi/spec v0.20.14 // indirect
244+
github.com/go-openapi/jsonreference v0.21.0 // indirect
245+
github.com/go-openapi/loads v0.22.0 // indirect
246+
github.com/go-openapi/spec v0.21.0 // indirect
247247
github.com/go-openapi/strfmt v0.23.0 // indirect
248248
github.com/go-openapi/swag v0.23.0 // indirect
249-
github.com/go-openapi/validate v0.23.0 // indirect
250-
github.com/go-resty/resty/v2 v2.15.3 // indirect
249+
github.com/go-openapi/validate v0.24.0 // indirect
250+
github.com/go-resty/resty/v2 v2.16.3 // indirect
251251
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
252252
github.com/go-zookeeper/zk v1.0.4 // indirect
253253
github.com/gobwas/glob v0.2.3 // indirect
@@ -268,7 +268,7 @@ require (
268268
github.com/google/uuid v1.6.0 // indirect
269269
github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
270270
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
271-
github.com/gophercloud/gophercloud v1.14.1 // indirect
271+
github.com/gophercloud/gophercloud/v2 v2.4.0 // indirect
272272
github.com/gorilla/websocket v1.5.0 // indirect
273273
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
274274
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
@@ -288,10 +288,10 @@ require (
288288
github.com/hashicorp/nomad/api v0.0.0-20241218080744-e3ac00f30eec // indirect
289289
github.com/hashicorp/serf v0.10.1 // indirect
290290
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
291-
github.com/hetznercloud/hcloud-go/v2 v2.13.1 // indirect
291+
github.com/hetznercloud/hcloud-go/v2 v2.18.0 // indirect
292292
github.com/iancoleman/strcase v0.3.0 // indirect
293293
github.com/inconshreveable/mousetrap v1.1.0 // indirect
294-
github.com/ionos-cloud/sdk-go/v6 v6.2.1 // indirect
294+
github.com/ionos-cloud/sdk-go/v6 v6.3.2 // indirect
295295
github.com/jmespath/go-jmespath v0.4.0 // indirect
296296
github.com/jonboulle/clockwork v0.5.0 // indirect
297297
github.com/josharian/intern v1.0.0 // indirect
@@ -307,7 +307,7 @@ require (
307307
github.com/kylelemons/godebug v1.1.0 // indirect
308308
github.com/leodido/go-syslog/v4 v4.2.0 // indirect
309309
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
310-
github.com/linode/linodego v1.41.0 // indirect
310+
github.com/linode/linodego v1.46.0 // indirect
311311
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
312312
github.com/magefile/mage v1.15.0 // indirect
313313
github.com/magiconair/properties v1.8.10 // indirect
@@ -316,7 +316,7 @@ require (
316316
github.com/mattn/go-isatty v0.0.20 // indirect
317317
github.com/mdlayher/socket v0.4.1 // indirect
318318
github.com/mdlayher/vsock v1.2.1 // indirect
319-
github.com/miekg/dns v1.1.62 // indirect
319+
github.com/miekg/dns v1.1.63 // indirect
320320
github.com/mitchellh/copystructure v1.2.0 // indirect
321321
github.com/mitchellh/go-homedir v1.1.0 // indirect
322322
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
@@ -333,6 +333,7 @@ require (
333333
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.126.0 // indirect
334334
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.126.0 // indirect
335335
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.126.0 // indirect
336+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.126.0 // indirect
336337
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.126.0 // indirect
337338
github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.0.0-20250521232020-84161c26078b // indirect
338339
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.126.0 // indirect
@@ -343,6 +344,7 @@ require (
343344
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.126.0 // indirect
344345
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.126.0 // indirect
345346
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.126.0 // indirect
347+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.126.0 // indirect
346348
github.com/opencontainers/go-digest v1.0.0 // indirect
347349
github.com/opencontainers/image-spec v1.1.1 // indirect
348350
github.com/opencontainers/runtime-spec v1.2.1 // indirect
@@ -359,15 +361,16 @@ require (
359361
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
360362
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
361363
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
362-
github.com/prometheus/alertmanager v0.27.0 // indirect
364+
github.com/prometheus/alertmanager v0.28.0 // indirect
363365
github.com/prometheus/client_golang v1.22.0 // indirect
364366
github.com/prometheus/client_model v0.6.1 // indirect
365367
github.com/prometheus/common v0.62.0 // indirect
366368
github.com/prometheus/common/assets v0.2.0 // indirect
367-
github.com/prometheus/common/sigv4 v0.1.0 // indirect
368369
github.com/prometheus/exporter-toolkit v0.14.0 // indirect
369370
github.com/prometheus/procfs v0.16.1 // indirect
370-
github.com/prometheus/prometheus v0.300.1 // indirect
371+
github.com/prometheus/prometheus v0.302.1 // indirect
372+
github.com/prometheus/sigv4 v0.1.1 // indirect
373+
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
371374
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
372375
github.com/rs/cors v1.11.1 // indirect
373376
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 // indirect
@@ -440,7 +443,7 @@ require (
440443
go.opentelemetry.io/collector/service/hostcapabilities v0.126.1-0.20250515040533-97a6accbc082 // indirect
441444
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
442445
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
443-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
446+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 // indirect
444447
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
445448
go.opentelemetry.io/contrib/otelconf v0.15.0 // indirect
446449
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
@@ -473,7 +476,7 @@ require (
473476
golang.org/x/term v0.32.0 // indirect
474477
golang.org/x/text v0.25.0 // indirect
475478
golang.org/x/time v0.11.0 // indirect
476-
golang.org/x/tools v0.32.0 // indirect
479+
golang.org/x/tools v0.33.0 // indirect
477480
gonum.org/v1/gonum v0.16.0 // indirect
478481
google.golang.org/api v0.226.0 // indirect
479482
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
@@ -575,3 +578,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog =>
575578
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
576579

577580
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv => ../../internal/gopsutilenv
581+
582+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics => ../../internal/exp/metrics
583+
584+
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor => ../../processor/deltatocumulativeprocessor

0 commit comments

Comments
 (0)