feat: allow name tag, and overwrite url tag with name tag if set (#60)

* feat: allow name tag, and overwrite url tag with name tag if set

* fix: remove unnecessary assignment on name tag. use same value for both url and name tags.

websockets/websockets.go

@@ -268,7 +268,14 @@ func (w *webSocket) establishConnection(params *wsParams) {
 	}
 	w.conn = conn
 
-	w.tagsAndMeta.SetSystemTagOrMetaIfEnabled(systemTags, metrics.TagURL, w.url.String())
+	nameTagValue, nameTagManuallySet := params.tagsAndMeta.Tags.Get(metrics.TagName.String())
+	// After k6 v0.41.0, the `name` and `url` tags have the exact same values:
+	if nameTagManuallySet {
+		w.tagsAndMeta.SetSystemTagOrMetaIfEnabled(systemTags, metrics.TagURL, nameTagValue)
+	} else {
+		w.tagsAndMeta.SetSystemTagOrMetaIfEnabled(systemTags, metrics.TagURL, w.url.String())
+		w.tagsAndMeta.SetSystemTagOrMetaIfEnabled(systemTags, metrics.TagName, w.url.String())
+	}
 
 	w.emitConnectionMetrics(ctx, start, connectionDuration)
 	if connErr != nil {

websockets/websockets_test.go

@@ -950,6 +950,46 @@ func TestCookiesDefaultJar(t *testing.T) {
 	assert.Len(t, ts.errors, 0)
 }
 
+func TestManualNameTag(t *testing.T) {
+	t.Parallel()
+	ts := newTestState(t)
+	sr := ts.tb.Replacer.Replace
+
+	ts.vu.StateField.Options.SystemTags = metrics.ToSystemTagSet([]string{"url", "name"})
+
+	err := ts.ev.Start(func() error {
+		_, runErr := ts.rt.RunString(sr(`
+				var ws = new WebSocket("WSBIN_URL/ws-echo", null, { tags: { name: "custom" } } )
+				ws.onopen = () => {
+					ws.send("test")
+				}
+				ws.onmessage = (event) => {
+					if (event.data != "test") {
+						throw new Error ("echo'd data doesn't match our message!");
+					}
+					ws.close()
+	 			}
+                ws.onerror = (e) => { throw JSON.stringify(e) }
+			`))
+		return runErr
+	})
+	require.NoError(t, err)
+
+	containers := metrics.GetBufferedSamples(ts.samples)
+	require.NotEmpty(t, containers)
+
+	for _, sampleContainer := range containers {
+		require.NotEmpty(t, sampleContainer.GetSamples())
+		for _, sample := range sampleContainer.GetSamples() {
+			dataToCheck := sample.Tags.Map()
+			require.NotEmpty(t, dataToCheck)
+
+			assert.Equal(t, "custom", dataToCheck["url"])
+			assert.Equal(t, "custom", dataToCheck["name"])
+		}
+	}
+}
+
 func TestSystemTags(t *testing.T) {
 	t.Parallel()