Skip to content
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.

Sign up for GitHub

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

[Usage] Fix flaky UI Counters test #100979

Merged
merged 11 commits into from
Jun 3, 2021
Merged

[Usage] Fix flaky UI Counters test #100979

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dbe0bbb
increase to delay to 8 seconds
Bamieh May 31, 2021
822180d
[TEMP] ONLY UI COUNTERS TEST FILE
Bamieh Jun 1, 2021
64c029b
Update index.ts
Bamieh Jun 1, 2021
9dda838
Merge branch 'master' into usage/fix_ui_counters_test
kibanamachine Jun 1, 2021
b4e6f6f
Merge branch 'master' of github.com:elastic/kibana into usage/fix_ui_…
Bamieh Jun 2, 2021
229aa3e
Merge branch 'master' of github.com:elastic/kibana into usage/fix_ui_…
Bamieh Jun 3, 2021
651101e
retry assertion function
Bamieh Jun 3, 2021
04b583c
Merge branch 'usage/fix_ui_counters_test' of github.com:Bamieh/kibana…
Bamieh Jun 3, 2021
a8f8599
self codereview
Bamieh Jun 3, 2021
2e8d126
revert and use retry common util
Bamieh Jun 3, 2021
225c783
uncomment test files
Bamieh Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 44 additions & 43 deletions test/api_integration/apis/ui_counters/ui_counters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { UsageCountersSavedObject } from '../../../../src/plugins/usage_collecti
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const retry = getService('retry');

const createUiCounterEvent = (eventName: string, type: UiCounterMetricType, count = 1) => ({
eventName,
Expand All @@ -23,16 +24,24 @@ export default function ({ getService }: FtrProviderContext) {
count,
});

const sendReport = async (report: Report) => {
const fetchUsageCountersObjects = async (): Promise<UsageCountersSavedObject[]> => {
const {
body: { saved_objects: savedObjects },
} = await supertest
.get('/api/saved_objects/_find?type=usage-counters')
.set('kbn-xsrf', 'kibana')
.expect(200);

return savedObjects;
};

const sendReport = async (report: Report): Promise<void> => {
await supertest
.post('/api/ui_counters/_report')
.set('kbn-xsrf', 'kibana')
.set('content-type', 'application/json')
.send({ report })
.expect(200);

// wait for SO to index data into ES
await new Promise((res) => setTimeout(res, 5 * 1000));
};

const getCounterById = (
Expand All @@ -47,8 +56,7 @@ export default function ({ getService }: FtrProviderContext) {
return savedObject;
};

// FLAKY: https://github.com/elastic/kibana/issues/98240
describe.skip('UI Counters API', () => {
describe('UI Counters API', () => {
const dayDate = moment().format('DDMMYYYY');
before(async () => await esArchiver.emptyKibanaIndex());

Expand All @@ -61,18 +69,15 @@ export default function ({ getService }: FtrProviderContext) {

await sendReport(report);

const {
body: { saved_objects: savedObjects },
} = await supertest
.get('/api/saved_objects/_find?type=usage-counters')
.set('kbn-xsrf', 'kibana')
.expect(200);

const countTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
);
expect(countTypeEvent.attributes.count).to.eql(1);
await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
const savedObjects = await fetchUsageCountersObjects();
const countTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
);
expect(countTypeEvent.attributes.count).to.eql(1);
return true;
});
});

it('supports multiple events', async () => {
Expand All @@ -87,31 +92,27 @@ export default function ({ getService }: FtrProviderContext) {
]);

await sendReport(report);

const {
body: { saved_objects: savedObjects },
} = await supertest
.get('/api/saved_objects/_find?type=usage-counters&fields=count')
.set('kbn-xsrf', 'kibana')
.expect(200);

const countTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
);
expect(countTypeEvent.attributes.count).to.eql(1);

const clickTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
);
expect(clickTypeEvent.attributes.count).to.eql(2);

const secondEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
);
expect(secondEvent.attributes.count).to.eql(1);
await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
const savedObjects = await fetchUsageCountersObjects();
const countTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
);
expect(countTypeEvent.attributes.count).to.eql(1);

const clickTypeEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
);
expect(clickTypeEvent.attributes.count).to.eql(2);

const secondEvent = getCounterById(
savedObjects,
`uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
);
expect(secondEvent.attributes.count).to.eql(1);
return true;
});
});
});
}