Implemented AnonymizeQueryStringValues option (proposal 1 from #927).

js/modules/k6/http/request_test.go

@@ -884,6 +884,36 @@ func TestRequestAndBatch(t *testing.T) {
 					}
 				}
 			})
+
+			t.Run("anonymizeQueryStringValues", func(t *testing.T) {
+				t.Run("disabled", func(t *testing.T) {
+					oldOpts := state.Options
+					defer func() { state.Options = oldOpts }()
+					state.Options.AnonymizeQueryStringValues = null.BoolFrom(false)
+
+					_, err := common.RunString(rt, sr(`
+					let res = http.get("HTTPBIN_URL/get?a=1&b=some-value&c=https%3A%2F%2Fsome-url.com%3Fa%3D1");
+					if (res.status != 200) { throw new Error("wrong status: " + res.status); }
+					`))
+					assert.NoError(t, err)
+
+					assertRequestMetricsEmitted(t, stats.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/get?a=1&b=some-value&c=https%3A%2F%2Fsome-url.com%3Fa%3D1"), "", 200, "")
+				})
+
+				t.Run("enabled", func(t *testing.T) {
+					oldOpts := state.Options
+					defer func() { state.Options = oldOpts }()
+					state.Options.AnonymizeQueryStringValues = null.BoolFrom(true)
+
+					_, err := common.RunString(rt, sr(`
+					let res = http.get("HTTPBIN_URL/get?a=1&b=some-value&c=https%3A%2F%2Fsome-url.com%3Fa%3D1");
+					if (res.status != 200) { throw new Error("wrong status: " + res.status); }
+					`))
+					assert.NoError(t, err)
+
+					assertRequestMetricsEmitted(t, stats.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/get?a=1&b=some-value&c=https%3A%2F%2Fsome-url.com%3Fa%3D1"), sr("HTTPBIN_URL/get?a=[]&b=[]&c=[]"), 200, "")
+				})
+			})
 		})
 	})
 

lib/netext/httpext/request.go

@@ -29,6 +29,7 @@ import (
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -217,7 +218,12 @@ func MakeRequest(ctx context.Context, preq *ParsedHTTPRequest) (*Response, error
 
 	// Only set the name system tag if the user didn't explicitly set it beforehand
 	if _, ok := tags["name"]; !ok && state.Options.SystemTags["name"] {
-		tags["name"] = preq.URL.Name
+		var name = preq.URL.Name
+		if state.Options.AnonymizeQueryStringValues.Bool {
+			var qsValueRegex = regexp.MustCompile("=[^&]*")
+			name = qsValueRegex.ReplaceAllString(name, "=[]")
+		}
+		tags["name"] = name
 	}
 	if state.Options.SystemTags["group"] {
 		tags["group"] = state.Group.Path

lib/options.go

@@ -326,6 +326,8 @@ type Options struct {
 	// Tags to be applied to all samples for this running
 	RunTags *stats.SampleTags `json:"tags" envconfig:"tags"`
 
+	AnonymizeQueryStringValues null.Bool `json:"anonymizeQueryStringValues" envconfig:"anonymize_query_string_values"`
+
 	// Buffer size of the channel for metric samples; 0 means unbuffered
 	MetricSamplesBufferSize null.Int `json:"metricSamplesBufferSize" envconfig:"metric_samples_buffer_size"`
 
@@ -471,6 +473,9 @@ func (o Options) Apply(opts Options) Options {
 	if !opts.RunTags.IsEmpty() {
 		o.RunTags = opts.RunTags
 	}
+	if opts.AnonymizeQueryStringValues.Valid {
+		o.AnonymizeQueryStringValues = opts.AnonymizeQueryStringValues
+	}
 	if opts.MetricSamplesBufferSize.Valid {
 		o.MetricSamplesBufferSize = opts.MetricSamplesBufferSize
 	}