Wire k6provider structured logging into k6

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651
-	github.com/grafana/k6provider v0.2.0
+	github.com/grafana/k6provider v0.3.0
 	github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177
 	github.com/grafana/xk6-dashboard-assets v0.1.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -82,7 +82,6 @@ require (
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 // indirect
-	github.com/grafana/k6build v0.5.15 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jhump/protoreflect/v2 v2.0.0-beta.1 // indirect

go.sum

@@ -80,12 +80,8 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651 h1:XhXSJzz5D8molo2MjXnzspXKw5/wizwa1hFUYBXh3f4=
 github.com/grafana/k6-cloud-openapi-client-go v0.0.0-20260413092759-f97df3966651/go.mod h1:RBPBP7qIR/K6qzQEQYESVhp/XJspiBTOyBEBCbPXrvI=
-github.com/grafana/k6build v0.5.15 h1:4I5dkAWSMvXsElS1OpLbHj6ZXnebXZGnmwDXy5vcwSQ=
-github.com/grafana/k6build v0.5.15/go.mod h1:Sk7SUiCnx2AgkirG3PrCtmJKYL+a8EeRdTzFfbxP0X8=
-github.com/grafana/k6foundry v0.4.7 h1:1YXkTBwO/2dSx0pqJrraJATsFlsIX0vEpaEjV7E35w4=
-github.com/grafana/k6foundry v0.4.7/go.mod h1:eLsr0whhH+5Y1y7YpDxJi3Jv5wHMuf+80vdRyMH10pg=
-github.com/grafana/k6provider v0.2.0 h1:Zu8FBnk6cJyTTkpCA+y+Ravc2YFeAQjsIfPpcbZtfB0=
-github.com/grafana/k6provider v0.2.0/go.mod h1:TJ6vzPm4yDQ2ji/Fet0dFOpdjktrKZp4hsnLZhRoZVA=
+github.com/grafana/k6provider v0.3.0 h1:Sw3CX4RaCmsW8fc3frDv+Mj4IcrIz7NfMMf9FJEYtrM=
+github.com/grafana/k6provider v0.3.0/go.mod h1:R9WKthnwk96E47m6w/mnC13hhBYTn5iMdP5caFt/t5k=
 github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177 h1:0OMR7GLMuIoXDyXWKD4+ySHckqjgIpo0ZJ3iMA4Em4c=
 github.com/grafana/sobek v0.0.0-20260406180825-6d789dcdd177/go.mod h1:YtuqiJX1W3XvRSilL/kUZzduJG3phPJWyzM9DiIEfBo=
 github.com/grafana/xk6-dashboard-assets v0.1.2 h1:n2wqytPICn2ZYsKa9HE6GlvFXk+WjByMfT4eM+ms3gE=
@@ -251,8 +247,6 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

internal/cmd/launcher.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 	"os/exec"
 	"strings"
@@ -174,7 +175,8 @@ func newK6BuildProvisioner(gs *state.GlobalState) provisioner {
 func (p *k6buildProvisioner) provision(deps map[string]string) (commandExecutor, error) {
 	config := getProviderConfig(p.gs)
 
-	provider, err := k6provider.NewProvider(config)
+	logger := slog.New(newLogrusSlogHandler(p.gs.Logger))
+	provider, err := k6provider.NewProviderWithLogger(config, logger)
 	if err != nil {
 		return nil, err
 	}
@@ -184,9 +186,6 @@ func (p *k6buildProvisioner) provision(deps map[string]string) (commandExecutor,
 		return nil, err
 	}
 
-	p.gs.Logger.
-		Info("A new k6 binary has been provisioned with version(s): ", formatDependencies(binary.Dependencies))
-
 	return &customBinary{binary.Path}, nil
 }
 
@@ -208,14 +207,6 @@ func getProviderConfig(gs *state.GlobalState) k6provider.Config {
 	return config
 }
 
-func formatDependencies(deps map[string]string) string {
-	buffer := &bytes.Buffer{}
-	for dep, version := range deps {
-		fmt.Fprintf(buffer, "%s:%s ", dep, version)
-	}
-	return strings.Trim(buffer.String(), " ")
-}
-
 // extractToken gets the cloud token required to access the build service
 // from the environment or from the config file
 func extractToken(gs *state.GlobalState) (string, error) {

internal/cmd/logrus_slog.go

@@ -0,0 +1,102 @@
+package cmd
+
+import (
+	"context"
+	"log/slog"
+
+	"github.com/sirupsen/logrus"
+)
+
+// logrusSlogHandler is a slog.Handler that forwards to a logrus logger.
+// Attribute keys are namespaced with any active group path (e.g. "group.key").
+type logrusSlogHandler struct {
+	logger    *logrus.Logger //nolint:forbidigo
+	attrs     []slog.Attr    // pre-qualified attrs (keys already include group prefix)
+	groupPath string         // dot-joined group names from outer to inner, e.g. "a.b"
+}
+
+func newLogrusSlogHandler(logger *logrus.Logger) slog.Handler { //nolint:forbidigo
+	return &logrusSlogHandler{logger: logger}
+}
+
+func (h *logrusSlogHandler) Enabled(_ context.Context, level slog.Level) bool {
+	switch {
+	case level >= slog.LevelError:
+		return h.logger.IsLevelEnabled(logrus.ErrorLevel)
+	case level >= slog.LevelWarn:
+		return h.logger.IsLevelEnabled(logrus.WarnLevel)
+	case level >= slog.LevelInfo:
+		return h.logger.IsLevelEnabled(logrus.InfoLevel)
+	default:
+		return h.logger.IsLevelEnabled(logrus.DebugLevel)
+	}
+}
+
+func (h *logrusSlogHandler) Handle(_ context.Context, r slog.Record) error {
+	fields := make(logrus.Fields, len(h.attrs)+r.NumAttrs())
+	for _, a := range h.attrs {
+		fields[a.Key] = a.Value.Any()
+	}
+	r.Attrs(func(a slog.Attr) bool {
+		flattenAttr(h.groupPath, a, fields)
+		return true
+	})
+
+	entry := h.logger.WithFields(fields)
+	switch {
+	case r.Level >= slog.LevelError:
+		entry.Error(r.Message)
+	case r.Level >= slog.LevelWarn:
+		entry.Warn(r.Message)
+	case r.Level >= slog.LevelInfo:
+		entry.Info(r.Message)
+	default:
+		entry.Debug(r.Message)
+	}
+	return nil
+}
+
+func (h *logrusSlogHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	// Flatten and pre-qualify keys now so Handle doesn't repeat the work.
+	fields := make(logrus.Fields, len(attrs))
+	for _, a := range attrs {
+		flattenAttr(h.groupPath, a, fields)
+	}
+	qualified := make([]slog.Attr, 0, len(fields))
+	for k, v := range fields {
+		qualified = append(qualified, slog.Any(k, v))
+	}
+	combined := make([]slog.Attr, len(h.attrs)+len(qualified))
+	copy(combined, h.attrs)
+	copy(combined[len(h.attrs):], qualified)
+	return &logrusSlogHandler{logger: h.logger, attrs: combined, groupPath: h.groupPath}
+}
+
+func (h *logrusSlogHandler) WithGroup(name string) slog.Handler {
+	if name == "" {
+		return h
+	}
+	path := name
+	if h.groupPath != "" {
+		path = h.groupPath + "." + name
+	}
+	return &logrusSlogHandler{logger: h.logger, attrs: h.attrs, groupPath: path}
+}
+
+// flattenAttr writes a into fields with keys qualified by prefix.
+// If a is a group-kind attr, it recurses into its children.
+func flattenAttr(prefix string, a slog.Attr, fields logrus.Fields) {
+	key := a.Key
+	if prefix != "" {
+		key = prefix + "." + key
+	}
+	if a.Value.Kind() == slog.KindGroup {
+		for _, child := range a.Value.Group() {
+			flattenAttr(key, child, fields)
+		}
+		return
+	}
+	if fields != nil {
+		fields[key] = a.Value.Any()
+	}
+}

internal/cmd/logrus_slog_test.go

@@ -0,0 +1,94 @@
+package cmd
+
+import (
+	"bytes"
+	"context"
+	"log/slog"
+	"testing"
+
+	"github.com/sirupsen/logrus"
+)
+
+// captureLogrus returns a logrus logger that writes JSON to buf.
+func captureLogrus(buf *bytes.Buffer) *logrus.Logger { //nolint:forbidigo
+	l := logrus.New()
+	l.SetFormatter(&logrus.JSONFormatter{})
+	l.SetLevel(logrus.DebugLevel)
+	l.SetOutput(buf)
+	return l
+}
+
+func TestLogrusSlogHandler_Levels(t *testing.T) {
+	t.Parallel()
+	for _, tc := range []struct {
+		level slog.Level
+		want  string
+	}{
+		{slog.LevelDebug, `"level":"debug"`},
+		{slog.LevelInfo, `"level":"info"`},
+		{slog.LevelWarn, `"level":"warning"`},
+		{slog.LevelError, `"level":"error"`},
+	} {
+		t.Run(tc.level.String(), func(t *testing.T) {
+			t.Parallel()
+			var buf bytes.Buffer
+			logger := slog.New(newLogrusSlogHandler(captureLogrus(&buf)))
+			logger.Log(context.Background(), tc.level, "msg")
+			if !bytes.Contains(buf.Bytes(), []byte(tc.want)) {
+				t.Errorf("expected %q in output %q", tc.want, buf.String())
+			}
+		})
+	}
+}
+
+func TestLogrusSlogHandler_WithGroup(t *testing.T) {
+	t.Parallel()
+
+	var buf bytes.Buffer
+	logger := slog.New(newLogrusSlogHandler(captureLogrus(&buf)))
+
+	// single group
+	logger.WithGroup("provider").Info("msg", "key", "val")
+	if !bytes.Contains(buf.Bytes(), []byte(`"provider.key":"val"`)) {
+		t.Errorf("expected provider.key in output: %s", buf.String())
+	}
+	buf.Reset()
+
+	// nested groups
+	logger.WithGroup("a").WithGroup("b").Info("msg", "key", "val")
+	if !bytes.Contains(buf.Bytes(), []byte(`"a.b.key":"val"`)) {
+		t.Errorf("expected a.b.key in output: %s", buf.String())
+	}
+	buf.Reset()
+
+	// WithAttrs after WithGroup
+	sub := logger.WithGroup("g").With("pre", "v")
+	sub.Info("msg", "post", "w")
+	out := buf.String()
+	if !bytes.Contains(buf.Bytes(), []byte(`"g.pre":"v"`)) {
+		t.Errorf("expected g.pre in output: %s", out)
+	}
+	if !bytes.Contains(buf.Bytes(), []byte(`"g.post":"w"`)) {
+		t.Errorf("expected g.post in output: %s", out)
+	}
+	buf.Reset()
+
+	// empty group name is a no-op
+	logger.WithGroup("").Info("msg", "key", "bare")
+	if !bytes.Contains(buf.Bytes(), []byte(`"key":"bare"`)) {
+		t.Errorf("expected bare key in output: %s", buf.String())
+	}
+}
+
+func TestLogrusSlogHandler_GroupKindAttr(t *testing.T) {
+	t.Parallel()
+
+	var buf bytes.Buffer
+	logger := slog.New(newLogrusSlogHandler(captureLogrus(&buf)))
+
+	// slog.Group() produces a KindGroup attr — should be flattened
+	logger.Info("msg", slog.Group("outer", slog.String("inner", "val")))
+	if !bytes.Contains(buf.Bytes(), []byte(`"outer.inner":"val"`)) {
+		t.Errorf("expected outer.inner in output: %s", buf.String())
+	}
+}