Skip to content

Commit 772b6bd

Browse files
committed
Branch for testing upstream merge
1 parent 0baf547 commit 772b6bd

File tree

3 files changed

+83
-65
lines changed

3 files changed

+83
-65
lines changed

go.mod

+22-17
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/containerd/containerd v1.7.20
1717
github.com/docker/docker v27.1.1+incompatible
1818
github.com/dustin/go-humanize v1.0.1
19-
github.com/elastic/go-freelru v0.15.0
19+
github.com/elastic/go-freelru v0.16.0
2020
github.com/gogo/protobuf v1.3.2
2121
github.com/golang/snappy v0.0.4
2222
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
@@ -26,7 +26,7 @@ require (
2626
github.com/prometheus/common v0.54.0
2727
github.com/prometheus/prometheus v0.53.1
2828
github.com/sirupsen/logrus v1.9.3
29-
github.com/stretchr/testify v1.9.0
29+
github.com/stretchr/testify v1.10.0
3030
github.com/tklauser/numcpus v0.8.0
3131
github.com/xyproto/ainur v1.3.3
3232
github.com/zcalusic/sysinfo v1.1.0
@@ -35,18 +35,18 @@ require (
3535
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0
3636
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
3737
go.opentelemetry.io/ebpf-profiler v0.0.0-20241025131851-7fa5b1e60d38
38-
go.opentelemetry.io/otel v1.30.0
38+
go.opentelemetry.io/otel v1.32.0
3939
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
4040
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
4141
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
4242
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
43+
go.opentelemetry.io/otel/sdk v1.32.0
44+
go.opentelemetry.io/otel/trace v1.32.0
4545
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
46+
golang.org/x/sync v0.10.0
47+
golang.org/x/sys v0.29.0
48+
google.golang.org/grpc v1.69.2
49+
google.golang.org/protobuf v1.36.1
5050
gopkg.in/yaml.v3 v3.0.1
5151
k8s.io/api v0.29.3
5252
k8s.io/apimachinery v0.29.3
@@ -126,20 +126,25 @@ require (
126126
github.com/prometheus/client_model v0.6.1 // indirect
127127
github.com/prometheus/procfs v0.15.1 // indirect
128128
go.opencensus.io v0.24.0 // indirect
129-
go.opentelemetry.io/otel/metric v1.30.0 // indirect
129+
go.opentelemetry.io/collector/consumer v1.22.0 // indirect
130+
go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
131+
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
132+
go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
130134
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
135+
go.uber.org/multierr v1.11.0 // indirect
131136
golang.org/x/arch v0.10.0 // indirect
132137
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
138+
golang.org/x/net v0.33.0 // indirect
139+
golang.org/x/oauth2 v0.23.0 // indirect
140+
golang.org/x/term v0.27.0 // indirect
141+
golang.org/x/text v0.21.0 // indirect
137142
golang.org/x/time v0.5.0 // indirect
138143
golang.org/x/tools v0.25.0 // indirect
139144
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
140145
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
146+
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
147+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
143148
gopkg.in/inf.v0 v0.9.1 // indirect
144149
gopkg.in/yaml.v2 v2.4.0 // indirect
145150
k8s.io/klog/v2 v2.120.1 // indirect
@@ -150,4 +155,4 @@ require (
150155
sigs.k8s.io/yaml v1.3.0 // indirect
151156
)
152157

153-
replace go.opentelemetry.io/ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20250123194255-5ace1f159c2f
158+
replace go.opentelemetry.io/ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20250304135238-d388f921dc44

0 commit comments

Comments
 (0)