Skip to content

[chore] Update prometheus to match OTel v0.120.0 #42748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrzej-stencel wants to merge 16 commits into from
Closed

[chore] Update prometheus to match OTel v0.120.0 #42748

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bef953c
[chore] Update prometheus to match OTel v0.120.0
andrzej-stencel Feb 18, 2025
4c38b48
make notice
andrzej-stencel Feb 18, 2025
6bf817a
fix: add mising parameters to `textparse.New` call
andrzej-stencel Feb 18, 2025
e07773a
Use textPlain as default contentType
MichaelKatsoulis Feb 18, 2025
a807123
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 19, 2025
0dbcb31
Linter errors
MichaelKatsoulis Feb 19, 2025
a98e6a5
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 19, 2025
8ecbdac
Merge branch 'update-prometheus-to-match-otel-v0.120.0' of github.com…
MichaelKatsoulis Feb 19, 2025
838752a
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 19, 2025
552ebad
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 19, 2025
ce19738
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 19, 2025
0ad47d0
Update leaderelection test
MichaelKatsoulis Feb 19, 2025
c0651bb
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 20, 2025
4c8f5c6
Update leader election manager test
MichaelKatsoulis Feb 21, 2025
c35fddc
Merge branch 'update-prometheus-to-match-otel-v0.120.0' of github.com…
MichaelKatsoulis Feb 21, 2025
53ff72a
Merge branch 'main' into update-prometheus-to-match-otel-v0.120.0
MichaelKatsoulis Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,127 changes: 1,053 additions & 74 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ require (
github.com/lib/pq v1.10.3
github.com/magefile/mage v1.15.0
github.com/mattn/go-colorable v0.1.13
github.com/miekg/dns v1.1.61
github.com/miekg/dns v1.1.62
github.com/mitchellh/gox v1.0.1
github.com/mitchellh/hashstructure v1.1.0
github.com/mitchellh/mapstructure v1.5.0
Expand Down Expand Up @@ -134,7 +134,7 @@ require (
golang.org/x/sys v0.28.0
golang.org/x/text v0.21.0
golang.org/x/time v0.8.0
golang.org/x/tools v0.25.0
golang.org/x/tools v0.26.0
google.golang.org/api v0.214.0
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.67.3
Expand All @@ -143,17 +143,17 @@ require (
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v1.7.0
howett.net/plist v1.0.1
k8s.io/api v0.29.5
k8s.io/apimachinery v0.29.5
k8s.io/client-go v0.29.5
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v0.31.1
kernel.org/pub/linux/libs/security/libcap/cap v1.2.57
)

require (
cloud.google.com/go v0.116.0
cloud.google.com/go/compute v1.29.0
cloud.google.com/go/redis v1.17.2
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.2.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0
Expand Down Expand Up @@ -207,7 +207,7 @@ require (
github.com/otiai10/copy v1.12.0
github.com/pierrec/lz4/v4 v4.1.21
github.com/pkg/xattr v0.4.9
github.com/prometheus/prometheus v0.54.1
github.com/prometheus/prometheus v0.300.1
github.com/shirou/gopsutil/v4 v4.24.10
github.com/teambition/rrule-go v1.8.2
github.com/tklauser/go-sysconf v0.3.12
Expand Down Expand Up @@ -301,9 +301,9 @@ require (
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fearful-symmetry/gomsr v0.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand Down Expand Up @@ -367,7 +367,7 @@ require (
github.com/mitchellh/iochan v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -390,6 +390,7 @@ require (
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
Expand Down Expand Up @@ -464,15 +465,16 @@ require (
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.57 // indirect
mvdan.cc/garble v0.12.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

require (
Expand Down
Loading
Loading