log error on removing temp user data dir

johnstcn · johnstcn · commit cca6a0bcdb54 · 2023-09-29T14:58:53.000+01:00
diff --git a/scaletest/dashboard/chromedp.go b/scaletest/dashboard/chromedp.go
@@ -11,6 +11,8 @@ import (
 	"github.com/chromedp/cdproto/network"
 	"github.com/chromedp/chromedp"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/slog"
 )
 
 // Action is just a function that does something.
@@ -150,7 +152,7 @@ func clickAndWait(ctx context.Context, clickOn, waitFor Selector) error {
 // initChromeDPCtx initializes a chromedp context with the given session token cookie
 //
 //nolint:revive // yes, headless is a control flag
-func initChromeDPCtx(ctx context.Context, u *url.URL, sessionToken string, headless bool) (context.Context, context.CancelFunc, error) {
+func initChromeDPCtx(ctx context.Context, log slog.Logger, u *url.URL, sessionToken string, headless bool) (context.Context, context.CancelFunc, error) {
 	dir, err := os.MkdirTemp("", "scaletest-dashboard-*")
 	if err != nil {
 		return nil, nil, err
@@ -170,7 +172,9 @@ func initChromeDPCtx(ctx context.Context, u *url.URL, sessionToken string, headl
 	cancelFunc := func() {
 		cdpCancel()
 		allocCtxCancel()
-		_ = os.RemoveAll(dir)
+		if err := os.RemoveAll(dir); err != nil {
+			log.Error(ctx, "failed to remove temp user data dir", slog.F("dir", dir), slog.Error(err))
+		}
 	}
 
 	// set cookies
diff --git a/scaletest/dashboard/run.go b/scaletest/dashboard/run.go
@@ -47,7 +47,7 @@ func (r *Runner) Run(ctx context.Context, _ string, _ io.Writer) error {
 		return xerrors.Errorf("user has no organizations")
 	}
 
-	cdpCtx, cdpCancel, err := initChromeDPCtx(ctx, r.client.URL, r.client.SessionToken(), r.cfg.Headless)
+	cdpCtx, cdpCancel, err := initChromeDPCtx(ctx, r.cfg.Logger, r.client.URL, r.client.SessionToken(), r.cfg.Headless)
 	if err != nil {
 		return xerrors.Errorf("init chromedp ctx: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (r *Runner) Run(ctx context.Context, _ string, _ io.Writer) error {`
`47`	`47`	`return xerrors.Errorf("user has no organizations")`
`48`	`48`	`}`
`49`	`49`
`50`		`- cdpCtx, cdpCancel, err := initChromeDPCtx(ctx, r.client.URL, r.client.SessionToken(), r.cfg.Headless)`
	`50`	`+ cdpCtx, cdpCancel, err := initChromeDPCtx(ctx, r.cfg.Logger, r.client.URL, r.client.SessionToken(), r.cfg.Headless)`
`51`	`51`	`if err != nil {`
`52`	`52`	`return xerrors.Errorf("init chromedp ctx: %w", err)`
`53`	`53`	`}`