refact: make cgmon public

Signed-off-by: ComixHe <self@comix.he.cn>

Author: ComixHe

internal/cgmon/error.go

@@ -3,6 +3,7 @@ package cgmon
 import (
 	"errors"
 	"fmt"
+
 	"golang.org/x/sys/unix"
 )
 

internal/cgmon/monitor_test.go

@@ -3,6 +3,9 @@ package cgmon_test
 import (
 	"context"
 	"fmt"
+	"os"
+	"testing"
+
 	. "github.com/black-desk/cgtproxy/internal/cgmon"
 	"github.com/black-desk/cgtproxy/internal/fswatcher"
 	"github.com/black-desk/cgtproxy/internal/types"
@@ -14,15 +17,13 @@ import (
 	"github.com/sourcegraph/conc/pool"
 	"github.com/tywkeene/go-fsevents"
 	"golang.org/x/sys/unix"
-	"os"
-	"testing"
 )
 
 var _ = Describe("Cgroup monitor create with fake fsevents.Watcher", Ordered, func() {
 	var (
 		w               *fswatcher.Watcher
 		cgroupEventChan chan *types.CgroupEvent
-		monitor         *Monitor
+		monitor         *FSMonitor
 		tmpDir          string
 		err             error
 	)

internal/cgmon/new.go

@@ -4,21 +4,26 @@ import (
 	"github.com/black-desk/cgtproxy/internal/fswatcher"
 	"github.com/black-desk/cgtproxy/internal/types"
 	"github.com/black-desk/cgtproxy/pkg/cgtproxy/config"
+	"github.com/black-desk/cgtproxy/pkg/interfaces"
 	. "github.com/black-desk/lib/go/errwrap"
+
 	"go.uber.org/zap"
 )
 
-type Monitor struct {
+type FSMonitor struct {
 	watcher *fswatcher.Watcher
 	output  chan<- *types.CgroupEvent
 	root    config.CgroupRoot
 	log     *zap.SugaredLogger
 }
 
-func New(opts ...Opt) (ret *Monitor, err error) {
+//go:generate go run github.com/rjeczalik/interfaces/cmd/interfacer@latest -for github.com/black-desk/cgtproxy/internal/cgmon.FSMonitor -as interfaces.CgroupMonitor -o ../../pkg/interfaces/cgmon.go
+var _ interfaces.CgroupMonitor = &FSMonitor{}
+
+func New(opts ...Opt) (ret *FSMonitor, err error) {
 	defer Wrap(&err, "create cgroup monitor")
 
-	m := &Monitor{}
+	m := &FSMonitor{}
 	for i := range opts {
 		m, err = opts[i](m)
 		if err != nil {
@@ -54,10 +59,10 @@ func New(opts ...Opt) (ret *Monitor, err error) {
 	return
 }
 
-type Opt func(mon *Monitor) (ret *Monitor, err error)
+type Opt func(mon *FSMonitor) (ret *FSMonitor, err error)
 
 func WithWatcher(w *fswatcher.Watcher) Opt {
-	return func(mon *Monitor) (ret *Monitor, err error) {
+	return func(mon *FSMonitor) (ret *FSMonitor, err error) {
 		if w == nil {
 			err = ErrWatcherMissing
 			return
@@ -69,7 +74,7 @@ func WithWatcher(w *fswatcher.Watcher) Opt {
 }
 
 func WithOutput(ch chan<- *types.CgroupEvent) Opt {
-	return func(mon *Monitor) (ret *Monitor, err error) {
+	return func(mon *FSMonitor) (ret *FSMonitor, err error) {
 		if ch == nil {
 			err = ErrOutputMissing
 			return
@@ -81,7 +86,7 @@ func WithOutput(ch chan<- *types.CgroupEvent) Opt {
 }
 
 func WithCgroupRoot(root config.CgroupRoot) Opt {
-	return func(mon *Monitor) (ret *Monitor, err error) {
+	return func(mon *FSMonitor) (ret *FSMonitor, err error) {
 		if root == "" {
 			err = ErrCgroupRootMissing
 			return
@@ -93,7 +98,7 @@ func WithCgroupRoot(root config.CgroupRoot) Opt {
 }
 
 func WithLogger(logger *zap.SugaredLogger) Opt {
-	return func(mon *Monitor) (ret *Monitor, err error) {
+	return func(mon *FSMonitor) (ret *FSMonitor, err error) {
 		mon.log = logger
 		ret = mon
 		return

internal/cgmon/run.go

@@ -11,7 +11,7 @@ import (
 	. "github.com/black-desk/lib/go/errwrap"
 )
 
-func (m *Monitor) walkFn(ctx context.Context) func(path string, d fs.DirEntry, err error) error {
+func (m *FSMonitor) walkFn(ctx context.Context) func(path string, d fs.DirEntry, err error) error {
 	return func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
@@ -35,7 +35,7 @@ func (m *Monitor) walkFn(ctx context.Context) func(path string, d fs.DirEntry, e
 	}
 }
 
-func (m *Monitor) walk(ctx context.Context, path string) {
+func (m *FSMonitor) walk(ctx context.Context, path string) {
 	err := m.doWalk(ctx, path)
 	if err == nil {
 		return
@@ -55,12 +55,12 @@ func (m *Monitor) walk(ctx context.Context, path string) {
 	return
 }
 
-func (m *Monitor) doWalk(ctx context.Context, path string) (err error) {
+func (m *FSMonitor) doWalk(ctx context.Context, path string) (err error) {
 	err = filepath.WalkDir(path, m.walkFn(ctx))
 	return
 }
 
-func (m *Monitor) Run(ctx context.Context) (err error) {
+func (m *FSMonitor) Run(ctx context.Context) (err error) {
 	defer close(m.output)
 	defer Wrap(&err, "running cgroup monitor.")
 
@@ -120,7 +120,7 @@ func (m *Monitor) Run(ctx context.Context) (err error) {
 	}
 }
 
-func (m *Monitor) send(ctx context.Context, cgEvent *types.CgroupEvent) (err error) {
+func (m *FSMonitor) send(ctx context.Context, cgEvent *types.CgroupEvent) (err error) {
 	path := strings.TrimRight(cgEvent.Path, "/")
 	cgEvent.Path = path
 

pkg/cgtproxy/new.go

@@ -3,10 +3,10 @@ package cgtproxy
 import (
 	"context"
 
-	"github.com/black-desk/cgtproxy/internal/cgmon"
 	"github.com/black-desk/cgtproxy/internal/fswatcher"
 	"github.com/black-desk/cgtproxy/internal/routeman"
 	"github.com/black-desk/cgtproxy/pkg/cgtproxy/config"
+	"github.com/black-desk/cgtproxy/pkg/interfaces"
 	. "github.com/black-desk/lib/go/errwrap"
 	"github.com/sourcegraph/conc/pool"
 	"go.uber.org/zap"
@@ -24,7 +24,7 @@ type Core struct {
 
 type components struct {
 	w *fswatcher.Watcher
-	m *cgmon.Monitor
+	m interfaces.CgroupMonitor
 	r *routeman.RouteManager
 }
 

pkg/cgtproxy/providers.go

@@ -7,6 +7,7 @@ import (
 	"github.com/black-desk/cgtproxy/internal/routeman"
 	"github.com/black-desk/cgtproxy/internal/types"
 	"github.com/black-desk/cgtproxy/pkg/cgtproxy/config"
+	"github.com/black-desk/cgtproxy/pkg/interfaces"
 	"github.com/google/nftables"
 	"github.com/google/wire"
 	"go.uber.org/zap"
@@ -116,9 +117,9 @@ func provideMonitor(
 	root config.CgroupRoot,
 	logger *zap.SugaredLogger,
 ) (
-	ret *cgmon.Monitor, err error,
+	ret interfaces.CgroupMonitor, err error,
 ) {
-	var m *cgmon.Monitor
+	var m *cgmon.FSMonitor
 
 	m, err = cgmon.New(
 		cgmon.WithOutput(ch),
@@ -143,7 +144,7 @@ func provideBypass(cfg *config.Config) config.Bypass {
 }
 
 func provideComponents(
-	w *fswatcher.Watcher, m *cgmon.Monitor, r *routeman.RouteManager,
+	w *fswatcher.Watcher, m interfaces.CgroupMonitor, r *routeman.RouteManager,
 ) *components {
 	return &components{w: w, m: m, r: r}
 }