fix: logger in context, not as a global variable (#15)

Author: obs-gh-irismcleary

cmd/aws-snapshot/main.go

@@ -39,6 +39,7 @@ func realMain() error {
 		bufferSize            = flag.Int("buffer-size", 100, "Length of buffer for records")
 		manifestFile          = flag.String("manifest-file", "", "Manifest filename")
 		requestTimeout        = flag.String("request-timeout", "", "Timeout per request, default is no timeout")
+		verbosity             = flag.Int("v", 0, "Logging verbosity, full debug is 6")
 	)
 
 	flag.Parse()
@@ -75,6 +76,10 @@ func realMain() error {
 		timeout = &t
 	}
 
+	if *verbosity > 0 {
+		stdr.SetVerbosity(*verbosity)
+	}
+
 	logger := stdr.New(log.New(os.Stderr, "", log.LstdFlags|log.Lshortfile))
 
 	runner := api.Runner{

pkg/api/api.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/client"
+	"github.com/go-logr/logr"
 )
 
 // Service (e.g. RDS, IAM, S3) provides the means of creating an Endpoint
@@ -63,12 +64,17 @@ func prefixError(name string, reqs []Request) []Request {
 		rq := r
 
 		res = append(res, func(ctx context.Context, ch chan<- *Record) error {
-			logger.Info(fmt.Sprintf("Snapshot: starting %s", name))
+			logger := logr.FromContextOrDiscard(ctx)
+			logger.V(6).Info("request start", "action", name)
 
 			if err := rq(ctx, ch); err != nil {
+				logger.V(6).Info("request complete", "action", name, "error", err.Error())
+
 				return fmt.Errorf("failed to run %q: %w", name, err)
 			}
 
+			logger.V(6).Info("request complete", "action", name)
+
 			return nil
 		})
 	}

pkg/api/runner.go

@@ -9,8 +9,6 @@ import (
 
 const defaultBufferSize = 100
 
-var logger = logr.Discard()
-
 type Runner struct {
 	Requests              []Request
 	Recorder              Recorder
@@ -96,7 +94,7 @@ func withSemaphore(fns []Request, maxConcurrency int, requestTimeout *time.Durat
 
 func (r *Runner) Run(ctx context.Context) error {
 	if r.Logger != nil {
-		logger = *r.Logger
+		ctx = logr.NewContext(ctx, *r.Logger)
 	}
 
 	requestFunc := withSemaphore(r.Requests, r.MaxConcurrentRequests, r.RequestTimeout)