From 43581aefcdf064055c0e4fdb7ad428233181bb31 Mon Sep 17 00:00:00 2001 From: vvvprabhakar Date: Fri, 29 Oct 2021 12:28:19 +0530 Subject: [PATCH] serviceName Track Event Signed-off-by: vvvprabhakar --- .../jaeger-ui/src/components/SearchTracePage/SearchForm.js | 2 +- .../src/components/SearchTracePage/SearchForm.track.test.js | 6 ++++-- .../src/components/SearchTracePage/SearchForm.track.tsx | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js index e2cff1a185..aa2ecbdfb1 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.js @@ -238,7 +238,7 @@ export function submitForm(fields, searchTraces) { end = times.end; } - trackFormInput(resultsLimit, operation, tags, minDuration, maxDuration, lookback); + trackFormInput(resultsLimit, operation, tags, minDuration, maxDuration, lookback, service); searchTraces({ service, diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.test.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.test.js index f6d29fa75d..996f411bee 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.test.js +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.test.js @@ -25,6 +25,7 @@ import { CATEGORY_OPERATION, CATEGORY_SORTBY, CATEGORY_TAGS, + CATEGORY_SERVICE, } from './SearchForm.track'; import { FORM_CHANGE_ACTION_TYPE } from '../../constants/search-form'; import { trackEvent } from '../../utils/tracking'; @@ -39,8 +40,8 @@ describe('GA tracking', () => { it('sends form input to GA', () => { trackEvent.mockClear(); - trackFormInput(0, '', {}, 0, 0, ''); - expect(trackEvent.mock.calls.length).toBe(6); + trackFormInput(0, '', {}, 0, 0, '', ''); + expect(trackEvent.mock.calls.length).toBe(7); const categoriesTracked = trackEvent.mock.calls.map(call => call[0]).sort(); expect(categoriesTracked).toEqual( [ @@ -50,6 +51,7 @@ describe('GA tracking', () => { CATEGORY_MAX_DURATION, CATEGORY_MIN_DURATION, CATEGORY_LOOKBACK, + CATEGORY_SERVICE, ].sort() ); }); diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.tsx b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.tsx index d17b7b1f25..781a1a11b6 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.tsx +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchForm.track.tsx @@ -30,14 +30,15 @@ export const CATEGORY_TAGS = `${FORM_CATEGORY_BASE}/tags`; export const CATEGORY_MIN_DURATION = `${FORM_CATEGORY_BASE}/min_duration`; export const CATEGORY_MAX_DURATION = `${FORM_CATEGORY_BASE}/max_duration`; export const CATEGORY_LIMIT = `${FORM_CATEGORY_BASE}/limit`; - +export const CATEGORY_SERVICE = `${FORM_CATEGORY_BASE}/serviceName`; export function trackFormInput( resultsLimit: number, operation: string, tags: any, minDuration: number, maxDuration: number, - lookback: string + lookback: string, + serviceName: string ) { trackEvent(CATEGORY_OPERATION, operation === constants.DEFAULT_OPERATION ? ACTION_DEFAULT : ACTION_SET); trackEvent(CATEGORY_LIMIT, resultsLimit === constants.DEFAULT_LIMIT ? ACTION_DEFAULT : ACTION_SET); @@ -45,6 +46,7 @@ export function trackFormInput( trackEvent(CATEGORY_MIN_DURATION, minDuration ? ACTION_SET : ACTION_CLEAR); trackEvent(CATEGORY_TAGS, tags ? ACTION_SET : ACTION_CLEAR); trackEvent(CATEGORY_LOOKBACK, lookback); + trackEvent(CATEGORY_SERVICE, serviceName); } export const middlewareHooks = {