log checkpoint followup + dns checkup tests

cmd/launcher/launcher.go

@@ -44,7 +44,6 @@ import (
 	"github.com/kolide/launcher/pkg/debug"
 	"github.com/kolide/launcher/pkg/debug/checkups"
 	"github.com/kolide/launcher/pkg/launcher"
-	"github.com/kolide/launcher/pkg/log/locallogger"
 	"github.com/kolide/launcher/pkg/log/logshipper"
 	"github.com/kolide/launcher/pkg/log/teelogger"
 	"github.com/kolide/launcher/pkg/osquery"
@@ -211,11 +210,7 @@ func runLauncher(ctx context.Context, cancel func(), opts *launcher.Options) err
 	runGroup := rungroup.NewRunGroup(logger)
 
 	// Add the log checkpoints to the rungroup, and run it once early, to try to get data into the logs.
-	checkpointLogger := log.With(logutil.NewServerLogger(true))
-	checkpointer := checkups.NewCheckupLogger(
-		teelogger.New(checkpointLogger, locallogger.NewKitLogger(filepath.Join(opts.RootDirectory, "debug.json"))),
-		k,
-	)
+	checkpointer := checkups.NewCheckupLogger(logger, k)
 	checkpointer.Once(ctx)
 	runGroup.Add("logcheckpoint", checkpointer.Run, checkpointer.Interrupt)
 

pkg/log/eventlog/eventlog_windows.go

@@ -7,6 +7,7 @@
 	"bytes"
 	"io"
 	"sync"
+	"reflect"
 
 	"github.com/go-kit/kit/log"
 )
@@ -33,7 +34,19 @@
 func (l *eventLogger) Log(keyvals ...interface{}) error {
 	lb := l.getLoggerBuf()
 	defer l.putLoggerBuf(lb)
-	if err := lb.logger.Log(keyvals...); err != nil {
+
+	// fmtlogger does not support array, chan, func, slice, struct, or map
+	// so we'll do any pre-processing for these types here
+	formattedKeyVals := make([]interface{}, len(keyvals))
+	for idx, val := range keyvals {
+		switch knownValue := val.(type) {
+		case reflect.Array, reflect.Chan, reflect.Func, reflect.Map, reflect.Slice, reflect.Struct:
+			formattedKeyVals[idx] = fmt.Sprintf("%+v", val)
+		default:
+			formattedKeyVals[idx] = val
+	}
+
+	if err := lb.logger.Log(formattedKeyVals...); err != nil {
 		return err
 	}
 
@@ -47,12 +60,12 @@
 }
 
 func (l *eventLogger) getLoggerBuf() *loggerBuf {
 	lb := l.bufPool.Get().(*loggerBuf)
 	if lb.buf == nil {
 		lb.buf = &bytes.Buffer{}
 		lb.logger = log.With(l.newLogger(lb.buf), "caller", log.Caller(4))
 	} else {
 		lb.buf.Reset()
 	}
 	return lb
 }