Merge remote-tracking branch 'upstream/master' into new-end-of-test-s…

…ummary-output

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 50
     groups:
       golangx:
@@ -12,6 +12,9 @@ updates:
       googles:
         patterns:
           -  "google.golang.org/*"
+      otel:
+        patterns:
+          -  "go.opentelemetry.io/*"
     allow:
       # Keep the experimental modules up-to-date
       - dependency-name: "github.com/grafana/xk6-*"
@@ -31,3 +34,14 @@ updates:
       - dependency-name: "github.com/jhump/protoreflect"
       - dependency-name: "github.com/klauspost/compress"
       - dependency-name: "github.com/tidwall/gjson"
+      - dependency-name: "github.com/chromedp/cdproto"
+      - dependency-name: "github.com/mailru/easyjson"
+      - dependency-name: "github.com/mattn/go-colorable"
+      - dependency-name: "github.com/mstoykov/k6-taskqueue-lib"
+      - dependency-name: "github.com/stretchr/testify"
+      - dependency-name: "go.opentelemetry.io/otel"
+      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace"
+      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
+      - dependency-name: "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
+      - dependency-name: "go.opentelemetry.io/otel/sdk"
+      - dependency-name: "go.opentelemetry.io/otel/trace"

.github/workflows/tc39.yml

@@ -27,6 +27,6 @@ jobs:
       - name: Run tests
         run: |
           set -x
-          cd js/tc39
+          cd internal/js/tc39
           sh checkout.sh
           go test -timeout 1h

.github/workflows/wpt.yml

@@ -8,7 +8,7 @@ defaults:
     shell: bash
 
 jobs:
-  streams:
+  test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -18,9 +18,16 @@ jobs:
         with:
           go-version: 1.23.x
           check-latest: true
-      - name: Run tests
+      # TODO: combine WebPlatform tests checkout & patch into the singe step
+      - name: Run Streams Tests
         run: |
           set -x
-          cd js/modules/k6/experimental/streams/tests
+          cd internal/js/modules/k6/experimental/streams/tests
           sh checkout.sh
           go test ../... -tags=wpt
+      - name: Run Webcrypto Tests
+        run: |
+          set -x
+          cd internal/js/modules/k6/webcrypto/tests
+          sh checkout.sh
+          go test ./... -tags=wpt

.gitignore

@@ -2,8 +2,8 @@
 /k6.exe
 /dist
 /pkg-build
-/js/tc39/TestTC39
-/js/modules/k6/experimental/streams/tests/wpt
+/internal/js/tc39/TestTC39
+/internal/js/modules/k6/experimental/streams/tests/wpt
 
 .vscode
 *.sublime-workspace
@@ -34,3 +34,6 @@ script.js
 
 /packaging/.env
 /packaging/*.gpg
+
+# web platform tests
+/internal/js/modules/k6/webcrypto/tests/wpt/

Dependencies.md

@@ -33,7 +33,6 @@ We aim to support a building of the k6 binary with the two latest versions of go
 There are some dependencies that we really don't use all that much, intend on removing and as a general note don't need anything else from them. Given that we currently have no problems that updates will fix - we prefer to not update them as not to introduce bugs. Also, for some they bring additional dependencies that we do not want, which is just one more reason not to update them.
 
 List (as of March 2022):
-- github.com/DataDog/datadog-go  - newer versions have a lot more dependencies for functionality we don't need. Also in general a different library is probably going to be better in this case as it only supports UDP and no TCP.
 - github.com/andybalholm/cascadia - a dependency of `github.com/PuerkitoBio/goquery`
 - github.com/sirupsen/logrus - it's in maintenance mode and we want to remove it - also no update for a long time, but also no bugs.
 - github.com/spf13/afero - there are plans to be [replaced by io/fs](https://github.com/grafana/k6/issues/1079) and we don't need anything from it. We have already worked around some bugs so updating might break something

README.md

@@ -23,7 +23,6 @@
  <a href="https://codecov.io/gh/grafana/k6"><img src="https://img.shields.io/codecov/c/github/grafana/k6/master.svg" alt="Codecov branch"></a>
   <br>
   <a href="https://twitter.com/k6_io"><img src="https://img.shields.io/badge/twitter-@k6_io-55acee.svg" alt="@k6_io on Twitter"></a>
-  <a href="https://k6.io/slack"><img src="https://img.shields.io/badge/Slack-k6-ff69b4.svg" alt="Slack channel"></a>
 </p>
 <p align="center">
     <a href="https://github.com/grafana/k6/releases">Download</a> ·

api/v1/control_surface.go

@@ -3,10 +3,10 @@ package v1
 import (
 	"context"
 
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 )
 
 // ControlSurface includes the methods the REST API can use to control and

api/v1/group_routes_test.go

@@ -10,14 +10,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
+	"go.k6.io/k6/internal/usage"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
-	"go.k6.io/k6/usage"
 )
 
 func getTestPreInitState(tb testing.TB) *lib.TestPreInitState {

api/v1/metric_routes_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
 )
 

api/v1/setup_teardown_routes_test.go

@@ -15,14 +15,14 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
-	"go.k6.io/k6/js"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/js"
+	"go.k6.io/k6/internal/loader"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/lib/types"
-	"go.k6.io/k6/loader"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

api/v1/status_routes.go

@@ -9,7 +9,7 @@ import (
 
 	"go.k6.io/k6/errext"
 	"go.k6.io/k6/errext/exitcodes"
-	"go.k6.io/k6/execution"
+	"go.k6.io/k6/internal/execution"
 	"go.k6.io/k6/lib/executor"
 )
 

api/v1/status_routes_test.go

@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/execution"
-	"go.k6.io/k6/execution/local"
+	"go.k6.io/k6/internal/execution"
+	"go.k6.io/k6/internal/execution/local"
+	"go.k6.io/k6/internal/lib/testutils/minirunner"
+	"go.k6.io/k6/internal/metrics/engine"
 	"go.k6.io/k6/lib"
-	"go.k6.io/k6/lib/testutils/minirunner"
 	"go.k6.io/k6/metrics"
-	"go.k6.io/k6/metrics/engine"
 	"go.k6.io/k6/output"
 )
 

cloudapi/api_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.k6.io/k6/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils"
 	"go.k6.io/k6/lib/types"
 )
 

cloudapi/logs_test.go

@@ -20,8 +20,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v3"
 
-	"go.k6.io/k6/lib/testutils"
-	"go.k6.io/k6/lib/testutils/httpmultibin"
+	"go.k6.io/k6/internal/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils/httpmultibin"
 )
 
 func TestMsgParsing(t *testing.T) {

cmd/execute.go

@@ -0,0 +1,10 @@
+// Package cmd is here to provide a way for xk6 to build a binary with added extensions
+package cmd
+
+import "go.k6.io/k6/internal/cmd"
+
+// Execute exectues the k6 command
+// It only is exported here for backwards compatibility and the ability to use xk6 to build extended k6
+func Execute() {
+	cmd.Execute()
+}