Skip to content

Upstream test#2 #184

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

Closed
nsavoire wants to merge 13 commits into from
Closed

Upstream test#2 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
97e40ad
backport: replace per-fileID LRU with a global LRU
nsavoire Jul 29, 2025
b739733
backport: interpreters, reporter: intern symbolization strings
nsavoire Jul 29, 2025
6768052
Disable Go interpreter because we are doing Go symbolization remotely.
nsavoire Jul 30, 2025
72325a9
Update opentelemetry-ebpf-profiler with latest changes from upstream.
nsavoire Jul 30, 2025
994afd3
Update 3rdparty licenses.
nsavoire Jul 30, 2025
1ceafd6
backport: Refactor symbol caching
nsavoire Aug 4, 2025
cc345f5
Use containerID provided by eBPF profiler when available and split by…
nsavoire Aug 4, 2025
7c45b8e
Do not collect Go labels by default
nsavoire Aug 8, 2025
dab7333
Test using event tree similar to upstream.
nsavoire Aug 4, 2025
dee2a1c
Refactor pprof profile builder to use a ProfileBuilder struct
nsavoire Aug 5, 2025
c288005
Improve kernel frames
nsavoire Aug 7, 2025
a3ab067
Count processes that have already exited when attempting to collect t…
nsavoire Aug 8, 2025
ec48c6b
For testing
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
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

publish:
env:
RELEASE_VERSION: ${{ github.event_name == 'pull_request' && 'dev-test' || 'dev' }}
RELEASE_VERSION: ${{ github.event_name == 'pull_request' && 'dev-test-upstream2' || 'dev' }}
if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'publish-dev-test') )}}
name: Publish pre-release
needs: [build]
Expand Down
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 @@ -40,12 +40,16 @@ import,github.com/google/pprof/profile,Apache-2.0,unknown
import,github.com/google/uuid,BSD-3-Clause,"Copyright (c) 2009,2014 Google Inc. All rights reserved."
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 @@ -80,7 +84,7 @@ import,go.opentelemetry.io/otel,Apache-2.0,unknown
import,go.opentelemetry.io/otel/metric,Apache-2.0,unknown
import,go.opentelemetry.io/otel/trace,Apache-2.0,unknown
import,go.uber.org/multierr,MIT,"Copyright (c) 2017-2021 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/net,BSD-3-Clause,Copyright 2009 The Go Authors.
import,golang.org/x/oauth2,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 @@ -117,6 +117,7 @@ type arguments struct {
agentless bool
enableGoRuntimeProfiler bool
enableSplitByService bool
collectContext bool
splitServiceSuffix string
cmd *cli.Command
}
Expand Down Expand Up @@ -393,6 +394,14 @@ func parseArgs() (*arguments, error) {
Destination: &args.splitServiceSuffix,
Sources: cli.EnvVars("DD_HOST_PROFILING_SPLIT_SERVICE_SUFFIX"),
},
&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
53 changes: 28 additions & 25 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,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.12.0
golang.org/x/sys v0.31.0
golang.org/x/sync v0.16.0
golang.org/x/sys v0.34.0
gopkg.in/DataDog/dd-trace-go.v1 v1.72.2
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
Expand All @@ -32,7 +32,7 @@ require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // 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 @@ -47,11 +47,11 @@ 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-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-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand All @@ -64,10 +64,14 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.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.17.9 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // 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 All @@ -78,7 +82,7 @@ require (
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
Expand All @@ -89,30 +93,29 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/richardartoul/molecule v1.0.1-0.20240531184615-7ca0df43c0b3 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/tklauser/numcpus v0.10.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/consumer v1.22.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.116.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/pdata v1.37.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.131.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/metric 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/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/arch v0.19.0 // indirect
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // 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.7.0 // indirect
google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.36.1 // 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
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -128,4 +131,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-20250807091316-7241ff91f321
Loading
Loading