Skip to content

Commit 6809f19

Browse files
mariomacmariomac
committed
simplify some packages
1 parent 97b4be7 commit 6809f19

File tree

12 files changed

+41
-45
lines changed

12 files changed

+41
-45
lines changed

‎pkg/config/ebpf_tracer.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"fmt"
88
"strings"
99
"time"
10-
11-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
1210
)
1311

1412
type ContextPropagationMode uint8
@@ -65,7 +63,7 @@ type EBPFTracer struct {
6563

6664
// Select the TC attachment backend: accepted values are 'tc' (netlink),
6765
// and 'tcx'
68-
TCBackend tcdefs.TCBackend `yaml:"traffic_control_backend" env:"OTEL_EBPF_BPF_TC_BACKEND"`
66+
TCBackend TCBackend `yaml:"traffic_control_backend" env:"OTEL_EBPF_BPF_TC_BACKEND"`
6967

7068
// Disables Beyla black-box context propagation. Used for testing purposes only.
7169
DisableBlackBoxCP bool `yaml:"disable_black_box_cp" env:"OTEL_EBPF_BPF_DISABLE_BLACK_BOX_CP"`

‎pkg/ebpf/tcmanager/tcdefs/tcbackend.go‎ renamed to ‎pkg/config/tcbackend.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package tcdefs
4+
package config
55

66
import (
77
"fmt"

‎pkg/ebpf/tcmanager/cilium_notlinux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package tcmanager
77

88
import (
9-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
9+
"go.opentelemetry.io/obi/pkg/config"
1010
)
1111

12-
func EnsureCiliumCompatibility(_ tcdefs.TCBackend) error {
12+
func EnsureCiliumCompatibility(_ config.TCBackend) error {
1313
return nil
1414
}

‎pkg/ebpf/tcmanager/cilium_support.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/vishvananda/netlink"
1818
"golang.org/x/sys/unix"
1919

20-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
20+
"go.opentelemetry.io/obi/pkg/config"
2121
"go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
2222
)
2323

@@ -123,22 +123,22 @@ func ciliumTCPriorities() (uint16, uint16) {
123123
return minPrio, maxPrio
124124
}
125125

126-
func normalizeBackend(backend tcdefs.TCBackend) tcdefs.TCBackend {
127-
if backend != tcdefs.TCBackendAuto {
126+
func normalizeBackend(backend config.TCBackend) config.TCBackend {
127+
if backend != config.TCBackendAuto {
128128
return backend
129129
}
130130

131131
if tcmanager.IsTCXSupported() {
132-
return tcdefs.TCBackendTCX
132+
return config.TCBackendTCX
133133
}
134134

135-
return tcdefs.TCBackendTC
135+
return config.TCBackendTC
136136
}
137137

138-
func EnsureCiliumCompatibility(backend tcdefs.TCBackend) error {
138+
func EnsureCiliumCompatibility(backend config.TCBackend) error {
139139
// if we are trying to attach to TCX, we will always end up attaching to
140140
// the chain head in front of cilium, so we should be good
141-
if normalizeBackend(backend) == tcdefs.TCBackendTCX {
141+
if normalizeBackend(backend) == config.TCBackendTCX {
142142
return nil
143143
}
144144

‎pkg/internal/ebpf/tcmanager/dummymanager_notlinux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package tcmanager
88
import (
99
"github.com/cilium/ebpf"
1010

11-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
11+
"go.opentelemetry.io/obi/pkg/config"
1212
)
1313

1414
type dummyManager struct{}
@@ -28,4 +28,4 @@ func (d *dummyManager) InterfaceName(_ int) (string, bool) {
2828
func (d *dummyManager) SetInterfaceManager(_ *InterfaceManager) {}
2929
func (d *dummyManager) Errors() chan error { return nil }
3030

31-
func EnsureCiliumCompatibility(_ tcdefs.TCBackend) error { return nil }
31+
func EnsureCiliumCompatibility(_ config.TCBackend) error { return nil }

‎pkg/internal/ebpf/tcmanager/tcmanager.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/cilium/ebpf/asm"
1414
"github.com/cilium/ebpf/link"
1515

16-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
16+
"go.opentelemetry.io/obi/pkg/config"
1717
)
1818

1919
type AttachmentType uint8
@@ -59,13 +59,13 @@ func newTCManagerAuto() TCManager {
5959
return NewNetlinkManager()
6060
}
6161

62-
func NewTCManager(backend tcdefs.TCBackend) TCManager {
62+
func NewTCManager(backend config.TCBackend) TCManager {
6363
switch backend {
64-
case tcdefs.TCBackendTC:
64+
case config.TCBackendTC:
6565
return NewNetlinkManager()
66-
case tcdefs.TCBackendTCX:
66+
case config.TCBackendTCX:
6767
return NewTCXManager()
68-
case tcdefs.TCBackendAuto:
68+
case config.TCBackendAuto:
6969
return newTCManagerAuto()
7070
}
7171

‎pkg/internal/ebpf/tctracer/tctracer.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"go.opentelemetry.io/obi/pkg/components/exec"
1919
"go.opentelemetry.io/obi/pkg/components/svc"
2020
ebpfcommon "go.opentelemetry.io/obi/pkg/ebpf/common"
21-
tcmanager2 "go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
21+
"go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
2222
"go.opentelemetry.io/obi/pkg/internal/goexec"
2323
"go.opentelemetry.io/obi/pkg/obi"
2424
"go.opentelemetry.io/obi/pkg/pipe/msg"
@@ -32,8 +32,8 @@ type Tracer struct {
3232
bpfObjects BpfObjects
3333
closers []io.Closer
3434
log *slog.Logger
35-
ifaceManager *tcmanager2.InterfaceManager
36-
tcManager tcmanager2.TCManager
35+
ifaceManager *tcmanager.InterfaceManager
36+
tcManager tcmanager.TCManager
3737
}
3838

3939
func New(cfg *obi.Config) *Tracer {
@@ -136,11 +136,11 @@ func (p *Tracer) startTC(ctx context.Context) {
136136
return
137137
}
138138

139-
p.ifaceManager = tcmanager2.NewInterfaceManager()
140-
p.tcManager = tcmanager2.NewTCManager(p.cfg.EBPF.TCBackend)
139+
p.ifaceManager = tcmanager.NewInterfaceManager()
140+
p.tcManager = tcmanager.NewTCManager(p.cfg.EBPF.TCBackend)
141141
p.tcManager.SetInterfaceManager(p.ifaceManager)
142-
p.tcManager.AddProgram("tc/tc_egress", p.bpfObjects.ObiAppEgress, tcmanager2.AttachmentEgress)
143-
p.tcManager.AddProgram("tc/tc_ingress", p.bpfObjects.ObiAppIngress, tcmanager2.AttachmentIngress)
142+
p.tcManager.AddProgram("tc/tc_egress", p.bpfObjects.ObiAppEgress, tcmanager.AttachmentEgress)
143+
p.tcManager.AddProgram("tc/tc_ingress", p.bpfObjects.ObiAppIngress, tcmanager.AttachmentIngress)
144144

145145
p.ifaceManager.Start(ctx)
146146
}

‎pkg/internal/netolly/ebpf/tracer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
"github.com/cilium/ebpf/rlimit"
3434

35-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
35+
"go.opentelemetry.io/obi/pkg/config"
3636
convenience "go.opentelemetry.io/obi/pkg/internal/ebpf/convenience"
3737
"go.opentelemetry.io/obi/pkg/internal/ebpf/ringbuf"
3838
"go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
@@ -72,7 +72,7 @@ func NewFlowFetcher(
7272
sampling, cacheMaxSize int,
7373
ingress, egress bool,
7474
ifaceManager *tcmanager.InterfaceManager,
75-
tcBackend tcdefs.TCBackend,
75+
tcBackend config.TCBackend,
7676
) (*FlowFetcher, error) {
7777
tlog := tlog()
7878
if err := rlimit.RemoveMemlock(); err != nil {

‎pkg/internal/netolly/ebpf/tracer_nonlinux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package ebpf
77

88
import (
9-
"go.opentelemetry.io/obi/pkg/ebpf/tcmanager/tcdefs"
9+
"go.opentelemetry.io/obi/pkg/config"
1010
"go.opentelemetry.io/obi/pkg/internal/ebpf/ringbuf"
1111
"go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
1212
)
@@ -17,7 +17,7 @@ func NewFlowFetcher(
1717
_, _ int,
1818
_, _ bool,
1919
_ *tcmanager.InterfaceManager,
20-
_ tcdefs.TCBackend,
20+
_ config.TCBackend,
2121
) (*FlowFetcher, error) {
2222
return nil, nil
2323
}

‎pkg/netolly/agent/agent.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
"go.opentelemetry.io/obi/pkg/components/pipe/global"
3434
"go.opentelemetry.io/obi/pkg/internal/ebpf/ringbuf"
35-
tcmanager2 "go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
35+
"go.opentelemetry.io/obi/pkg/internal/ebpf/tcmanager"
3636
"go.opentelemetry.io/obi/pkg/internal/netolly/ebpf"
3737
"go.opentelemetry.io/obi/pkg/internal/netolly/flow"
3838
"go.opentelemetry.io/obi/pkg/obi"
@@ -97,7 +97,7 @@ type Flows struct {
9797
graph *swarm.Runner
9898

9999
// input data providers
100-
ifaceManager *tcmanager2.InterfaceManager
100+
ifaceManager *tcmanager.InterfaceManager
101101
ebpf ebpfFlowFetcher
102102

103103
// processing nodes to be wired in the buildPipeline method
@@ -124,7 +124,7 @@ func FlowsAgent(ctxInfo *global.ContextInfo, cfg *obi.Config) (*Flows, error) {
124124
alog := alog()
125125
alog.Info("initializing Flows agent")
126126

127-
ifaceManager := tcmanager2.NewInterfaceManager()
127+
ifaceManager := tcmanager.NewInterfaceManager()
128128
ifaceManager.SetChannelBufferLen(cfg.ChannelBufferLen)
129129
ifaceManager.SetPollPeriod(cfg.NetworkFlows.ListenPollPeriod)
130130
ifaceManager.SetMonitorMode(monitorMode(cfg, alog))
@@ -146,7 +146,7 @@ func FlowsAgent(ctxInfo *global.ContextInfo, cfg *obi.Config) (*Flows, error) {
146146
return flowsAgent(ctxInfo, cfg, fetcher, agentIP, ifaceManager)
147147
}
148148

149-
func newFetcher(cfg *obi.Config, alog *slog.Logger, ifaceManager *tcmanager2.InterfaceManager) (ebpfFlowFetcher, error) {
149+
func newFetcher(cfg *obi.Config, alog *slog.Logger, ifaceManager *tcmanager.InterfaceManager) (ebpfFlowFetcher, error) {
150150
switch cfg.NetworkFlows.Source {
151151
case obi.EbpfSourceSock:
152152
alog.Info("using socket filter for collecting network events")
@@ -163,23 +163,23 @@ func newFetcher(cfg *obi.Config, alog *slog.Logger, ifaceManager *tcmanager2.Int
163163
return nil, errors.New("unknown network configuration eBPF source specified, allowed options are [tc, socket_filter]")
164164
}
165165

166-
func monitorMode(cfg *obi.Config, alog *slog.Logger) tcmanager2.MonitorMode {
166+
func monitorMode(cfg *obi.Config, alog *slog.Logger) tcmanager.MonitorMode {
167167
switch cfg.NetworkFlows.ListenInterfaces {
168168
case listenPoll:
169169
alog.Debug("listening for new interfaces: use polling",
170170
"period", cfg.NetworkFlows.ListenPollPeriod)
171171

172-
return tcmanager2.MonitorPoll
172+
return tcmanager.MonitorPoll
173173
case listenWatch:
174174
alog.Debug("listening for new interfaces: use watching")
175175

176-
return tcmanager2.MonitorWatch
176+
return tcmanager.MonitorWatch
177177
}
178178

179179
alog.Warn("wrong interface listen method. Using file watcher as default",
180180
"providedValue", cfg.NetworkFlows.ListenInterfaces)
181181

182-
return tcmanager2.MonitorWatch
182+
return tcmanager.MonitorWatch
183183
}
184184

185185
// flowsAgent is a private constructor with injectable dependencies, usable for tests
@@ -188,10 +188,10 @@ func flowsAgent(
188188
cfg *obi.Config,
189189
fetcher ebpfFlowFetcher,
190190
agentIP net.IP,
191-
ifaceManager *tcmanager2.InterfaceManager,
191+
ifaceManager *tcmanager.InterfaceManager,
192192
) (*Flows, error) {
193193
// configure allow/deny interfaces filter
194-
filter, err := tcmanager2.NewInterfaceFilter(cfg.NetworkFlows.Interfaces, cfg.NetworkFlows.ExcludeInterfaces)
194+
filter, err := tcmanager.NewInterfaceFilter(cfg.NetworkFlows.Interfaces, cfg.NetworkFlows.ExcludeInterfaces)
195195
if err != nil {
196196
return nil, fmt.Errorf("configuring interface filters: %w", err)
197197
}

0 commit comments

Comments
 (0)