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.

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

[ci-stats-reporter] use v2 test group APIs #131001

Merged
merged 8 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 41 additions & 10 deletions packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ export interface CiStatsReportTestsOptions {
}

/* @internal */
interface ReportTestsResponse {
buildId: string;
interface ReportTestGroupResponse {
groupId: string;
testRunCount: number;
}

/* @internal */
Expand Down Expand Up @@ -238,18 +236,51 @@ export class CiStatsReporter {
);
}

return await this.req<ReportTestsResponse>({
const groupResp = await this.req<ReportTestGroupResponse>({
auth: true,
path: '/v1/test_group',
path: '/v2/test_group',
query: {
buildId: this.config?.buildId,
},
bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
body: [
JSON.stringify({ group }),
...testRuns.map((testRun) => JSON.stringify({ testRun })),
].join('\n'),
bodyDesc: `[${group.name}/${group.type}] test group`,
body: group,
});

if (!groupResp) {
return;
}

let bufferBytes = 0;
const buffer: string[] = [];
const flushBuffer = async () => {
await this.req<{ testRunCount: number }>({
auth: true,
path: '/v2/test_runs',
query: {
buildId: this.config?.buildId,
groupId: groupResp.groupId,
groupType: group.type,
},
bodyDesc: `[${group.name}/${group.type}] Chunk of ${bufferBytes} bytes`,
body: buffer.join('\n'),
});
buffer.length = 0;
bufferBytes = 0;
};

// send test runs in chunks of ~500kb
for (const testRun of testRuns) {
const json = JSON.stringify(testRun);
bufferBytes += json.length;
buffer.push(json);
if (bufferBytes >= 450000) {
await flushBuffer();
}
}

if (bufferBytes) {
await flushBuffer();
}
}

/**
Expand Down
52 changes: 44 additions & 8 deletions packages/kbn-pm/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1740,19 +1740,55 @@ class CiStatsReporter {
throw new Error('unable to report tests unless buildId is configured and auth config available');
}

return await this.req({
const groupResp = await this.req({
auth: true,
path: '/v1/test_group',
path: '/v2/test_group',
query: {
buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
},
bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
body: [JSON.stringify({
group
}), ...testRuns.map(testRun => JSON.stringify({
testRun
}))].join('\n')
bodyDesc: `[${group.name}/${group.type}] test group`,
body: group
});

if (!groupResp) {
return;
}

let bufferBytes = 0;
const buffer = [];

const flushBuffer = async () => {
var _this$config8;

await this.req({
auth: true,
path: '/v2/test_runs',
query: {
buildId: (_this$config8 = this.config) === null || _this$config8 === void 0 ? void 0 : _this$config8.buildId,
groupId: groupResp.groupId,
groupType: group.type
},
bodyDesc: `[${group.name}/${group.type}] Chunk of ${bufferBytes} bytes`,
body: buffer.join('\n')
});
buffer.length = 0;
bufferBytes = 0;
}; // send test runs in chunks of ~500kb


for (const testRun of testRuns) {
const json = JSON.stringify(testRun);
bufferBytes += json.length;
buffer.push(json);

if (bufferBytes >= 450000) {
await flushBuffer();
}
}

if (bufferBytes) {
await flushBuffer();
}
}
/**
* In order to allow this code to run before @kbn/utils is built, @kbn/pm will pass
Expand Down