fix(circular dependency): bug fix

microsoft · Feb 8, 2025 · 0c26b8b · 0c26b8b
1 parent 45585af
commit 0c26b8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pkg/managers/pluginmanager/pluginmanager.go b/pkg/managers/pluginmanager/pluginmanager.go
@@ -138,10 +138,11 @@ func (p *PluginManager) Start(ctx context.Context) error {
 	g, ctx := errgroup.WithContext(ctx)
 
 	// run conntrack GC
-	ct, err := conntrack.New(p.cfg)
+	ct, err := conntrack.New()
 	if err != nil {
 		return errors.Wrap(err, "failed to get conntrack instance")
 	}
+	ct.SetConfig(p.cfg)
 	g.Go(func() error {
 		return errors.Wrapf(ct.Run(ctx), "failed to run conntrack GC")
 	})

diff --git a/pkg/plugin/conntrack/conntrack_linux.go b/pkg/plugin/conntrack/conntrack_linux.go
@@ -48,7 +48,7 @@ func Init() error {
 }
 
 // New creates a new Conntrack instance
-func New(cfg *config.Config) (*Conntrack, error) {
+func New() (*Conntrack, error) {
 	objs := &conntrackObjects{}
 	err := loadConntrackObjects(objs, &ebpf.CollectionOptions{
 		Maps: ebpf.MapOptions{
@@ -64,11 +64,15 @@ func New(cfg *config.Config) (*Conntrack, error) {
 		gcFrequency: defaultGCFrequency,
 		objs:        objs,
 		ctMap:       objs.RetinaConntrack,
-		cfg:         cfg,
 	}
 	return ct, nil
 }
 
+// SetConfig sets the config after initialization
+func (ct *Conntrack) SetConfig(cfg *config.Config) {
+	ct.cfg = cfg
+}
+
 // Build dynamic header path
 func BuildDynamicHeaderPath() string {
 	// Get absolute path to this file during runtime.

diff --git a/pkg/plugin/conntrack/types_linux.go b/pkg/plugin/conntrack/types_linux.go
@@ -22,7 +22,6 @@ type Conntrack struct {
 	objs        *conntrackObjects
 	ctMap       *ebpf.Map
 	gcFrequency time.Duration
-	isRunning   bool
 	cfg         *config.Config
 }