Skip to content

Commit 6d0f426

Browse files
simonswinesimonswine
authored
chore: Update prometheus dependency to 3.5.0 (#4301)
* chore: Update prometheus dependency to 3.5.0; Note: This moves labels.Labels from slicelabels to stringlabels, hence it requires a bit of work. * Update .Hash to .StableHash * Update ebpf range * Use labels builders and labels.Labels in observer * Avoid labels.Len()
1 parent 5ed601a commit 6d0f426

File tree

85 files changed

+1708
-599
lines changed

Some content is hidden

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

85 files changed

+1708
-599
lines changed

‎api/go.mod

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@ require (
77
github.com/gorilla/mux v1.8.0
88
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
99
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
10-
github.com/prometheus/common v0.62.0
10+
github.com/prometheus/common v0.65.0
1111
github.com/stretchr/testify v1.10.0
12-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a
13-
google.golang.org/grpc v1.72.2
12+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822
13+
google.golang.org/grpc v1.73.0
1414
google.golang.org/protobuf v1.36.6
1515
)
1616

1717
require (
1818
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
19-
github.com/kr/text v0.2.0 // indirect
2019
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2120
github.com/rogpeppe/go-internal v1.13.1 // indirect
22-
golang.org/x/net v0.40.0 // indirect
21+
go.opentelemetry.io/otel v1.36.0 // indirect
22+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
23+
golang.org/x/net v0.41.0 // indirect
2324
golang.org/x/sys v0.33.0 // indirect
24-
golang.org/x/text v0.25.0 // indirect
25-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
25+
golang.org/x/text v0.26.0 // indirect
26+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
2627
gopkg.in/yaml.v3 v3.0.1 // indirect
2728
)

‎api/go.sum

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
22
connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
3-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
43
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
54
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
65
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -25,36 +24,36 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgm
2524
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
2625
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
2726
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
28-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
29-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
27+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
28+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
3029
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
3130
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
3231
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
3332
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3433
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
3534
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
36-
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
37-
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
38-
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
39-
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
40-
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
41-
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
42-
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
43-
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
44-
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
45-
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
46-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
47-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
35+
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
36+
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
37+
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
38+
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
39+
go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
40+
go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
41+
go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
42+
go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
43+
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
44+
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
45+
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
46+
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
4847
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
4948
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
50-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
51-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
52-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a h1:SGktgSolFCo75dnHJF2yMvnns6jCmHFJ0vE4Vn2JKvQ=
53-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a/go.mod h1:a77HrdMjoeKbnd2jmgcWdaS++ZLZAEq3orIOAEIKiVw=
54-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
55-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
56-
google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
57-
google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
49+
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
50+
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
51+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY=
52+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc=
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
54+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
55+
google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
56+
google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
5857
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
5958
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
6059
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎ebpf/cmd/playground/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ func collectProfiles(profiles chan *pushv1.PushRequest) {
124124

125125
for _, builder := range builders.Builders {
126126
protoLabels := make([]*typesv1.LabelPair, 0, builder.Labels.Len())
127-
for _, label := range builder.Labels {
127+
builder.Labels.Range(func(label labels.Label) {
128128
protoLabels = append(protoLabels, &typesv1.LabelPair{
129129
Name: label.Name, Value: label.Value,
130130
})
131-
}
131+
})
132132

133133
buf := bytes.NewBuffer(nil)
134134
_, err := builder.Write(buf)

‎ebpf/go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ require (
88
github.com/cespare/xxhash/v2 v2.3.0
99
github.com/cilium/ebpf v0.17.3
1010
github.com/go-kit/log v0.2.1
11-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
11+
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a
1212
github.com/grafana/pyroscope/api v0.4.0
1313
github.com/hashicorp/golang-lru/v2 v2.0.7
14-
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465
15-
github.com/klauspost/compress v1.17.11
14+
github.com/ianlancetaylor/demangle v0.0.0-20250417193237-f615e6bd150b
15+
github.com/klauspost/compress v1.18.0
1616
github.com/pkg/errors v0.9.1
17-
github.com/prometheus/client_golang v1.21.0-rc.0
18-
github.com/prometheus/common v0.62.0
19-
github.com/prometheus/prometheus v0.302.1
17+
github.com/prometheus/client_golang v1.22.0
18+
github.com/prometheus/common v0.65.0
19+
github.com/prometheus/prometheus v0.305.0
2020
github.com/samber/lo v1.38.1
2121
github.com/stretchr/testify v1.10.0
2222
github.com/ulikunitz/xz v0.5.12
@@ -27,22 +27,22 @@ require (
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2929
github.com/go-logfmt/logfmt v0.6.0 // indirect
30-
github.com/google/go-cmp v0.7.0 // indirect
3130
github.com/gorilla/mux v1.8.0 // indirect
3231
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
3332
github.com/jpillora/backoff v1.0.0 // indirect
3433
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3534
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
3635
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
37-
github.com/prometheus/client_model v0.6.1 // indirect
36+
github.com/prometheus/client_model v0.6.2 // indirect
3837
github.com/prometheus/procfs v0.15.1 // indirect
3938
github.com/rogpeppe/go-internal v1.13.1 // indirect
40-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
41-
golang.org/x/net v0.40.0 // indirect
42-
golang.org/x/oauth2 v0.27.0 // indirect
43-
golang.org/x/text v0.25.0 // indirect
44-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
45-
google.golang.org/grpc v1.72.2 // indirect
39+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
40+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
41+
golang.org/x/net v0.41.0 // indirect
42+
golang.org/x/oauth2 v0.30.0 // indirect
43+
golang.org/x/text v0.26.0 // indirect
44+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
45+
google.golang.org/grpc v1.73.0 // indirect
4646
google.golang.org/protobuf v1.36.6 // indirect
4747
gopkg.in/yaml.v2 v2.4.0 // indirect
4848
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)