Merge branch 'main' into becca/store-by-registration

kolide · Dec 11, 2024 · 971ac3e · 971ac3e
2 parents 9fd8070 + 10cee88
commit 971ac3e
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 96 deletions.
diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go
@@ -42,7 +42,6 @@ import (
 	"github.com/kolide/launcher/ee/debug/checkups"
 	desktopRunner "github.com/kolide/launcher/ee/desktop/runner"
 	"github.com/kolide/launcher/ee/localserver"
-	kolidelog "github.com/kolide/launcher/ee/log/osquerylogs"
 	"github.com/kolide/launcher/ee/powereventwatcher"
 	"github.com/kolide/launcher/ee/tuf"
 	"github.com/kolide/launcher/ee/watchdog"
@@ -371,22 +370,6 @@ func runLauncher(ctx context.Context, cancel func(), multiSlogger, systemMultiSl
 	osqueryRunner := osqueryruntime.New(
 		k,
 		client,
-		osqueryruntime.WithStdout(kolidelog.NewOsqueryLogAdapter(
-			k.Slogger().With(
-				"component", "osquery",
-				"osqlevel", "stdout",
-			),
-			k.RootDirectory(),
-			kolidelog.WithLevel(slog.LevelDebug),
-		)),
-		osqueryruntime.WithStderr(kolidelog.NewOsqueryLogAdapter(
-			k.Slogger().With(
-				"component", "osquery",
-				"osqlevel", "stderr",
-			),
-			k.RootDirectory(),
-			kolidelog.WithLevel(slog.LevelInfo),
-		)),
 		osqueryruntime.WithAugeasLensFunction(augeas.InstallLenses),
 	)
 	runGroup.Add("osqueryRunner", osqueryRunner.Run, osqueryRunner.Interrupt)

diff --git a/pkg/osquery/runtime/osqueryinstance.go b/pkg/osquery/runtime/osqueryinstance.go
@@ -18,6 +18,7 @@ import (
 	"github.com/kolide/kit/ulid"
 	"github.com/kolide/launcher/ee/agent/types"
 	"github.com/kolide/launcher/ee/gowrapper"
+	kolidelog "github.com/kolide/launcher/ee/log/osquerylogs"
 	"github.com/kolide/launcher/pkg/backoff"
 	launcherosq "github.com/kolide/launcher/pkg/osquery"
 	"github.com/kolide/launcher/pkg/osquery/runtime/history"
@@ -71,24 +72,6 @@ func WithExtensionSocketPath(path string) OsqueryInstanceOption {
 	}
 }
 
-// WithStdout is a functional option which allows the user to define where the
-// stdout of the osquery process should be directed. By default, the output will
-// be discarded. This should only be configured once.
-func WithStdout(w io.Writer) OsqueryInstanceOption {
-	return func(i *OsqueryInstance) {
-		i.opts.stdout = w
-	}
-}
-
-// WithStderr is a functional option which allows the user to define where the
-// stderr of the osquery process should be directed. By default, the output will
-// be discarded. This should only be configured once.
-func WithStderr(w io.Writer) OsqueryInstanceOption {
-	return func(i *OsqueryInstance) {
-		i.opts.stderr = w
-	}
-}
-
 // WithAugeasLensFunction defines a callback function. This can be
 // used during setup to populate the augeas lenses directory.
 func WithAugeasLensFunction(f func(dir string) error) OsqueryInstanceOption {
@@ -185,8 +168,6 @@ type osqueryOptions struct {
 	// options included by the caller of LaunchOsqueryInstance
 	augeasLensFunc      func(dir string) error
 	extensionSocketPath string
-	stderr              io.Writer
-	stdout              io.Writer
 }
 
 func newInstance(registrationId string, knapsack types.Knapsack, serviceClient service.KolideService, opts ...OsqueryInstanceOption) *OsqueryInstance {
@@ -767,12 +748,26 @@ func (i *OsqueryInstance) createOsquerydCommand(osquerydBinary string, paths *os
 	}
 
 	cmd.Args = append(cmd.Args, platformArgs()...)
-	if i.opts.stdout != nil {
-		cmd.Stdout = i.opts.stdout
-	}
-	if i.opts.stderr != nil {
-		cmd.Stderr = i.opts.stderr
-	}
+	cmd.Stdout = kolidelog.NewOsqueryLogAdapter(
+		i.knapsack.Slogger().With(
+			"component", "osquery",
+			"osqlevel", "stdout",
+			"registration_id", i.registrationId,
+			"instance_run_id", i.runId,
+		),
+		i.knapsack.RootDirectory(),
+		kolidelog.WithLevel(slog.LevelDebug),
+	)
+	cmd.Stderr = kolidelog.NewOsqueryLogAdapter(
+		i.knapsack.Slogger().With(
+			"component", "osquery",
+			"osqlevel", "stderr",
+			"registration_id", i.registrationId,
+			"instance_run_id", i.runId,
+		),
+		i.knapsack.RootDirectory(),
+		kolidelog.WithLevel(slog.LevelInfo),
+	)
 
 	// Apply user-provided flags last so that they can override other flags set
 	// by Launcher (besides the flags below)

diff --git a/pkg/osquery/runtime/osqueryinstance_test.go b/pkg/osquery/runtime/osqueryinstance_test.go
@@ -3,7 +3,6 @@ package runtime
 import (
 	"context"
 	"fmt"
-	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -61,13 +60,12 @@ func TestCreateOsqueryCommand(t *testing.T) {
 	k.On("OsqueryVerbose").Return(true)
 	k.On("OsqueryFlags").Return([]string{})
 	k.On("Slogger").Return(multislogger.NewNopLogger())
+	k.On("RootDirectory").Return("")
 
-	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient(), WithStdout(os.Stdout), WithStderr(os.Stderr))
+	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient())
 
-	cmd, err := i.createOsquerydCommand(osquerydPath, paths)
+	_, err := i.createOsquerydCommand(osquerydPath, paths)
 	require.NoError(t, err)
-	require.Equal(t, os.Stderr, cmd.Stderr)
-	require.Equal(t, os.Stdout, cmd.Stdout)
 
 	k.AssertExpectations(t)
 }
@@ -83,6 +81,7 @@ func TestCreateOsqueryCommandWithFlags(t *testing.T) {
 	k.On("OsqueryFlags").Return([]string{"verbose=false", "windows_event_channels=foo,bar"})
 	k.On("OsqueryVerbose").Return(true)
 	k.On("Slogger").Return(multislogger.NewNopLogger())
+	k.On("RootDirectory").Return("")
 
 	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient())
 
@@ -116,6 +115,7 @@ func TestCreateOsqueryCommand_SetsEnabledWatchdogSettingsAppropriately(t *testin
 	k.On("Slogger").Return(multislogger.NewNopLogger())
 	k.On("OsqueryVerbose").Return(true)
 	k.On("OsqueryFlags").Return([]string{})
+	k.On("RootDirectory").Return("")
 
 	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient())
 
@@ -165,6 +165,7 @@ func TestCreateOsqueryCommand_SetsDisabledWatchdogSettingsAppropriately(t *testi
 	k.On("Slogger").Return(multislogger.NewNopLogger())
 	k.On("OsqueryVerbose").Return(true)
 	k.On("OsqueryFlags").Return([]string{})
+	k.On("RootDirectory").Return("")
 
 	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient())
 

diff --git a/pkg/osquery/runtime/osqueryinstance_windows_test.go b/pkg/osquery/runtime/osqueryinstance_windows_test.go
@@ -26,6 +26,7 @@ func TestCreateOsqueryCommandEnvVars(t *testing.T) {
 	k.On("OsqueryVerbose").Return(true)
 	k.On("OsqueryFlags").Return([]string{})
 	k.On("Slogger").Return(multislogger.NewNopLogger())
+	k.On("RootDirectory").Return("")
 
 	i := newInstance(types.DefaultRegistrationID, k, mockServiceClient())
 

diff --git a/pkg/osquery/runtime/runtime_posix_test.go b/pkg/osquery/runtime/runtime_posix_test.go
@@ -39,7 +39,7 @@ func TestOsquerySlowStart(t *testing.T) {
 
 	rootDirectory := testRootDirectory(t)
 
-	logBytes, slogger, opts := setUpTestSlogger(rootDirectory)
+	logBytes, slogger := setUpTestSlogger()
 
 	k := typesMocks.NewKnapsack(t)
 	k.On("RegistrationIDs").Return([]string{types.DefaultRegistrationID})
@@ -57,7 +57,7 @@ func TestOsquerySlowStart(t *testing.T) {
 	k.On("ReadEnrollSecret").Return("", nil).Maybe()
 	setUpMockStores(t, k)
 
-	opts = append(opts, WithStartFunc(func(cmd *exec.Cmd) error {
+	runner := New(k, mockServiceClient(), WithStartFunc(func(cmd *exec.Cmd) error {
 		err := cmd.Start()
 		if err != nil {
 			return fmt.Errorf("unexpected error starting command: %w", err)
@@ -71,8 +71,6 @@ func TestOsquerySlowStart(t *testing.T) {
 		}()
 		return nil
 	}))
-
-	runner := New(k, mockServiceClient(), opts...)
 	go runner.Run()
 	waitHealthy(t, runner, logBytes)
 
@@ -88,7 +86,7 @@ func TestExtensionSocketPath(t *testing.T) {
 
 	rootDirectory := testRootDirectory(t)
 
-	logBytes, slogger, opts := setUpTestSlogger(rootDirectory)
+	logBytes, slogger := setUpTestSlogger()
 
 	k := typesMocks.NewKnapsack(t)
 	k.On("RegistrationIDs").Return([]string{types.DefaultRegistrationID})
@@ -107,9 +105,8 @@ func TestExtensionSocketPath(t *testing.T) {
 	setUpMockStores(t, k)
 
 	extensionSocketPath := filepath.Join(rootDirectory, "sock")
-	opts = append(opts, WithExtensionSocketPath(extensionSocketPath))
 
-	runner := New(k, mockServiceClient(), opts...)
+	runner := New(k, mockServiceClient(), WithExtensionSocketPath(extensionSocketPath))
 	go runner.Run()
 
 	waitHealthy(t, runner, logBytes)