Test capabilities and ensure tracer is only instantiated when required

grafana · Oct 17, 2024 · 538f800 · 538f800
1 parent 896f002
commit 538f800
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/beyla/os.go b/pkg/beyla/os.go
@@ -83,6 +83,10 @@ func checkCapabilitiesForSetOptions(config *Config, caps *helpers.OSCapabilities
  if config.Enabled(FeatureAppO11y) {
  testAndSet(caps, capError, unix.CAP_CHECKPOINT_RESTORE)
  testAndSet(caps, capError, unix.CAP_SYS_PTRACE)
+
+ if config.EBPF.UseLinuxTC {
+ testAndSet(caps, capError, unix.CAP_NET_ADMIN)
+ }
  }
 
  if config.Enabled(FeatureNetO11y) {

diff --git a/pkg/internal/discover/finder.go b/pkg/internal/discover/finder.go
@@ -98,5 +98,9 @@ func newGoTracersGroup(cfg *beyla.Config, metrics imetrics.Reporter) []ebpf.Trac
 }
 
 func newGenericTracersGroup(cfg *beyla.Config, metrics imetrics.Reporter) []ebpf.Tracer {
- return []ebpf.Tracer{generictracer.New(cfg, metrics), tctracer.New(cfg)}
+ if cfg.EBPF.UseLinuxTC {
+ return []ebpf.Tracer{generictracer.New(cfg, metrics), tctracer.New(cfg)}
+ }
+
+ return []ebpf.Tracer{generictracer.New(cfg, metrics)}
 }