add logging to base producers and consumers

cmd/draconctl/main.go

@@ -1,13 +1,15 @@
 package main
 
 import (
+	"log/slog"
 	"os"
 
 	"github.com/spf13/cobra"
 
 	"github.com/ocurity/dracon/cmd/draconctl/components"
 	"github.com/ocurity/dracon/cmd/draconctl/migrations"
 	"github.com/ocurity/dracon/cmd/draconctl/pipelines"
+	draconLogger "github.com/ocurity/dracon/pkg/log"
 )
 
 var rootCmd = &cobra.Command{
@@ -20,11 +22,10 @@ func main() {
 		ID:    "top-level",
 		Title: "Top-level Commands:",
 	})
-
 	pipelines.RegisterPipelinesSubcommands(rootCmd)
 	migrations.RegisterMigrationsSubcommands(rootCmd)
 	components.RegisterComponentsSubcommands(rootCmd)
-
+	draconLogger.SetDefault(slog.LevelInfo, "", false)
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)

components/consumers/consumer.go

@@ -5,9 +5,12 @@ package consumers
 import (
 	"flag"
 	"fmt"
+	"log/slog"
+	"os"
 
 	v1 "github.com/ocurity/dracon/api/proto/v1"
 
+	draconLogger "github.com/ocurity/dracon/pkg/log"
 	"github.com/ocurity/dracon/pkg/putil"
 )
 
@@ -24,16 +27,26 @@ var (
 	inResults string
 	// Raw represents if the non-enriched results should be used.
 	Raw bool
+	// Debug flag initializes the logger with a debug level
+	Debug bool
 )
 
 func init() {
 	flag.StringVar(&inResults, "in", "", "the directory where dracon producer/enricher outputs are")
 	flag.BoolVar(&Raw, "raw", false, "if the non-enriched results should be used")
+	flag.BoolVar(&Debug, "debug", false, "turn on debug logging")
+
 }
 
 // ParseFlags will parse the input flags for the consumer and perform simple validation.
 func ParseFlags() error {
 	flag.Parse()
+	if Debug {
+		draconLogger.SetDefault(slog.LevelDebug, os.Getenv(EnvDraconScanID), true)
+	} else {
+		draconLogger.SetDefault(slog.LevelInfo, os.Getenv(EnvDraconScanID), true)
+	}
+
 	if len(inResults) < 1 {
 		return fmt.Errorf("in is undefined")
 	}

components/producers/producer.go

@@ -11,13 +11,15 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
 	v1 "github.com/ocurity/dracon/api/proto/v1"
 
+	draconLogger "github.com/ocurity/dracon/pkg/log"
 	"github.com/ocurity/dracon/pkg/putil"
 )
 
@@ -28,6 +30,8 @@ var (
 	OutFile string
 	// Append flag will append to the outfile instead of overwriting, useful when there's multiple inresults.
 	Append bool
+	// Debug flag initializes the logger with a debug level
+	Debug bool
 )
 
 const (
@@ -45,9 +49,15 @@ const (
 func ParseFlags() error {
 	flag.StringVar(&InResults, "in", "", "")
 	flag.StringVar(&OutFile, "out", "", "")
+	flag.BoolVar(&Debug, "debug", false, "turn on debug logging")
 	flag.BoolVar(&Append, "append", false, "Append to output file instead of overwriting it")
 
 	flag.Parse()
+	if Debug {
+		draconLogger.SetDefault(slog.LevelDebug, os.Getenv(EnvDraconScanID), true)
+	} else {
+		draconLogger.SetDefault(slog.LevelInfo, os.Getenv(EnvDraconScanID), true)
+	}
 	if InResults == "" {
 		return fmt.Errorf("in is undefined")
 	}

pkg/log/dracon-logger.go

@@ -5,7 +5,15 @@ import (
 	"os"
 )
 
-func SetDefault(logLevel slog.Level) {
-	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel}))
+func SetDefault(logLevel slog.Level, scanID string, jsonLogging bool) {
+	var logger *slog.Logger
+	if jsonLogging {
+		logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel}))
+	} else {
+		logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel}))
+	}
+	if scanID != "" {
+		logger = logger.With("scanID", scanID)
+	}
 	slog.SetDefault(logger)
 }