Rename the JS fields back to url and name

Leaving the names as in the go code.
grafana · Oct 7, 2024 · f6dd73c · f6dd73c
1 parent 94e6971
commit f6dd73c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/common/page.go b/common/page.go
@@ -433,9 +433,9 @@ type URLTagPatterns struct {
 // if a match is found.
 type URLTagPattern struct {
 	// This is a regex that will be compared against the existing url tag.
-	URLRegEx string `js:"urlRegEx"`
+	URLRegEx string `js:"url"`
 	// The name to send back to the caller of the handler.
-	TagName string `js:"tagName"`
+	TagName string `js:"name"`
 }
 
 type k6BrowserCheckRegEx func(pattern, url string) (bool, error)

diff --git a/examples/pageon-metric.js b/examples/pageon-metric.js
@@ -19,7 +19,7 @@ export default async function() {
   page.on('metric', (metric) => {
     metric.Tag({
       urls: [
-        {urlRegEx: /^https:\/\/test\.k6\.io\/\?q=[0-9a-z]+$/, tagName:'test'},
+        {url: /^https:\/\/test\.k6\.io\/\?q=[0-9a-z]+$/, name:'test'},
       ]
     });
   });

diff --git a/tests/page_test.go b/tests/page_test.go
@@ -1926,7 +1926,7 @@ func TestPageOnMetric(t *testing.T) {
 			fun: `page.on('metric', (metric) => {
 				metric.Tag({
 				  urls: [
-						{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-1'},
+						{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-1'},
 					]
 				});
 			});`,
@@ -1938,12 +1938,12 @@ func TestPageOnMetric(t *testing.T) {
 			fun: `page.on('metric', (metric) => {
 				metric.Tag({
 				  urls: [
-						{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-1'},
+						{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-1'},
 					]
 				});
 				metric.Tag({
 					urls: [
-						  {urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-2'},
+						  {url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-2'},
 					  ]
 				  });
 			});`,
@@ -1955,19 +1955,19 @@ func TestPageOnMetric(t *testing.T) {
 			fun: `page.on('metric', (metric) => {
 				metric.Tag({
 				  urls: [
-						{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-1'},
+						{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-1'},
 					]
 				});
 				metric.Tag({
 					urls: [
-						  {urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-2'},
+						  {url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-2'},
 					  ]
 				  });
 			});
 			page.on('metric', (metric) => {
 				metric.Tag({
 				  urls: [
-						{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-3'},
+						{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-3'},
 					]
 				});
 			});`,
@@ -1979,13 +1979,13 @@ func TestPageOnMetric(t *testing.T) {
 			fun: `page.on('metric', (metric) => {
 				metric.Tag({
 				  urls: [
-						{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-1'},
+						{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-1'},
 					]
 				});
 				page.on('metric', (metric) => {
 					metric.Tag({
 						urls: [
-							{urlRegEx: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, tagName:'ping-4'},
+							{url: /^http:\/\/127\.0\.0\.1\:[0-9]+\/ping\?h=[0-9a-z]+$/, name:'ping-4'},
 						]
 					});
 				});