Merge branch 'master' into fix/set-header-panic

Author: chojs23

.github/workflows/summary-code-generation.yml

@@ -0,0 +1,68 @@
+name: Summary code generation
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: read
+
+jobs:
+  check-generated-code:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        with:
+          persist-credentials: false
+
+      - name: Install cog
+        run: |
+          COG_VERSION="v0.0.46"
+          curl -sSL "https://github.com/grafana/cog/releases/download/${COG_VERSION}/cog_Linux_x86_64.tar.gz" \
+            | sudo tar -xz -C /usr/local/bin
+          cog --version
+
+      - name: Checkout schemas
+        run: |
+          ./internal/lib/summary/machinereadable/checkout.sh
+
+      - name: Generate code
+        run: |
+          ./internal/lib/summary/machinereadable/generate.sh
+
+      - name: Check for uncommitted changes
+        run: |
+          # Check if there are any changes in the Git working directory
+          if ! git diff --exit-code; then
+            echo "❌ Generated code is not up-to-date!"
+            echo ""
+            echo "The following files have uncommitted changes:"
+            git diff --name-only
+            echo ""
+            echo "Please run the following commands to update the generated code:"
+            echo "  ./internal/lib/summary/machinereadable/checkout.sh"
+            echo "  ./internal/lib/summary/machinereadable/generate.sh"
+            echo ""
+            echo "Then commit the changes."
+            exit 1
+          fi
+
+          # Also check for untracked files
+          if [ -n "$(git ls-files --others --exclude-standard internal/lib/summary/machinereadable/ | grep -v k6-summary/)" ]; then
+            echo "❌ There are untracked generated files!"
+            echo ""
+            echo "Untracked files:"
+            git ls-files --others --exclude-standard internal/lib/summary/machinereadable/ | grep -v k6-summary/
+            echo ""
+            echo "Please run the generation scripts and commit all generated files."
+            exit 1
+          fi
+
+          echo "✅ Generated code is up-to-date!"

.gitignore

@@ -2,6 +2,7 @@
 /k6.exe
 /dist
 /pkg-build
+/internal/lib/summary/machinereadable/k6-summary
 /internal/js/tc39/TestTC39
 /internal/js/modules/k6/experimental/streams/tests/wpt
 /internal/js/modules/k6/webcrypto/tests/wpt/

examples/secrets/multi-source.test.js

@@ -0,0 +1,11 @@
+// k6 run --secret-source=mock=default,cool="cool secret" --secret-source=mock=name=another,cool="not cool secret" multi-source.test.js
+import secrets from "k6/secrets";
+
+export default async () => {
+	const my_secret = await secrets.get("cool"); // get secret from a source with the provided identifier
+	const anothersource = secrets.source("another")
+	const my_other_secret = await anothersource.get("cool");
+	console.log("Secret from default source ", my_secret)
+	console.log("Secret from another source ", my_other_secret)
+	console.log("Are they equal? ", my_other_secret== my_secret)
+}

go.mod

@@ -51,15 +51,15 @@ require (
 	go.opentelemetry.io/otel/sdk v1.38.0
 	go.opentelemetry.io/otel/sdk/metric v1.38.0
 	go.opentelemetry.io/otel/trace v1.38.0
-	go.opentelemetry.io/proto/otlp v1.8.0
+	go.opentelemetry.io/proto/otlp v1.9.0
 	go.uber.org/goleak v1.3.0
 	golang.org/x/crypto v0.43.0
 	golang.org/x/crypto/x509roots/fallback v0.0.0-20251028130051-c0531f9c3451
 	golang.org/x/net v0.46.0
 	golang.org/x/sync v0.18.0
 	golang.org/x/term v0.36.0
 	golang.org/x/time v0.14.0
-	google.golang.org/grpc v1.75.0
+	google.golang.org/grpc v1.75.1
 	google.golang.org/protobuf v1.36.10
 	gopkg.in/guregu/null.v3 v3.3.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -219,8 +219,8 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6
 go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
 go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-go.opentelemetry.io/proto/otlp v1.8.0 h1:fRAZQDcAFHySxpJ1TwlA1cJ4tvcrw7nXl9xWWC8N5CE=
-go.opentelemetry.io/proto/otlp v1.8.0/go.mod h1:tIeYOeNBU4cvmPqpaji1P+KbB4Oloai8wN4rWzRrFF0=
+go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
+go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -366,8 +366,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4=
-google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
+google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
+google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
 google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
 google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=

internal/cmd/run.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
@@ -26,6 +27,7 @@ import (
 	"go.k6.io/k6/internal/lib/summary"
 	"go.k6.io/k6/internal/lib/trace"
 	"go.k6.io/k6/internal/metrics/engine"
+	"go.k6.io/k6/internal/output/cloud"
 	summaryoutput "go.k6.io/k6/internal/output/summary"
 	"go.k6.io/k6/internal/ui/pb"
 	"go.k6.io/k6/js/common"
@@ -220,6 +222,14 @@ func (c *cmdRun) run(cmd *cobra.Command, args []string) (err error) {
 			}
 		}
 
+		summaryMeta := summary.Meta{
+			Script: string(test.source.Data),
+			IsCloud: slices.ContainsFunc(outputs, func(o output.Output) bool {
+				_, isCloud := o.(*cloud.Output)
+				return isCloud
+			}),
+		}
+
 		switch summaryMode {
 		// TODO(@joanlopez): remove by k6 v2.0, once we completely drop the support for --summary-mode=legacy.
 		case summary.ModeLegacy:
@@ -229,7 +239,7 @@ func (c *cmdRun) run(cmd *cobra.Command, args []string) (err error) {
 			defer func() {
 				logger.Debug("Generating the end-of-test summary...")
 
-				summaryResult, hsErr := test.initRunner.HandleSummary(globalCtx, legacySummary(), nil)
+				summaryResult, hsErr := test.initRunner.HandleSummary(globalCtx, legacySummary(), nil, summaryMeta)
 				if hsErr == nil {
 					hsErr = handleSummaryResult(c.gs.FS, c.gs.Stdout, c.gs.Stderr, summaryResult)
 				}
@@ -262,8 +272,10 @@ func (c *cmdRun) run(cmd *cobra.Command, args []string) (err error) {
 				// likely as an additional argument like options.
 				summary.NoColor = c.gs.Flags.NoColor
 				summary.EnableColors = !summary.NoColor && c.gs.Stdout.IsTTY
+				summary.NewMachineReadableSummary = testRunState.RuntimeOptions.NewMachineReadableSummary.Valid &&
+					testRunState.RuntimeOptions.NewMachineReadableSummary.Bool
 
-				summaryResult, hsErr := test.initRunner.HandleSummary(globalCtx, legacySummary(), summary)
+				summaryResult, hsErr := test.initRunner.HandleSummary(globalCtx, legacySummary(), summary, summaryMeta)
 				if hsErr == nil {
 					hsErr = handleSummaryResult(c.gs.FS, c.gs.Stdout, c.gs.Stderr, summaryResult)
 				}

internal/cmd/runtime_options.go

@@ -43,6 +43,9 @@ extended: base + sets "global" as alias for "globalThis"
 		"",
 		"output the end-of-test summary report to JSON file",
 	)
+	// TODO(@joanlopez): remove by k6 v2.0, once the new summary model is the default and the only one.
+	flags.Bool("new-machine-readable-summary", false, "enables the new machine-readable summary, "+
+		"which is used for summary exports and as handleSummary() argument")
 	flags.String("traces-output", "none",
 		"set the output for k6 traces, possible values are none,otel[=host:port]")
 	return flags
@@ -78,15 +81,16 @@ func getRuntimeOptions(
 
 func runtimeOptionsFromFlags(flags *pflag.FlagSet) lib.RuntimeOptions {
 	opts := lib.RuntimeOptions{
-		TestType:             getNullString(flags, "type"),
-		IncludeSystemEnvVars: getNullBool(flags, "include-system-env-vars"),
-		CompatibilityMode:    getNullString(flags, "compatibility-mode"),
-		NoThresholds:         getNullBool(flags, "no-thresholds"),
-		NoSummary:            getNullBool(flags, "no-summary"),
-		SummaryMode:          getNullString(flags, "summary-mode"),
-		SummaryExport:        getNullString(flags, "summary-export"),
-		TracesOutput:         getNullString(flags, "traces-output"),
-		Env:                  make(map[string]string),
+		TestType:                  getNullString(flags, "type"),
+		IncludeSystemEnvVars:      getNullBool(flags, "include-system-env-vars"),
+		CompatibilityMode:         getNullString(flags, "compatibility-mode"),
+		NoThresholds:              getNullBool(flags, "no-thresholds"),
+		NoSummary:                 getNullBool(flags, "no-summary"),
+		SummaryMode:               getNullString(flags, "summary-mode"),
+		SummaryExport:             getNullString(flags, "summary-export"),
+		NewMachineReadableSummary: getNullBool(flags, "new-machine-readable-summary"),
+		TracesOutput:              getNullString(flags, "traces-output"),
+		Env:                       make(map[string]string),
 	}
 	return opts
 }
@@ -133,6 +137,12 @@ func populateRuntimeOptionsFromEnv(opts lib.RuntimeOptions, environment map[stri
 		opts.SummaryExport = null.StringFrom(envVar)
 	}
 
+	if err := saveBoolFromEnv(
+		environment, "K6_NEW_MACHINE_READABLE_SUMMARY", &opts.NewMachineReadableSummary,
+	); err != nil {
+		return opts, err
+	}
+
 	if envVar, ok := environment["SSLKEYLOGFILE"]; !opts.KeyWriter.Valid && ok {
 		opts.KeyWriter = null.StringFrom(envVar)
 	}