Skip to content

Commit 7e860dc

Browse files
simonswinehainenber
authored andcommitted
Update pyroscope/ebpf to v0.4.6 (grafana#678)
* Update pyroscope/ebpf to v0.4.4 Note: Pyroscope updated its prometheus/common dependecy and hence this required further updates. * Also update windows exporter * Allow pid maps to be configured This also modifieds the way we do defaulting and valides those two new fields. * Update pyroscope/ebpf v0.4.5 This updates the pyroscope/ebpf annotations to both have alloy and river ones. * Add some testing for argument validation * Update to v0.4.6 to fix debug data This also includes a test to make sure debug data is marshalled correctly.
1 parent 1667be7 commit 7e860dc

File tree

7 files changed

+282
-98
lines changed

7 files changed

+282
-98
lines changed

docs/sources/reference/components/pyroscope.ebpf.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Name | Type | Description
5050
`collect_kernel_profile` | `bool` | A flag to enable/disable collection of kernelspace profiles | true | no
5151
`demangle` | `string` | C++ demangle mode. Available options are: `none`, `simplified`, `templates`, `full` | `none` | no
5252
`python_enabled` | `bool` | A flag to enable/disable python profiling | true | no
53+
`symbols_map_size` | `int` | The size of eBPF symbols map | 16384 | no
54+
`pid_map_size` | `int` | The size of eBPF PID map | 2048 | no
5355

5456
## Exported fields
5557

go.mod

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
github.com/google/cadvisor v0.47.0
4848
github.com/google/dnsmasq_exporter v0.2.1-0.20230620100026-44b14480804a
4949
github.com/google/go-cmp v0.6.0
50-
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815
50+
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7
5151
github.com/google/renameio/v2 v2.0.0
5252
github.com/google/uuid v1.6.0
5353
github.com/gorilla/mux v1.8.1
@@ -64,7 +64,7 @@ require (
6464
github.com/grafana/loki/pkg/push v0.0.0-20231212100434-384e5c2dc872 // k180 branch
6565
github.com/grafana/pyroscope-go/godeltaprof v0.1.7
6666
github.com/grafana/pyroscope/api v0.4.0
67-
github.com/grafana/pyroscope/ebpf v0.4.3
67+
github.com/grafana/pyroscope/ebpf v0.4.6
6868
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db
6969
github.com/grafana/snowflake-prometheus-exporter v0.0.0-20221213150626-862cad8e9538
7070
github.com/grafana/tail v0.0.0-20230510142333-77b18831edf0
@@ -148,14 +148,14 @@ require (
148148
github.com/prometheus-community/elasticsearch_exporter v1.5.0
149149
github.com/prometheus-community/postgres_exporter v0.11.1
150150
github.com/prometheus-community/stackdriver_exporter v0.13.0
151-
github.com/prometheus-community/windows_exporter v0.24.1-0.20231127180936-5a872a227c2f
151+
github.com/prometheus-community/windows_exporter v0.25.2-0.20240425065806-f6b91e5cb0f7
152152
github.com/prometheus-operator/prometheus-operator v0.66.0
153153
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.66.0
154154
github.com/prometheus-operator/prometheus-operator/pkg/client v0.66.0
155155
github.com/prometheus/blackbox_exporter v0.24.1-0.20230623125439-bd22efa1c900
156156
github.com/prometheus/client_golang v1.19.0
157-
github.com/prometheus/client_model v0.6.0
158-
github.com/prometheus/common v0.48.0
157+
github.com/prometheus/client_model v0.6.1
158+
github.com/prometheus/common v0.53.0
159159
github.com/prometheus/common/sigv4 v0.1.0
160160
github.com/prometheus/consul_exporter v0.8.0
161161
github.com/prometheus/memcached_exporter v0.13.0
@@ -233,15 +233,15 @@ require (
233233
go.uber.org/zap v1.27.0
234234
golang.org/x/crypto v0.22.0
235235
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91
236-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
237-
golang.org/x/net v0.23.0
238-
golang.org/x/oauth2 v0.17.0
236+
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
237+
golang.org/x/net v0.24.0
238+
golang.org/x/oauth2 v0.18.0
239239
golang.org/x/sys v0.19.0
240240
golang.org/x/text v0.14.0
241241
golang.org/x/time v0.5.0
242-
golang.org/x/tools v0.16.1
242+
golang.org/x/tools v0.17.0
243243
google.golang.org/api v0.155.0
244-
google.golang.org/grpc v1.62.0
244+
google.golang.org/grpc v1.62.1
245245
google.golang.org/protobuf v1.33.0
246246
gopkg.in/yaml.v2 v2.4.0
247247
gopkg.in/yaml.v3 v3.0.1
@@ -301,8 +301,8 @@ require (
301301
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
302302
github.com/Masterminds/goutils v1.1.1 // indirect
303303
github.com/Masterminds/semver/v3 v3.2.0 // indirect
304-
github.com/Microsoft/go-winio v0.6.1 // indirect
305-
github.com/Microsoft/hcsshim v0.11.4 // indirect
304+
github.com/Microsoft/go-winio v0.6.2 // indirect
305+
github.com/Microsoft/hcsshim v0.12.3 // indirect
306306
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
307307
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
308308
github.com/Showmax/go-fqdn v1.0.0 // indirect
@@ -355,11 +355,11 @@ require (
355355
github.com/cloudflare/circl v1.3.7 // indirect
356356
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
357357
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
358-
github.com/containerd/cgroups v1.1.0 // indirect
359358
github.com/containerd/cgroups/v3 v3.0.2 // indirect
360359
github.com/containerd/console v1.0.3 // indirect
361360
github.com/containerd/containerd v1.7.11 // indirect
362361
github.com/containerd/continuity v0.4.2 // indirect
362+
github.com/containerd/errdefs v0.1.0 // indirect
363363
github.com/containerd/log v0.1.0 // indirect
364364
github.com/containerd/ttrpc v1.2.2 // indirect
365365
github.com/coreos/go-semver v0.3.1 // indirect
@@ -373,7 +373,7 @@ require (
373373
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
374374
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
375375
github.com/digitalocean/godo v1.104.1 // indirect
376-
github.com/docker/cli v23.0.3+incompatible // indirect
376+
github.com/docker/cli v24.0.0+incompatible // indirect
377377
github.com/docker/distribution v2.8.2+incompatible // indirect
378378
github.com/docker/go-units v0.5.0 // indirect
379379
github.com/drone/envsubst v1.0.3 // indirect
@@ -573,7 +573,7 @@ require (
573573
github.com/opencontainers/go-digest v1.0.0 // indirect
574574
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
575575
github.com/opencontainers/runc v1.1.12 // indirect
576-
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
576+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
577577
github.com/opencontainers/selinux v1.11.0 // indirect
578578
github.com/openshift/api v3.9.0+incompatible // indirect
579579
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
@@ -636,7 +636,7 @@ require (
636636
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
637637
github.com/vertica/vertica-sql-go v1.3.3 // indirect
638638
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
639-
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
639+
github.com/vishvananda/netns v0.0.4 // indirect
640640
github.com/vmware/govmomi v0.36.1 // indirect
641641
github.com/vultr/govultr/v2 v2.17.2 // indirect
642642
github.com/willf/bitset v1.1.11 // indirect
@@ -685,7 +685,7 @@ require (
685685
google.golang.org/appengine v1.6.8 // indirect
686686
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
687687
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
688-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
688+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
689689
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
690690
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
691691
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -750,7 +750,7 @@ replace (
750750
// https://github.com/grafana/cadvisor/tree/grafana-v0.47-noglobals
751751
github.com/google/cadvisor => github.com/grafana/cadvisor v0.0.0-20231110094609-5f7917925dea
752752

753-
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20240402092333-fad5f95ea113 // exporter-package-v0.15.0 branch
753+
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20240417113938-9358270470dd
754754

755755
// TODO(marctc): remove once this PR is merged upstream: https://github.com/prometheus/mysqld_exporter/pull/774
756756
github.com/prometheus/mysqld_exporter => github.com/grafana/mysqld_exporter v0.12.2-0.20231005125903-364b9c41e595

0 commit comments

Comments
 (0)