Add some logs to the remote flare consumer

cmd/launcher/launcher.go

@@ -321,7 +321,7 @@ func runLauncher(ctx context.Context, cancel func(), slogger, systemSlogger *mul
 		actionsQueue.RegisterActor(acceleratecontrolconsumer.AccelerateControlSubsystem, acceleratecontrolconsumer.New(k))
 
 		// register flare consumer
-		actionsQueue.RegisterActor(flareconsumer.FlareSubsystem, flareconsumer.New(logger, k))
+		actionsQueue.RegisterActor(flareconsumer.FlareSubsystem, flareconsumer.New(k))
 
 		// create notification consumer
 		notificationConsumer, err := notificationconsumer.NewNotifyConsumer(

ee/control/consumers/flareconsumer/flareconsumer.go

@@ -1,4 +1,4 @@
 package flareconsumer
 
 import (
 	"context"
@@ -6,11 +6,9 @@
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	"github.com/go-kit/kit/log/level"
-
 	"github.com/kolide/launcher/pkg/agent/types"
 	"github.com/kolide/launcher/pkg/debug/checkups"
 	"github.com/kolide/launcher/pkg/debug/shipper"
@@ -26,7 +24,6 @@
 	lastFlareTime time.Time
 	flarer        flarer
 	knapsack      types.Knapsack
-	logger        log.Logger
 	// newFlareStream is assigned to a field so it can be mocked in tests
 	newFlareStream func(note, uploadRequestURL string) (io.WriteCloser, error)
 }
@@ -41,23 +38,24 @@
 	return checkups.RunFlare(ctx, k, flareStream, checkups.InSituEnvironment)
 }
 
-func New(logger log.Logger, knapsack types.Knapsack) *FlareConsumer {
+func New(knapsack types.Knapsack) *FlareConsumer {
 	return &FlareConsumer{
 		flarer:   &FlareRunner{},
 		knapsack: knapsack,
-		logger:   logger,
 		newFlareStream: func(note, uploadRequestURL string) (io.WriteCloser, error) {
 			return shipper.New(knapsack, shipper.WithNote(note), shipper.WithUploadRequestURL(uploadRequestURL))
 		},
 	}
 }
 
 func (fc *FlareConsumer) Do(data io.Reader) error {
+	// slog needs a ctx
+	ctx := context.TODO()
+
 	timeSinceLastFlare := time.Since(fc.lastFlareTime)
 
 	if timeSinceLastFlare < minFlareInterval {
-		level.Info(fc.logger).Log(
-			"msg", "skipping flare, run too recently",
+		fc.knapsack.Slogger().Log(ctx, slog.LevelInfo, "skipping flare, run too recently",
 			"min_flare_interval", fmt.Sprintf("%v minutes", minFlareInterval.Minutes()),
 			"time_since_last_flare", fmt.Sprintf("%v minutes", timeSinceLastFlare.Minutes()),
 		)
@@ -81,6 +79,10 @@
 		return fmt.Errorf("failed to decode key-value json: %w", err)
 	}
 
+	fc.knapsack.Slogger().Log(ctx, slog.LevelInfo, "Recieved remote flare request",
+		"note", flareData.Note,
+	)
+
 	flareStream, err := fc.newFlareStream(flareData.Note, flareData.UploadRequestURL)
 	if err != nil {
 		return fmt.Errorf("failed to create flare stream: %w", err)