Skip to content

Update opentelemetry-ebpf-profiler #172

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

Merged
nsavoire merged 8 commits into from
Aug 18, 2025
Merged

Update opentelemetry-ebpf-profiler #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f11828
backport: replace per-fileID LRU with a global LRU
nsavoire Jul 29, 2025
6eb5bde
backport: interpreters, reporter: intern symbolization strings
nsavoire Jul 29, 2025
080a222
Disable Go interpreter because we are doing Go symbolization remotely.
nsavoire Jul 30, 2025
79e87fe
Update opentelemetry-ebpf-profiler with latest changes from upstream.
nsavoire Jul 30, 2025
11cbd14
Update 3rdparty licenses.
nsavoire Jul 30, 2025
d0e64cd
backport: Refactor symbol caching
nsavoire Aug 4, 2025
01ca89e
Use containerID provided by eBPF profiler when available and split by…
nsavoire Aug 4, 2025
3705ec0
Do not collect Go labels by default
nsavoire Aug 8, 2025
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
6 changes: 5 additions & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,16 @@ import,github.com/google/uuid,BSD-3-Clause,"Copyright (c) 2009,2014 Google Inc.
import,github.com/hashicorp/go-version,MPL-2.0,"Copyright (c) 2014 HashiCorp, Inc."
import,github.com/jonboulle/clockwork,Apache-2.0,unknown
import,github.com/josharian/intern,MIT,Copyright (c) 2019 Josh Bleecher Snyder
import,github.com/josharian/native,MIT,Copyright 2020 Josh Bleecher Snyder
import,github.com/json-iterator/go,MIT,Copyright (c) 2016 json-iterator
import,github.com/klauspost/compress,MIT,Copyright (c) 2012 The Go Authors. All rights reserved. | Copyright (c) 2019 Klaus Post. All rights reserved. | Copyright 2016-2017 The New York Times Company | Copyright (c) 2015 Klaus Post | Copyright (c) 2011 The Snappy-Go Authors. All rights reserved. | Copyright 2016 The filepathx Authors
import,github.com/klauspost/compress/internal/snapref,BSD-3-Clause,Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
import,github.com/klauspost/compress/zstd/internal/xxhash,MIT,Copyright (c) 2016 Caleb Spare
import,github.com/klauspost/cpuid/v2,MIT,Copyright (c) 2015 Klaus Post
import,github.com/mailru/easyjson,MIT,Copyright (c) 2016 Mail.Ru Group
import,github.com/mdlayher/kobject,MIT,Copyright (C) 2017 Matt Layher
import,github.com/mdlayher/netlink,MIT,Copyright (C) 2016-2022 Matt Layher
import,github.com/mdlayher/socket,MIT,Copyright (C) 2021 Matt Layher
import,github.com/minio/sha256-simd,Apache-2.0,unknown
import,github.com/moby/docker-image-spec/specs-go/v1,Apache-2.0,unknown
import,github.com/moby/locker,Apache-2.0,"Copyright 2013-2018 Docker, Inc."
Expand Down Expand Up @@ -122,7 +126,7 @@ import,go.opentelemetry.io/otel/trace,Apache-2.0,unknown
import,go.uber.org/atomic,MIT,"Copyright (c) 2016 Uber Technologies, Inc."
import,go.uber.org/multierr,MIT,"Copyright (c) 2017-2021 Uber Technologies, Inc."
import,go.uber.org/zap,MIT,"Copyright (c) 2016-2017 Uber Technologies, Inc."
import,golang.org/x/arch/arm64/arm64asm,BSD-3-Clause,Copyright 2015 The Go Authors.
import,golang.org/x/arch,BSD-3-Clause,Copyright 2015 The Go Authors.
import,golang.org/x/exp/constraints,BSD-3-Clause,Copyright 2009 The Go Authors.
import,golang.org/x/mod/semver,BSD-3-Clause,Copyright 2009 The Go Authors.
import,golang.org/x/net,BSD-3-Clause,Copyright 2009 The Go Authors.
Expand Down
9 changes: 9 additions & 0 deletions cli_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ type arguments struct {
goRuntimeMetricsStatsdAddress string
enableSplitByService bool
splitServiceSuffix string
collectContext bool
cmd *cli.Command
}

Expand Down Expand Up @@ -418,6 +419,14 @@ func parseArgs() (*arguments, error) {
Destination: &args.uploadSymbolsHTTP2,
Sources: cli.EnvVars("DD_HOST_PROFILING_UPLOAD_SYMBOLS_HTTP2"),
},
&cli.BoolFlag{
Name: "collect-context",
Value: false,
Hidden: true,
Usage: "Enable context collection.",
Destination: &args.collectContext,
Sources: cli.EnvVars("DD_HOST_PROFILING_COLLECT_CONTEXT"),
},
},
Action: func(_ context.Context, cmd *cli.Command) error {
args.cmd = cmd
Expand Down
3 changes: 2 additions & 1 deletion containermetadata/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ func (p *containerIDProvider) GetContainerMetadata(pid libpf.PID) (ContainerMeta
isHostCgroupNamespace(cgroupNsFilePath))
}

return ContainerMetadata{ContainerID: containerID, EntityID: entityID}, nil
// Only fill EntityID, but not ContainerID, ContainerID is only used by containerMetadataProvider.
return ContainerMetadata{EntityID: entityID}, nil
}

// parseContainerID finds the first container ID reading from r and returns it.
Expand Down
60 changes: 32 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/urfave/cli/v3 v3.1.1
github.com/zeebo/xxh3 v1.0.2
go.opentelemetry.io/ebpf-profiler v0.0.0-20241114112653-6d846a2023a0
golang.org/x/sync v0.13.0
golang.org/x/sys v0.33.0
golang.org/x/sync v0.16.0
golang.org/x/sys v0.34.0
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
Expand Down Expand Up @@ -49,7 +49,7 @@ require (
github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/cilium/ebpf v0.16.0 // indirect
github.com/cilium/ebpf v0.19.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd/api v1.8.0 // indirect
github.com/containerd/continuity v0.4.4 // indirect
Expand All @@ -67,11 +67,11 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
github.com/ebitengine/purego v0.8.3 // indirect
github.com/elastic/go-perf v0.0.0-20241016160959-1342461adb4a // indirect
github.com/elastic/go-perf v0.0.0-20241029065020-30bec95324b8 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand All @@ -87,11 +87,15 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mdlayher/kobject v0.0.0-20200520190114-19ca17470d7d // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/locker v1.0.1 // indirect
Expand Down Expand Up @@ -127,36 +131,36 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component v1.31.0 // indirect
go.opentelemetry.io/collector/consumer v1.31.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 // indirect
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
go.opentelemetry.io/collector/pdata v1.31.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
go.opentelemetry.io/collector/component v1.37.0 // indirect
go.opentelemetry.io/collector/consumer v1.37.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.131.0 // indirect
go.opentelemetry.io/collector/featuregate v1.37.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.131.0 // indirect
go.opentelemetry.io/collector/pdata v1.37.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.131.0 // indirect
go.opentelemetry.io/collector/semconv v0.125.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/log v0.11.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/log v0.13.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/arch v0.19.0 // indirect
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
google.golang.org/grpc v1.72.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
google.golang.org/grpc v1.74.2 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -174,4 +178,4 @@ require (
// To update the Datadog/opentelemetry-ebpf-profiler dependency on latest commit on datadog branch, change the following line to:
// replace go.opentelemetry.io/ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler datadog
// and run `go mod tidy`
replace go.opentelemetry.io/ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20250728155009-e8783b5032af
replace go.opentelemetry.io/ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20250808130051-25ec00d52d7a
Loading