-
Notifications
You must be signed in to change notification settings - Fork 515
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate Google Analytics into Search Page #220
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,5 @@ coverage | |
.DS_Store | ||
npm-debug.log | ||
.vscode | ||
.idea | ||
yarn-error.log |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,6 +30,8 @@ import VirtSelect from '../common/VirtSelect'; | |
import * as jaegerApiActions from '../../actions/jaeger-api'; | ||
import { formatDate, formatTime } from '../../utils/date'; | ||
import reduxFormFieldAdapter from '../../utils/redux-form-field-adapter'; | ||
import { trackFormInput } from './SearchForm.track'; | ||
import { DEFAULT_OPERATION, DEFAULT_LIMIT, DEFAULT_LOOKBACK } from '../../constants/search-form'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why are we not using something like Prettier to auto-format? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We are. My remark refers to the order of the lines. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no auto-formatter for order? Go and Java both have that for imports. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not in prettier, which is the auto-formatter we're using. There might be something around that fits the bill, thought... |
||
|
||
import './SearchForm.css'; | ||
|
||
|
@@ -134,9 +136,11 @@ export function submitForm(fields, searchTraces) { | |
end = times.end; | ||
} | ||
|
||
trackFormInput(resultsLimit, operation, tags, minDuration, maxDuration, lookback); | ||
|
||
searchTraces({ | ||
service, | ||
operation: operation !== 'all' ? operation : undefined, | ||
operation: operation !== DEFAULT_OPERATION ? operation : undefined, | ||
limit: resultsLimit, | ||
lookback, | ||
start, | ||
|
@@ -459,13 +463,13 @@ export function mapStateToProps(state) { | |
destroyOnUnmount: false, | ||
initialValues: { | ||
service: service || lastSearchService || '-', | ||
resultsLimit: limit || 20, | ||
lookback: lookback || '1h', | ||
resultsLimit: limit || DEFAULT_LIMIT, | ||
lookback: lookback || DEFAULT_LOOKBACK, | ||
startDate: queryStartDate || today, | ||
startDateTime: queryStartDateTime || '00:00', | ||
endDate: queryEndDate || today, | ||
endDateTime: queryEndDateTime || currentTime, | ||
operation: operation || lastSearchOperation || 'all', | ||
operation: operation || lastSearchOperation || DEFAULT_OPERATION, | ||
tags, | ||
minDuration: minDuration || null, | ||
maxDuration: maxDuration || null, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
// @flow | ||
|
||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
import type { Store } from 'redux'; | ||
import * as constants from '../../constants/search-form'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please separate local resources from npm packages with a new line
|
||
import { trackEvent } from '../../utils/tracking'; | ||
|
||
export function trackFormInput( | ||
resultsLimit: number, | ||
operation: string, | ||
tags: any, | ||
minDuration: number, | ||
maxDuration: number, | ||
lookback: string | ||
) { | ||
trackEvent( | ||
constants.CATEGORY_OPERATION, | ||
operation === constants.DEFAULT_OPERATION ? constants.ACTION_DEFAULT : constants.ACTION_SET, | ||
operation | ||
); | ||
trackEvent( | ||
constants.CATEGORY_LIMIT, | ||
resultsLimit === constants.DEFAULT_LIMIT ? constants.ACTION_DEFAULT : constants.ACTION_SET, | ||
resultsLimit | ||
); | ||
trackEvent( | ||
constants.CATEGORY_MAX_DURATION, | ||
maxDuration ? constants.ACTION_SET : constants.ACTION_CLEAR, | ||
maxDuration | ||
); | ||
trackEvent( | ||
constants.CATEGORY_MIN_DURATION, | ||
minDuration ? constants.ACTION_SET : constants.ACTION_CLEAR, | ||
minDuration | ||
); | ||
trackEvent(constants.CATEGORY_TAGS, tags ? constants.ACTION_SET : constants.ACTION_CLEAR, tags); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't need to track any of the values (besides lookback) |
||
trackEvent(constants.CATEGORY_LOOKBACK, lookback); | ||
} | ||
|
||
export const middlewareHooks = { | ||
[constants.FORM_CHANGE_ACTION_TYPE]: (store: Store, action: any) => { | ||
if (action.meta.form === 'sortBy') { | ||
trackEvent(constants.CATEGORY_SORTBY, action.payload); | ||
} | ||
}, | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
/* eslint-disable import/first */ | ||
jest.mock('../../utils/tracking'); | ||
|
||
import { middlewareHooks, trackFormInput } from './SearchForm.track'; | ||
import { | ||
CATEGORY_LIMIT, | ||
CATEGORY_LOOKBACK, | ||
CATEGORY_MAX_DURATION, | ||
CATEGORY_MIN_DURATION, | ||
CATEGORY_OPERATION, | ||
CATEGORY_SORTBY, | ||
CATEGORY_TAGS, | ||
FORM_CHANGE_ACTION_TYPE, | ||
} from '../../constants/search-form'; | ||
import { trackEvent } from '../../utils/tracking'; | ||
|
||
describe('GA tracking', () => { | ||
it('tracks changing sort criteria', () => { | ||
const action = { meta: { form: 'sortBy' }, payload: 'MOST_RECENT' }; | ||
middlewareHooks[FORM_CHANGE_ACTION_TYPE]({}, action); | ||
expect(trackEvent.mock.calls.length).toBe(1); | ||
expect(trackEvent.mock.calls[0]).toEqual([CATEGORY_SORTBY, expect.any(String)]); | ||
}); | ||
|
||
it('sends form input to GA', () => { | ||
trackEvent.mockClear(); | ||
trackFormInput(0, '', {}, 0, 0, ''); | ||
expect(trackEvent.mock.calls.length).toBe(6); | ||
const categoriesTracked = trackEvent.mock.calls.map(call => call[0]).sort(); | ||
expect(categoriesTracked).toEqual( | ||
[ | ||
CATEGORY_OPERATION, | ||
CATEGORY_LIMIT, | ||
CATEGORY_TAGS, | ||
CATEGORY_MAX_DURATION, | ||
CATEGORY_MIN_DURATION, | ||
CATEGORY_LOOKBACK, | ||
].sort() | ||
); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
export const DEFAULT_OPERATION = 'all'; | ||
export const DEFAULT_LOOKBACK = '1h'; | ||
export const DEFAULT_LIMIT = 20; | ||
|
||
export const ACTION_SET = 'set'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please move the tracking related constants to |
||
export const ACTION_CLEAR = 'clear'; | ||
export const ACTION_DEFAULT = 'default'; | ||
|
||
export const FORM_CHANGE_ACTION_TYPE = '@@redux-form/CHANGE'; | ||
export const CATEGORY_SORTBY = `jaeger/ux/search/results/sortby`; | ||
|
||
export const FORM_CATEGORY_BASE = 'jaeger/ux/search/form'; | ||
export const CATEGORY_OPERATION = `${FORM_CATEGORY_BASE}/operation`; | ||
export const CATEGORY_LOOKBACK = `${FORM_CATEGORY_BASE}/lookback`; | ||
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`; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sort order is not quite right