Skip to content

[PROF-13166] Update to latest upstream changes #279

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+281 −220
Open

[PROF-13166] Update to latest upstream changes #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb49e4e
Update to latest upstream changes
nsavoire Nov 19, 2025
e77e823
Adapt gopclntab parsing to latest upstream changes
nsavoire Nov 19, 2025
0aa5062
Adapt symbol uploader to latest upstream changes
nsavoire Nov 19, 2025
373be41
Adapt runner to latest upstream changes
nsavoire Nov 19, 2025
ffd5a71
Adapt reporter to latest upstream changes
nsavoire Nov 19, 2025
f2d0318
Update 3rdparty licenses
nsavoire Nov 19, 2025
7a180c8
Add option to report idle frames
nsavoire Nov 21, 2025
3d0fc01
Skip small segments in search for gopclntab
nsavoire Nov 21, 2025
4a587da
Report CPU id
nsavoire Nov 21, 2025
df3b59f
Add CPU ID label to custom context tags
nsavoire Nov 25, 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: 1 addition & 5 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,17 @@ import,go.opentelemetry.io/collector/component,Apache-2.0,unknown
import,go.opentelemetry.io/collector/consumer,Apache-2.0,unknown
import,go.opentelemetry.io/collector/consumer/xconsumer,Apache-2.0,unknown
import,go.opentelemetry.io/collector/featuregate,Apache-2.0,unknown
import,go.opentelemetry.io/collector/internal/telemetry,Apache-2.0,unknown
import,go.opentelemetry.io/collector/pdata,Apache-2.0,unknown
import,go.opentelemetry.io/collector/pdata/pprofile,Apache-2.0,unknown
import,go.opentelemetry.io/collector/semconv,Apache-2.0,unknown
import,go.opentelemetry.io/contrib/bridges/otelzap,Apache-2.0,unknown
import,go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp,Apache-2.0,unknown
import,go.opentelemetry.io/ebpf-profiler,Apache-2.0,unknown
import,go.opentelemetry.io/otel,Apache-2.0,Copyright 2009 The Go Authors.
import,go.opentelemetry.io/otel/log,Apache-2.0,Copyright 2009 The Go Authors.
import,go.opentelemetry.io/otel/metric,Apache-2.0,Copyright 2009 The Go Authors.
import,go.opentelemetry.io/otel/sdk,Apache-2.0,Copyright 2009 The Go Authors.
import,go.opentelemetry.io/otel/trace,Apache-2.0,Copyright 2009 The Go Authors.
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,go.uber.org/zap,MIT,"Copyright (c) 2016-2024 Uber Technologies, Inc."
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.
Expand Down
8 changes: 8 additions & 0 deletions config/cli_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const (
DefaultProbabilisticInterval = 1 * time.Minute
DefaultArgSendErrorFrames = false
DefaultArgAgentURL = "http://localhost:8126"
DefaultSendIdleFrames = false

DefaultSymbolQueryInterval = 5 * time.Second
DefaultUploadSymbolsDryRun = false
Expand Down Expand Up @@ -216,6 +217,13 @@ func parseCLIArgs(osArgs []string) (*Arguments, error) {
Destination: &args.SendErrorFrames,
Sources: cli.EnvVars("DD_HOST_PROFILING_SEND_ERROR_FRAMES"),
},
&cli.BoolFlag{
Name: "send-idle-frames",
Value: DefaultSendIdleFrames,
Usage: "Unwind and report idle states of the Linux kernel.",
Destination: &args.SendIdleFrames,
Sources: cli.EnvVars("DD_HOST_PROFILING_USE_RUNTIME_ID_IN_SERVICE_ENTITY_KEY"),
},
&cli.StringFlag{
Name: "tracers",
Aliases: []string{"t"},
Expand Down
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ type Config struct {
SamplesPerSecond uint64
PprofPrefix string
SendErrorFrames bool
SendIdleFrames bool
HostServiceName string
Environment string
UploadSymbolQueryInterval time.Duration
Expand Down
50 changes: 23 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ require (
github.com/zeebo/xxh3 v1.0.2
go.opentelemetry.io/ebpf-profiler v0.0.0-20241114112653-6d846a2023a0
go.opentelemetry.io/otel/metric v1.38.0
golang.org/x/sync v0.17.0
golang.org/x/sys v0.36.0
golang.org/x/sync v0.18.0
golang.org/x/sys v0.38.0
k8s.io/api v0.32.3
k8s.io/apimachinery v0.32.3
k8s.io/client-go v0.32.3
Expand Down Expand Up @@ -54,7 +54,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.19.0 // indirect
github.com/cilium/ebpf v0.20.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 Down Expand Up @@ -95,7 +95,7 @@ require (
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/compress v1.18.1 // 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
Expand Down Expand Up @@ -137,37 +137,33 @@ require (
github.com/x448/float16 v0.8.4 // indirect
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.41.1-0.20250918163459-ba0b327d5fe9 // indirect
go.opentelemetry.io/collector/consumer v1.41.1-0.20250915160638-4b4e557b86cb // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.135.1-0.20250918163459-ba0b327d5fe9 // indirect
go.opentelemetry.io/collector/featuregate v1.41.1-0.20250915160638-4b4e557b86cb // indirect
go.opentelemetry.io/collector/internal/telemetry v0.135.1-0.20250915160638-4b4e557b86cb // indirect
go.opentelemetry.io/collector/pdata v1.41.1-0.20250918163459-ba0b327d5fe9 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.135.1-0.20250918163459-ba0b327d5fe9 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/collector/component v1.46.1-0.20251125233348-7ae5e87eb26c // indirect
go.opentelemetry.io/collector/consumer v1.46.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.140.1-0.20251125233348-7ae5e87eb26c // indirect
go.opentelemetry.io/collector/featuregate v1.46.0 // indirect
go.opentelemetry.io/collector/pdata v1.46.1-0.20251125233348-7ae5e87eb26c // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.140.1-0.20251125233348-7ae5e87eb26c // indirect
go.opentelemetry.io/collector/semconv v0.125.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.38.0 // indirect
go.opentelemetry.io/otel/log v0.14.0 // indirect
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
go.opentelemetry.io/otel/trace v1.38.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.21.0 // indirect
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
golang.org/x/mod v0.28.0 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
go.uber.org/zap v1.27.1 // indirect
golang.org/x/arch v0.23.0 // indirect
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect
golang.org/x/oauth2 v0.32.0 // indirect
golang.org/x/term v0.36.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/time v0.12.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-20250707201910-8d1bb00bc6a7 // indirect
google.golang.org/grpc v1.75.1 // indirect
google.golang.org/protobuf v1.36.9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
google.golang.org/grpc v1.77.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand All @@ -184,4 +180,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-20250924090340-f5c7be4f1db8
replace go.opentelemetry.io/ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20251126140100-039c456bd3c8
Loading