Skip to content

Commit 6e9bf52

Browse files
committed
Branch for testing upstream merge
1 parent 0baf547 commit 6e9bf52

File tree

5 files changed

+84
-196
lines changed

5 files changed

+84
-196
lines changed

go.mod

+23-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/parca-dev/parca-agent
22

3-
go 1.22.2
4-
5-
toolchain go1.22.4
3+
go 1.23.6
64

75
require (
86
buf.build/gen/go/parca-dev/parca/grpc/go v1.4.0-20240704144942-962b089b15fc.2
@@ -16,7 +14,7 @@ require (
1614
github.com/containerd/containerd v1.7.20
1715
github.com/docker/docker v27.1.1+incompatible
1816
github.com/dustin/go-humanize v1.0.1
19-
github.com/elastic/go-freelru v0.15.0
17+
github.com/elastic/go-freelru v0.16.0
2018
github.com/gogo/protobuf v1.3.2
2119
github.com/golang/snappy v0.0.4
2220
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
@@ -26,7 +24,7 @@ require (
2624
github.com/prometheus/common v0.54.0
2725
github.com/prometheus/prometheus v0.53.1
2826
github.com/sirupsen/logrus v1.9.3
29-
github.com/stretchr/testify v1.9.0
27+
github.com/stretchr/testify v1.10.0
3028
github.com/tklauser/numcpus v0.8.0
3129
github.com/xyproto/ainur v1.3.3
3230
github.com/zcalusic/sysinfo v1.1.0
@@ -35,18 +33,18 @@ require (
3533
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0
3634
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
3735
go.opentelemetry.io/ebpf-profiler v0.0.0-20241025131851-7fa5b1e60d38
38-
go.opentelemetry.io/otel v1.30.0
36+
go.opentelemetry.io/otel v1.32.0
3937
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
4038
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
4139
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
4240
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0
43-
go.opentelemetry.io/otel/sdk v1.28.0
44-
go.opentelemetry.io/otel/trace v1.30.0
41+
go.opentelemetry.io/otel/sdk v1.32.0
42+
go.opentelemetry.io/otel/trace v1.32.0
4543
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
46-
golang.org/x/sync v0.8.0
47-
golang.org/x/sys v0.26.0
48-
google.golang.org/grpc v1.66.2
49-
google.golang.org/protobuf v1.34.2
44+
golang.org/x/sync v0.10.0
45+
golang.org/x/sys v0.29.0
46+
google.golang.org/grpc v1.69.2
47+
google.golang.org/protobuf v1.36.1
5048
gopkg.in/yaml.v3 v3.0.1
5149
k8s.io/api v0.29.3
5250
k8s.io/apimachinery v0.29.3
@@ -126,20 +124,25 @@ require (
126124
github.com/prometheus/client_model v0.6.1 // indirect
127125
github.com/prometheus/procfs v0.15.1 // indirect
128126
go.opencensus.io v0.24.0 // indirect
129-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
127+
go.opentelemetry.io/collector/consumer v1.22.0 // indirect
128+
go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
129+
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
130+
go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect
131+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
130132
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
133+
go.uber.org/multierr v1.11.0 // indirect
131134
golang.org/x/arch v0.10.0 // indirect
132135
golang.org/x/mod v0.21.0 // indirect
133-
golang.org/x/net v0.29.0 // indirect
134-
golang.org/x/oauth2 v0.21.0 // indirect
135-
golang.org/x/term v0.24.0 // indirect
136-
golang.org/x/text v0.18.0 // indirect
136+
golang.org/x/net v0.33.0 // indirect
137+
golang.org/x/oauth2 v0.23.0 // indirect
138+
golang.org/x/term v0.27.0 // indirect
139+
golang.org/x/text v0.21.0 // indirect
137140
golang.org/x/time v0.5.0 // indirect
138141
golang.org/x/tools v0.25.0 // indirect
139142
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
140143
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
144+
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
145+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
143146
gopkg.in/inf.v0 v0.9.1 // indirect
144147
gopkg.in/yaml.v2 v2.4.0 // indirect
145148
k8s.io/klog/v2 v2.120.1 // indirect
@@ -150,4 +153,4 @@ require (
150153
sigs.k8s.io/yaml v1.3.0 // indirect
151154
)
152155

153-
replace go.opentelemetry.io/ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20250123194255-5ace1f159c2f
156+
replace go.opentelemetry.io/ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20250306230038-78e858b85337

0 commit comments

Comments
 (0)