add client ID for plugin service

recorder/plugin.go

@@ -2,58 +2,36 @@ package recorder
 
 import (
 	"context"
+	"io"
 
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/core/recorder"
 	"github.com/go-gost/plugin/recorder/proto"
-	xlogger "github.com/go-gost/x/logger"
 	"google.golang.org/grpc"
 )
 
-type pluginOptions struct {
-	client *grpc.ClientConn
-	logger logger.Logger
+type grpcPluginRecorder struct {
+	conn   grpc.ClientConnInterface
+	client proto.RecorderClient
+	log    logger.Logger
 }
 
-type PluginOption func(opts *pluginOptions)
-
-func PluginConnOption(c *grpc.ClientConn) PluginOption {
-	return func(opts *pluginOptions) {
-		opts.client = c
+// NewGRPCPluginRecorder creates a plugin recorder.
+func NewGRPCPluginRecorder(name string, conn grpc.ClientConnInterface) recorder.Recorder {
+	p := &grpcPluginRecorder{
+		conn: conn,
+		log: logger.Default().WithFields(map[string]any{
+			"kind":     "recorder",
+			"recorder": name,
+		}),
 	}
-}
-
-func LoggerOption(logger logger.Logger) PluginOption {
-	return func(opts *pluginOptions) {
-		opts.logger = logger
-	}
-}
-
-type pluginRecorder struct {
-	client  proto.RecorderClient
-	options pluginOptions
-}
-
-// NewPluginRecorder creates a plugin recorder.
-func NewPluginRecorder(opts ...PluginOption) recorder.Recorder {
-	var options pluginOptions
-	for _, opt := range opts {
-		opt(&options)
-	}
-	if options.logger == nil {
-		options.logger = xlogger.Nop()
-	}
-
-	p := &pluginRecorder{
-		options: options,
-	}
-	if options.client != nil {
-		p.client = proto.NewRecorderClient(options.client)
+	if conn != nil {
+		p.client = proto.NewRecorderClient(conn)
 	}
 	return p
 }
 
-func (p *pluginRecorder) Record(ctx context.Context, b []byte) error {
+func (p *grpcPluginRecorder) Record(ctx context.Context, b []byte) error {
 	if p.client == nil {
 		return nil
 	}
@@ -63,15 +41,15 @@ func (p *pluginRecorder) Record(ctx context.Context, b []byte) error {
 			Data: b,
 		})
 	if err != nil {
-		p.options.logger.Error(err)
+		p.log.Error(err)
 		return err
 	}
 	return nil
 }
 
-func (p *pluginRecorder) Close() error {
-	if p.options.client != nil {
-		return p.options.client.Close()
+func (p *grpcPluginRecorder) Close() error {
+	if closer, ok := p.conn.(io.Closer); ok {
+		return closer.Close()
 	}
 	return nil
 }