From 1b55011468c458f551c49b77697a498251d5551b Mon Sep 17 00:00:00 2001 From: rikinsk Date: Thu, 30 Jul 2020 17:17:36 +0530 Subject: [PATCH 1/4] console: fix telemetry --- console/src/telemetry/filters.ts | 65 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/console/src/telemetry/filters.ts b/console/src/telemetry/filters.ts index 8cb1b73976b4b..f01a14454f6f0 100644 --- a/console/src/telemetry/filters.ts +++ b/console/src/telemetry/filters.ts @@ -14,57 +14,56 @@ const DATA_PATH = '/data'; const API_EXPLORER_PATH = '/api-explorer'; const REMOTE_SCHEMAS_PATH = '/remote-schemas'; const EVENTS_PATH = '/events'; +const ACTIONS_PATH = '/actions'; const dataHandler = (path: string) => { - return ( - DATA_PATH + - path - .replace(/\/schema\/([^/]*)(\/)?/, '/schema/SCHEMA_NAME$2') - .replace( - /(\/schema\/.*)\/tables\/([^/]*)(\/.*)?/, - '$1/tables/TABLE_NAME$3' - ) - .replace(/(\/schema\/.*)\/views\/([^/]*)(\/.*)?/, '$1/views/VIEW_NAME$3') - .replace( - /(\/schema\/.*)\/functions\/([^/]*)(\/.*)?/, - '$1/functions/FUNCTION_NAME$3' - ) - ); + return path + .replace(/\/schema\/([^/]*)(\/)?/, '/schema/SCHEMA_NAME$2') + .replace(/(\/schema\/.*)\/tables\/([^/]*)(\/.*)?/, '$1/tables/TABLE_NAME$3') + .replace(/(\/schema\/.*)\/views\/([^/]*)(\/.*)?/, '$1/views/VIEW_NAME$3') + .replace( + /(\/schema\/.*)\/functions\/([^/]*)(\/.*)?/, + '$1/functions/FUNCTION_NAME$3' + ); }; -const apiExplorerHandler = () => { - return API_EXPLORER_PATH; +const apiExplorerHandler = (path: string) => { + return path; }; const remoteSchemasHandler = (path: string) => { - return ( - REMOTE_SCHEMAS_PATH + - path.replace(/(\/manage\/)[^/]*(\/\w+.*)$/, '$1REMOTE_SCHEMA_NAME$2') - ); + return path.replace(/(\/manage\/)[^/]*(\/\w+.*)$/, '$1REMOTE_SCHEMA_NAME$2'); }; const eventsHandler = (path: string) => { - return ( - EVENTS_PATH + - path.replace(/(\/manage\/triggers\/)[^/]*(\/\w+.*)$/, '$1TRIGGER_NAME$2') - ); + return path + .replace(/(\/manage\/triggers\/)[^/]*(\/\w+.*)$/, '$1TRIGGER_NAME$2') + .replace(/\/data\/([^/]*)\/(.*)+$/, '/data/DATA_TRIGGER_NAME/$2') + .replace(/\/cron\/([^/]*)\/(.*)+$/, '/cron/CRON_TRIGGER_NAME/$2'); +}; + +const actionsHandler = (path: string) => { + return path.replace(/\/manage\/([^/]*)\/(.*)+$/, '/manage/ACTION_NAME/$2'); }; const sanitiseUrl = (rawPath: string) => { const path = rawPath.replace(new RegExp(globals.urlPrefix, 'g'), ''); - if (path.indexOf(DATA_PATH) === 0) { - return dataHandler(path.slice(DATA_PATH.length)); + if (path.startsWith(DATA_PATH)) { + return dataHandler(path); + } + if (path.startsWith(API_EXPLORER_PATH)) { + return apiExplorerHandler(path); } - if (path.indexOf(API_EXPLORER_PATH) === 0) { - return apiExplorerHandler(); + if (path.startsWith(REMOTE_SCHEMAS_PATH)) { + return remoteSchemasHandler(path); } - if (path.indexOf(REMOTE_SCHEMAS_PATH) === 0) { - return remoteSchemasHandler(path.slice(REMOTE_SCHEMAS_PATH.length)); + if (path.startsWith(EVENTS_PATH)) { + return eventsHandler(path); } - if (path.indexOf(EVENTS_PATH) === 0) { - return eventsHandler(path.slice(EVENTS_PATH.length)); + if (path.startsWith(ACTIONS_PATH)) { + return actionsHandler(path); } - return '/'; + return path; }; export { filterEventsBlockList, sanitiseUrl }; From 493a77dfe7dde75c191466e75d31a1770e3add68 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Thu, 30 Jul 2020 17:30:50 +0530 Subject: [PATCH 2/4] make patterns consistent --- console/src/telemetry/filters.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/console/src/telemetry/filters.ts b/console/src/telemetry/filters.ts index f01a14454f6f0..2c16abaa6f061 100644 --- a/console/src/telemetry/filters.ts +++ b/console/src/telemetry/filters.ts @@ -18,13 +18,10 @@ const ACTIONS_PATH = '/actions'; const dataHandler = (path: string) => { return path - .replace(/\/schema\/([^/]*)(\/)?/, '/schema/SCHEMA_NAME$2') - .replace(/(\/schema\/.*)\/tables\/([^/]*)(\/.*)?/, '$1/tables/TABLE_NAME$3') - .replace(/(\/schema\/.*)\/views\/([^/]*)(\/.*)?/, '$1/views/VIEW_NAME$3') - .replace( - /(\/schema\/.*)\/functions\/([^/]*)(\/.*)?/, - '$1/functions/FUNCTION_NAME$3' - ); + .replace(/(\/schema\/)[^/]*(\/)?/, '$1SCHEMA_NAME$2') + .replace(/(\/schema\/.*\/tables\/)[^/]*(\/.*)?/, '$1TABLE_NAME$2') + .replace(/(\/schema\/.*\/views\/)[^/]*(\/.*)?/, '$1VIEW_NAME$2') + .replace(/(\/schema\/.*\/functions\/)[^/]*(\/.*)?/, '$1FUNCTION_NAME$3'); }; const apiExplorerHandler = (path: string) => { @@ -38,12 +35,12 @@ const remoteSchemasHandler = (path: string) => { const eventsHandler = (path: string) => { return path .replace(/(\/manage\/triggers\/)[^/]*(\/\w+.*)$/, '$1TRIGGER_NAME$2') - .replace(/\/data\/([^/]*)\/(.*)+$/, '/data/DATA_TRIGGER_NAME/$2') - .replace(/\/cron\/([^/]*)\/(.*)+$/, '/cron/CRON_TRIGGER_NAME/$2'); + .replace(/(\/data\/)[^/]*\/(.*)+$/, '$1DATA_TRIGGER_NAME/$2') + .replace(/(\/cron\/)[^/]*\/(.*)+$/, '$1CRON_TRIGGER_NAME/$2'); }; const actionsHandler = (path: string) => { - return path.replace(/\/manage\/([^/]*)\/(.*)+$/, '/manage/ACTION_NAME/$2'); + return path.replace(/(\/manage\/)[^/]*\/(.*)+$/, '$1ACTION_NAME/$2'); }; const sanitiseUrl = (rawPath: string) => { From 2c8f574207d08c4c9d0c4f1523ef87c9c8f92e31 Mon Sep 17 00:00:00 2001 From: Rikin Kachhia <54616969+rikinsk@users.noreply.github.com> Date: Thu, 30 Jul 2020 17:32:16 +0530 Subject: [PATCH 3/4] Update filters.ts --- console/src/telemetry/filters.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/src/telemetry/filters.ts b/console/src/telemetry/filters.ts index 2c16abaa6f061..0997f90ef91f2 100644 --- a/console/src/telemetry/filters.ts +++ b/console/src/telemetry/filters.ts @@ -21,7 +21,7 @@ const dataHandler = (path: string) => { .replace(/(\/schema\/)[^/]*(\/)?/, '$1SCHEMA_NAME$2') .replace(/(\/schema\/.*\/tables\/)[^/]*(\/.*)?/, '$1TABLE_NAME$2') .replace(/(\/schema\/.*\/views\/)[^/]*(\/.*)?/, '$1VIEW_NAME$2') - .replace(/(\/schema\/.*\/functions\/)[^/]*(\/.*)?/, '$1FUNCTION_NAME$3'); + .replace(/(\/schema\/.*\/functions\/)[^/]*(\/.*)?/, '$1FUNCTION_NAME$2'); }; const apiExplorerHandler = (path: string) => { From ce0bdbab9da2cad82c9319a6b17a8437aa28f172 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Thu, 30 Jul 2020 20:29:19 +0530 Subject: [PATCH 4/4] remove unnecessary code path --- console/src/telemetry/filters.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/console/src/telemetry/filters.ts b/console/src/telemetry/filters.ts index 0997f90ef91f2..4b3ea7d4e5e67 100644 --- a/console/src/telemetry/filters.ts +++ b/console/src/telemetry/filters.ts @@ -11,7 +11,6 @@ const filterEventsBlockList = [ ]; const DATA_PATH = '/data'; -const API_EXPLORER_PATH = '/api-explorer'; const REMOTE_SCHEMAS_PATH = '/remote-schemas'; const EVENTS_PATH = '/events'; const ACTIONS_PATH = '/actions'; @@ -24,10 +23,6 @@ const dataHandler = (path: string) => { .replace(/(\/schema\/.*\/functions\/)[^/]*(\/.*)?/, '$1FUNCTION_NAME$2'); }; -const apiExplorerHandler = (path: string) => { - return path; -}; - const remoteSchemasHandler = (path: string) => { return path.replace(/(\/manage\/)[^/]*(\/\w+.*)$/, '$1REMOTE_SCHEMA_NAME$2'); }; @@ -48,9 +43,6 @@ const sanitiseUrl = (rawPath: string) => { if (path.startsWith(DATA_PATH)) { return dataHandler(path); } - if (path.startsWith(API_EXPLORER_PATH)) { - return apiExplorerHandler(path); - } if (path.startsWith(REMOTE_SCHEMAS_PATH)) { return remoteSchemasHandler(path); }