Adjust metrics for HTTP Request node

packages/workflow/src/Interfaces.ts

@@ -1444,6 +1444,7 @@ export interface INodeGraphItem {
 	mode?: string;
 	credential_type?: string; // HTTP Request node v2
 	credential_set?: boolean; // HTTP Request node v2
+	method?: string; // HTTP Request node v2
 }
 
 export interface INodeNameIndex {

packages/workflow/src/TelemetryHelpers.ts

@@ -60,7 +60,7 @@ function areOverlapping(
 	);
 }
 
-const URL_PARTS_REGEX = /(?<protocolPlusDomain>.*?\..*?)(?<pathnamePlusQs>\/.*)/;
+const URL_PARTS_REGEX = /(?<protocolPlusDomain>.*?\..*?)(?<pathname>\/.*)/;
 
 export function getDomainBase(raw: string, urlParts = URL_PARTS_REGEX): string {
 	try {
@@ -77,7 +77,9 @@ export function getDomainBase(raw: string, urlParts = URL_PARTS_REGEX): string {
 }
 
 function isSensitive(segment: string) {
-	return /%40/.test(segment) || /^\d+$/.test(segment) || /^[0-9A-F]{8}/i.test(segment);
+	if (/^v\d+$/.test(segment)) return false;
+
+	return /%40/.test(segment) || /\d/.test(segment) || /^[0-9A-F]{8}/i.test(segment);
 }
 
 export const ANONYMIZATION_CHARACTER = '*';
@@ -89,26 +91,6 @@ function sanitizeRoute(raw: string, check = isSensitive, char = ANONYMIZATION_CH
 		.join('/');
 }
 
-function sanitizeQuery(raw: string, check = isSensitive, char = ANONYMIZATION_CHARACTER) {
-	return raw
-		.split('&')
-		.map((segment) => {
-			const [key, value] = segment.split('=');
-			return [key, check(value) ? char.repeat(value.length) : value].join('=');
-		})
-		.join('&');
-}
-
-function sanitizeUrl(raw: string) {
-	if (/\?/.test(raw)) {
-		const [route, query] = raw.split('?');
-
-		return [sanitizeRoute(route), sanitizeQuery(query)].join('?');
-	}
-
-	return sanitizeRoute(raw);
-}
-
 /**
  * Return pathname plus query string from URL, anonymizing IDs in route and query params.
  */
@@ -118,13 +100,16 @@ export function getDomainPath(raw: string, urlParts = URL_PARTS_REGEX): string {
 
 		if (!url.hostname) throw new Error('Malformed URL');
 
-		return sanitizeUrl(url.pathname + url.search);
+		return sanitizeRoute(url.pathname);
 	} catch (_) {
 		const match = urlParts.exec(raw);
 
-		if (!match?.groups?.pathnamePlusQs) return '';
+		if (!match?.groups?.pathname) return '';
+
+		// discard query string
+		const route = match.groups.pathname.split('?').shift() as string;
 
-		return sanitizeUrl(match.groups.pathnamePlusQs);
+		return sanitizeRoute(route);
 	}
 }
 
@@ -191,6 +176,7 @@ export function generateNodesGraph(
 
 				nodeItem.domain_base = getDomainBase(url);
 				nodeItem.domain_path = getDomainPath(url);
+				nodeItem.method = node.parameters.requestMethod as string;
 			} else {
 				const nodeType = nodeTypes.getByNameAndVersion(node.type);
 

packages/workflow/test/TelemetryHelpers.test.ts

@@ -21,57 +21,57 @@ describe('getDomainBase should return protocol plus domain', () => {
 	});
 });
 
-describe('getDomainPath should return pathname plus query string', () => {
-	describe('anonymizing numeric IDs', () => {
+describe('getDomainPath should return pathname, excluding query string', () => {
+	describe('anonymizing strings containing at least one number', () => {
 		test('in valid URLs', () => {
-			for (const url of validUrls(numericId)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+			for (const url of validUrls(alphanumericId)) {
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 
 		test('in malformed URLs', () => {
-			for (const url of malformedUrls(numericId)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+			for (const url of malformedUrls(alphanumericId)) {
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 	});
 
 	describe('anonymizing UUIDs', () => {
 		test('in valid URLs', () => {
 			for (const url of uuidUrls(validUrls)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 
 		test('in malformed URLs', () => {
 			for (const url of uuidUrls(malformedUrls)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 	});
 
 	describe('anonymizing emails', () => {
 		test('in valid URLs', () => {
 			for (const url of validUrls(email)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 
 		test('in malformed URLs', () => {
 			for (const url of malformedUrls(email)) {
-				const { full, pathnamePlusQs } = url;
-				expect(getDomainPath(full)).toBe(pathnamePlusQs);
+				const { full, pathname } = url;
+				expect(getDomainPath(full)).toBe(pathname);
 			}
 		});
 	});
 });
 
-function validUrls(idMaker: typeof numericId | typeof email, char = CHAR) {
+function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
 	const firstId = idMaker();
 	const secondId = idMaker();
 	const firstIdObscured = char.repeat(firstId.length);
@@ -81,37 +81,42 @@ function validUrls(idMaker: typeof numericId | typeof email, char = CHAR) {
 		{
 			full: `https://test.com/api/v1/users/${firstId}`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}`,
+			pathname: `/api/v1/users/${firstIdObscured}`,
 		},
 		{
 			full: `https://test.com/api/v1/users/${firstId}/`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/`,
+			pathname: `/api/v1/users/${firstIdObscured}/`,
 		},
 		{
 			full: `https://test.com/api/v1/users/${firstId}/posts/${secondId}`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}`,
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}`,
 		},
 		{
 			full: `https://test.com/api/v1/users/${firstId}/posts/${secondId}/`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
 		},
 		{
 			full: `https://test.com/api/v1/users/${firstId}/posts/${secondId}/`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
 		},
 		{
 			full: `https://test.com/api/v1/users?id=${firstId}`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users?id=${firstIdObscured}`,
+			pathname: '/api/v1/users',
 		},
 		{
 			full: `https://test.com/api/v1/users?id=${firstId}&post=${secondId}`,
 			protocolPlusDomain: 'https://test.com',
-			pathnamePlusQs: `/api/v1/users?id=${firstIdObscured}&post=${secondIdObscured}`,
+			pathname: '/api/v1/users',
+		},
+		{
+			full: `https://test.com/api/v1/users/${firstId}/posts/${secondId}`,
+			protocolPlusDomain: 'https://test.com',
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}`,
 		},
 	];
 }
@@ -126,22 +131,22 @@ function malformedUrls(idMaker: typeof numericId | typeof email, char = CHAR) {
 		{
 			full: `test.com/api/v1/users/${firstId}/posts/${secondId}/`,
 			protocolPlusDomain: 'test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
 		},
 		{
 			full: `htp://test.com/api/v1/users/${firstId}/posts/${secondId}/`,
 			protocolPlusDomain: 'htp://test.com',
-			pathnamePlusQs: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
+			pathname: `/api/v1/users/${firstIdObscured}/posts/${secondIdObscured}/`,
 		},
 		{
 			full: `test.com/api/v1/users?id=${firstId}`,
 			protocolPlusDomain: 'test.com',
-			pathnamePlusQs: `/api/v1/users?id=${firstIdObscured}`,
+			pathname: '/api/v1/users',
 		},
 		{
 			full: `test.com/api/v1/users?id=${firstId}&post=${secondId}`,
 			protocolPlusDomain: 'test.com',
-			pathnamePlusQs: `/api/v1/users?id=${firstIdObscured}&post=${secondIdObscured}`,
+			pathname: '/api/v1/users',
 		},
 	];
 }
@@ -174,3 +179,13 @@ function positiveDigit(): number {
 function numericId(length = positiveDigit()) {
 	return Array.from({ length }, digit).join('');
 }
+
+function alphanumericId() {
+	return chooseRandomly([
+		`john${numericId()}`,
+		`title${numericId(1)}`,
+		numericId(),
+	]);
+}
+
+const chooseRandomly = <T>(array: T[]) => array[Math.floor(Math.random() * array.length)];