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

chore: update the opentelemetry-ebpf-profiler version #45

Merged
merged 15 commits into from
Nov 20, 2024
Merged

chore: update the opentelemetry-ebpf-profiler version #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
64b5c6f
chore: update the opentelemetry-ebpf-profiler version
Gandem Nov 14, 2024
88a6774
chore: remove deprecated bpfVerifierLogSize
Gandem Nov 14, 2024
3664da5
chore: remove err from StartPIDEventProcessor signature
Gandem Nov 14, 2024
525dca7
reporter: fully remove host metadata
Gandem Nov 15, 2024
259debc
reporter: rename traceFramesCounts to traceEvents
Gandem Nov 15, 2024
972e432
reporter: remove ReportFallbackSymbol
Gandem Nov 15, 2024
bfb5c23
reporter: add ExecutableKnown and FrameKnown
Gandem Nov 15, 2024
20a199a
reporter: split report creation and start
Gandem Nov 15, 2024
c454d63
reporter: modify FrameMetadata arguments
Gandem Nov 15, 2024
0bb48f4
reporter: change ExecutableMetadata signature
Gandem Nov 15, 2024
2e59441
reporter: remove executables lifetime
Gandem Nov 19, 2024
778b849
main: remove call to tracer.ProbeTracepoint
Gandem Nov 19, 2024
3b9c620
reporter: split reporter cache sizes definition
Gandem Nov 19, 2024
2a9defc
reporter: pass down container metadata in addTraceLabels
Gandem Nov 19, 2024
f4536b1
frames: also remove lifetime
Gandem Nov 20, 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
8 changes: 4 additions & 4 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import,github.com/moby/sys/userns,Apache-2.0,unknown
import,github.com/modern-go/concurrent,Apache-2.0,unknown
import,github.com/modern-go/reflect2,Apache-2.0,unknown
import,github.com/munnerz/goautoneg,BSD-3-Clause,"Copyright (c) 2011, Open Knowledge Foundation Ltd."
import,github.com/open-telemetry/opentelemetry-ebpf-profiler,Apache-2.0,Copyright The OpenTelemetry Authors.
import,github.com/opencontainers/go-digest,Apache-2.0,"Copyright 2019, 2020 OCI Contributors | Copyright 2016 Docker, Inc."
import,github.com/opencontainers/image-spec,Apache-2.0,Copyright 2016 The Linux Foundation.
import,github.com/opencontainers/runtime-spec/specs-go,Apache-2.0,Copyright 2015 The Linux Foundation.
Expand All @@ -73,15 +72,16 @@ import,github.com/x448/float16,MIT,Copyright (c) 2019 Montgomery Edwards⁴⁴
import,github.com/xrash/smetrics,MIT,Copyright (C) 2016 Felipe da Cunha Gonçalves
import,github.com/zeebo/xxh3,BSD-2-Clause,"Copyright (c) 2012-2014, Yann Collet | Copyright (c) 2019, Jeff Wendling"
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,unknown
import,go.opentelemetry.io/otel/metric,Apache-2.0,unknown
import,go.opentelemetry.io/otel/trace,Apache-2.0,unknown
import,go.opentelemetry.io/proto/otlp,Apache-2.0,unknown
import,golang.org/x/arch/arm64/arm64asm,BSD-3-Clause,Copyright (c) 2015 The Go Authors. All rights reserved.
import,golang.org/x/exp/constraints,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
import,golang.org/x/arch/arm64/arm64asm,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 (c) 2009 The Go Authors. All rights reserved.
import,golang.org/x/oauth2,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
import,golang.org/x/sync,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
import,golang.org/x/sync,BSD-3-Clause,Copyright 2009 The Go Authors.
import,golang.org/x/sys/unix,BSD-3-Clause,Copyright 2009 The Go Authors.
import,golang.org/x/term,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
import,golang.org/x/text,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved.
Expand Down
12 changes: 1 addition & 11 deletions cli_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (
"runtime"
"time"

cebpf "github.com/cilium/ebpf"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/tracer"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v3"
"go.opentelemetry.io/ebpf-profiler/tracer"

"github.com/DataDog/dd-otel-host-profiler/version"
)
Expand All @@ -38,7 +37,6 @@ const (

type arguments struct {
bpfVerifierLogLevel uint64
bpfVerifierLogSize uint64
agentURL string
copyright bool
mapScaleFactor uint64
Expand Down Expand Up @@ -97,14 +95,6 @@ func parseArgs() (*arguments, error) {
Destination: &args.bpfVerifierLogLevel,
Sources: cli.EnvVars("DD_HOST_PROFILING_BPF_LOG_LEVEL"),
},
&cli.UintFlag{
Name: "bpf-log-size",
Value: cebpf.DefaultVerifierLogSize,
Usage: "Size in bytes that will be allocated for the eBPF verifier output. " +
"Only takes effect if bpf-log-level > 0.",
Destination: &args.bpfVerifierLogSize,
Sources: cli.EnvVars("DD_HOST_PROFILING_BPF_LOG_SIZE"),
},
&cli.StringFlag{
Name: "agent-url",
Aliases: []string{"U"},
Expand Down
8 changes: 4 additions & 4 deletions containermetadata/containermetadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/client"
lru "github.com/elastic/go-freelru"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/libpf"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/metrics"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/periodiccaller"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/stringutil"
log "github.com/sirupsen/logrus"
"github.com/zeebo/xxh3"
"go.opentelemetry.io/ebpf-profiler/libpf"
"go.opentelemetry.io/ebpf-profiler/metrics"
"go.opentelemetry.io/ebpf-profiler/periodiccaller"
"go.opentelemetry.io/ebpf-profiler/stringutil"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/runtime"
Expand Down
2 changes: 1 addition & 1 deletion containermetadata/containermetadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/containerd/containerd"
"github.com/docker/docker/client"
lru "github.com/elastic/go-freelru"
"github.com/open-telemetry/opentelemetry-ebpf-profiler/libpf"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/ebpf-profiler/libpf"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
30 changes: 15 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ go 1.23.1
require (
github.com/DataDog/jsonapi v0.10.0
github.com/DataDog/zstd v1.5.6
github.com/cilium/ebpf v0.15.0
github.com/containerd/containerd v1.7.22
github.com/docker/docker v27.2.1+incompatible
github.com/elastic/go-freelru v0.13.0
github.com/elastic/go-freelru v0.15.0
github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25
github.com/open-telemetry/opentelemetry-ebpf-profiler v0.0.0-20240918090752-0a8979a41728
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/tklauser/numcpus v0.8.0
github.com/urfave/cli/v3 v3.0.0-alpha9
github.com/zeebo/xxh3 v1.0.2
golang.org/x/sys v0.23.0
go.opentelemetry.io/ebpf-profiler v0.0.0-20241114112653-6d846a2023a0
golang.org/x/sys v0.26.0
gopkg.in/DataDog/dd-trace-go.v1 v1.69.1
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
Expand All @@ -31,6 +30,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/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/continuity v0.4.2 // indirect
Expand All @@ -45,7 +45,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.3 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
Expand Down Expand Up @@ -92,22 +92,22 @@ require (
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/arch v0.10.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
google.golang.org/grpc v1.64.1 // 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
google.golang.org/grpc v1.66.2 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -125,4 +125,4 @@ require (
// To update the Datadog/opentelemetry-ebpf-profiler dependency on latest commit on datadog branch, change the following line to:
// replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler datadog
// and run `GOPRIVATE=github.com/Datadog/* go mod tidy`
replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240923191704-f29cae5f1ff3
replace go.opentelemetry.io/ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20241119174319-901d5b72ce75
Loading