Skip to content
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

Update to latest version of our otel library fork. #2996

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Update to latest version of our otel library fork. #2996

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8673fd0
Update to latest version of our otel library fork.
umanwizard Oct 25, 2024
8da4c37
oops, actually bump the version
umanwizard Oct 30, 2024
6c691c5
Update reporter/arrow.go
umanwizard Oct 30, 2024
3668bc7
fix comments
umanwizard Oct 30, 2024
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
2 changes: 1 addition & 1 deletion bump-fork.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
go mod edit -replace github.com/open-telemetry/opentelemetry-ebpf-profiler=github.com/parca-dev/opentelemetry-ebpf-profiler@latest
go mod edit -replace go.opentelemetry.io/ebpf-profiler=github.com/parca-dev/opentelemetry-ebpf-profiler@latest
go mod tidy
6 changes: 2 additions & 4 deletions flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import (
"time"

"github.com/alecthomas/kong"
cebpf "github.com/cilium/ebpf"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/tracer"
"go.opentelemetry.io/ebpf-profiler/tracer"
log "github.com/sirupsen/logrus"
_ "google.golang.org/grpc/encoding/proto"
)
Expand Down Expand Up @@ -67,7 +66,6 @@ func Parse() (Flags, error) {
"default_cpu_sampling_frequency": strconv.Itoa(defaultCPUSamplingFrequency),
"default_map_scale_factor": strconv.Itoa(defaultMapScaleFactor),
"max_map_scale_factor": strconv.Itoa(maxMapScaleFactor),
"default_bpf_log_size": strconv.Itoa(cebpf.DefaultVerifierLogSize),
"default_memlock_rlimit": "0", // No limit by default. (flag is deprecated)
})

Expand Down Expand Up @@ -343,5 +341,5 @@ type FlagsBPF struct {
EventsBufferSize uint32 `default:"8192" help:"Size in pages of the events buffer."`
MapScaleFactor int `default:"${default_map_scale_factor}" help:"Scaling factor for eBPF map sizes. Every increase by 1 doubles the map size. Increase if you see eBPF map size errors. Default is ${default_map_scale_factor} corresponding to 4GB of executable address space, max is ${max_map_scale_factor}."`
VerifierLogLevel uint32 `default:"0" help:"Log level of the eBPF verifier output (0,1,2). Default is 0."`
VerifierLogSize int `default:"${default_bpf_log_size}" help:"Maximum size of the eBPF verifier log."`
VerifierLogSize int `default:"0" help:"[deprecated] Unused."`
}
2 changes: 1 addition & 1 deletion flags/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/libpf"
"go.opentelemetry.io/ebpf-profiler/libpf"
"github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus"
tracing "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
Expand Down
38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
github.com/alecthomas/kong v0.9.0
github.com/apache/arrow/go/v16 v16.1.0
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
github.com/cilium/ebpf v0.15.0
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
github.com/containerd/containerd v1.7.20
github.com/docker/docker v26.1.5+incompatible
Expand All @@ -22,7 +21,6 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/klauspost/compress v1.17.9
github.com/open-telemetry/opentelemetry-ebpf-profiler v0.0.0-20240730064712-a0b8ba402a37
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/common v0.54.0
github.com/prometheus/prometheus v0.53.1
Expand All @@ -35,17 +33,18 @@ require (
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/ebpf-profiler v0.0.0-20241025131851-7fa5b1e60d38
go.opentelemetry.io/otel v1.30.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0
go.opentelemetry.io/otel/sdk v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/sync v0.7.0
golang.org/x/sys v0.21.0
google.golang.org/grpc v1.64.1
go.opentelemetry.io/otel/trace v1.30.0
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/sync v0.8.0
golang.org/x/sys v0.26.0
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.29.3
Expand All @@ -63,6 +62,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cilium/ebpf v0.16.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
Expand All @@ -79,7 +79,7 @@ require (
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 // indirect
github.com/elastic/go-perf v0.0.0-20241016160959-1342461adb4a // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand Down Expand Up @@ -125,20 +125,20 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/tools v0.25.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
Expand All @@ -149,4 +149,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20241009170523-4d0512c029e0
replace go.opentelemetry.io/ebpf-profiler => github.com/parca-dev/opentelemetry-ebpf-profiler v0.0.0-20241029214924-a8bd47565719
Loading