Merge pull request #2901 from inspektor-gadget/michael/oci/fix-valida…

…te-settings

clean up operator initialization code

cmd/common/oci.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
 	"github.com/inspektor-gadget/inspektor-gadget/cmd/common/frontends/console"
@@ -41,7 +42,10 @@ func NewRunCommand(rootCmd *cobra.Command, runtime runtime.Runtime, hiddenColumn
 	ociParams := apihelpers.ToParamDescs(ocihandler.OciHandler.InstanceParams()).ToParams()
 
 	// Add operator global flags
-	operatorsGlobalParamsCollection := operators.GlobalParamsCollection()
+	opGlobalParams := make(map[string]*params.Params)
+	for _, op := range operators.GetDataOperators() {
+		opGlobalParams[op.Name()] = apihelpers.ToParamDescs(op.GlobalParams()).ToParams()
+	}
 
 	// gadget parameters are only available after contacting the server
 	gadgetParams := make(params.Params, 0)
@@ -89,6 +93,12 @@ func NewRunCommand(rootCmd *cobra.Command, runtime runtime.Runtime, hiddenColumn
 
 			ops := make([]operators.DataOperator, 0)
 			for _, op := range operators.GetDataOperators() {
+				// Initialize operator
+				err := op.Init(opGlobalParams[op.Name()])
+				if err != nil {
+					log.Warnf("error initializing operator %s: %v", op.Name(), err)
+					continue
+				}
 				ops = append(ops, op)
 			}
 			ops = append(ops, clioperator.CLIOperator)
@@ -197,7 +207,7 @@ func NewRunCommand(rootCmd *cobra.Command, runtime runtime.Runtime, hiddenColumn
 	AddFlags(cmd, runtimeGlobalParams, nil, runtime)
 	AddFlags(cmd, runtimeParams, nil, runtime)
 
-	for _, operatorParams := range operatorsGlobalParamsCollection {
+	for _, operatorParams := range opGlobalParams {
 		AddFlags(cmd, operatorParams, nil, runtime)
 	}
 

cmd/ig/daemon.go

@@ -24,6 +24,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/inspektor-gadget/inspektor-gadget/cmd/common"
 	gadgetservice "github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-service"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-service/api"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/runtime"
@@ -63,6 +64,12 @@ func newDaemonCommand(runtime runtime.Runtime) *cobra.Command {
 		16384,
 		"The events buffer length. A low value could impact horizontal scaling.")
 
+	service := gadgetservice.NewService(log.StandardLogger())
+
+	for _, params := range service.GetOperatorMap() {
+		common.AddFlags(daemonCmd, params, nil, runtime)
+	}
+
 	daemonCmd.RunE = func(cmd *cobra.Command, args []string) error {
 		if os.Geteuid() != 0 {
 			return fmt.Errorf("%s must be run as root to be able to run eBPF programs", filepath.Base(os.Args[0]))
@@ -86,7 +93,8 @@ func newDaemonCommand(runtime runtime.Runtime) *cobra.Command {
 		}
 
 		log.Infof("starting Inspektor Gadget daemon at %q", socket)
-		service := gadgetservice.NewService(log.StandardLogger(), eventBufferLength)
+		service.SetEventBufferLength(eventBufferLength)
+
 		return service.Run(gadgetservice.RunConfig{
 			SocketType: socketType,
 			SocketPath: socketPath,

gadget-container/gadgettracermanager/main.go

@@ -335,7 +335,8 @@ func main() {
 		if err != nil {
 			log.Fatalf("Parsing EVENTS_BUFFER_LENGTH %q: %v", stringBufferLength, err)
 		}
-		service := gadgetservice.NewService(log.StandardLogger(), bufferLength)
+		service := gadgetservice.NewService(log.StandardLogger())
+		service.SetEventBufferLength(bufferLength)
 
 		socketType, socketPath, err := api.ParseSocketAddress(gadgetServiceHost)
 		if err != nil {

pkg/gadget-context/run.go

@@ -41,20 +41,11 @@ func (c *GadgetContext) initAndPrepareOperators(paramValues api.ParamValues) ([]
 		log.Debugf("initializing data op %q", op.Name())
 		opParamPrefix := fmt.Sprintf("operator.%s", op.Name())
 
-		// Lazily initialize operator
-		// TODO: global params should be filled out from a config file or such; maybe it's a better idea not to
-		// lazily initialize operators at all, but just hand over the config. The "lazy" stuff could then be done
-		// if the operator is instantiated and needs to do work
-		err := op.Init(apihelpers.ToParamDescs(op.GlobalParams()).ToParams())
-		if err != nil {
-			return nil, fmt.Errorf("initializing operator %q: %w", op.Name(), err)
-		}
-
 		// Get and fill params
 		instanceParams := op.InstanceParams().AddPrefix(opParamPrefix)
 		opParamValues := paramValues.ExtractPrefixedValues(opParamPrefix)
 
-		err = apihelpers.Validate(instanceParams, opParamValues)
+		err := apihelpers.Validate(instanceParams, opParamValues)
 		if err != nil {
 			return nil, fmt.Errorf("validating params for operator %q: %w", op.Name(), err)
 		}

pkg/gadget-service/service-oci.go

@@ -28,16 +28,31 @@ import (
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/logger"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/operators"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/operators/simple"
+	"github.com/inspektor-gadget/inspektor-gadget/pkg/params"
 )
 
+func (s *Service) initOperators() error {
+	for op, globalParams := range s.operators {
+		err := op.Init(globalParams)
+		if err != nil {
+			return fmt.Errorf("initializing operator %s: %w", op.Name(), err)
+		}
+	}
+	return nil
+}
+
+func (s *Service) GetOperatorMap() map[operators.DataOperator]*params.Params {
+	return s.operators
+}
+
 func (s *Service) GetGadgetInfo(ctx context.Context, req *api.GetGadgetInfoRequest) (*api.GetGadgetInfoResponse, error) {
 	if req.Version != api.VersionGadgetInfo {
 		return nil, fmt.Errorf("expected version to be %d, got %d", api.VersionGadgetInfo, req.Version)
 	}
 
 	// Get all available operators
 	ops := make([]operators.DataOperator, 0)
-	for _, op := range operators.GetDataOperators() {
+	for op := range s.operators {
 		ops = append(ops, op)
 	}
 
@@ -183,7 +198,7 @@ func (s *Service) RunGadget(runGadget api.GadgetManager_RunGadgetServer) error {
 	)
 
 	ops := make([]operators.DataOperator, 0)
-	for _, op := range operators.GetDataOperators() {
+	for op := range s.operators {
 		ops = append(ops, op)
 	}
 	ops = append(ops, svc)

pkg/gadget-service/service.go

@@ -33,9 +33,11 @@ import (
 	gadgetcontext "github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-context"
 	gadgetregistry "github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-registry"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-service/api"
+	apihelpers "github.com/inspektor-gadget/inspektor-gadget/pkg/gadget-service/api-helpers"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/gadgets"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/logger"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/operators"
+	"github.com/inspektor-gadget/inspektor-gadget/pkg/params"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/runtime"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/runtime/local"
 	"github.com/inspektor-gadget/inspektor-gadget/pkg/utils/experimental"
@@ -62,16 +64,27 @@ type Service struct {
 	logger            logger.Logger
 	servers           map[*grpc.Server]struct{}
 	eventBufferLength uint64
+
+	// operators stores all global parameters for DataOperators (non-legacy)
+	operators map[operators.DataOperator]*params.Params
 }
 
-func NewService(defaultLogger logger.Logger, length uint64) *Service {
+func NewService(defaultLogger logger.Logger) *Service {
+	ops := make(map[operators.DataOperator]*params.Params)
+	for _, op := range operators.GetDataOperators() {
+		ops[op] = apihelpers.ToParamDescs(op.GlobalParams()).ToParams()
+	}
 	return &Service{
-		servers:           map[*grpc.Server]struct{}{},
-		logger:            defaultLogger,
-		eventBufferLength: length,
+		servers:   map[*grpc.Server]struct{}{},
+		logger:    defaultLogger,
+		operators: ops,
 	}
 }
 
+func (s *Service) SetEventBufferLength(val uint64) {
+	s.eventBufferLength = val
+}
+
 func (s *Service) GetInfo(ctx context.Context, request *api.InfoRequest) (*api.InfoResponse, error) {
 	catalog, err := s.runtime.GetCatalog()
 	if err != nil {
@@ -328,6 +341,11 @@ func (s *Service) Run(runConfig RunConfig, serverOptions ...grpc.ServerOption) e
 
 	s.servers[server] = struct{}{}
 
+	err = s.initOperators()
+	if err != nil {
+		return fmt.Errorf("initializing operators: %w", err)
+	}
+
 	return server.Serve(s.listener)
 }