Elgato_dark/console
1
0
Fork 0
mirror of https://github.com/graphql-hive/console synced 2026-05-23 09:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix ClickHouse stats reporting (#4067)

Browse source
This commit is contained in:
Dotan Simha 2024-02-26 08:47:28 +02:00 committed by GitHub
parent 5dce106eeb
commit fa0ce58e9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/services/api/src/modules/operations/providers/clickhouse-client.ts
View file

@ -18,7 +18,7 @@ function hashQuery(query: SqlStatement): string {
export interface QueryResponse<T> {
data: readonly T[];
rows: number;
statistics: {
statistics?: {
elapsed: number;
};
}
@ -167,7 +167,7 @@ export class ClickHouse {
this.config.onReadEnd?.(queryId, {
totalSeconds: endedAt,
elapsedSeconds: response.statistics.elapsed,
elapsedSeconds: response.statistics?.elapsed,
});
return response;

2
packages/services/api/src/modules/operations/providers/tokens.ts
View file

@ -14,7 +14,7 @@ export interface ClickHouseConfig {
label: string,
timings: {
totalSeconds: number;
elapsedSeconds: number;
elapsedSeconds?: number;
},
) => void;
}

5
packages/services/server/src/index.ts
View file

@ -270,7 +270,10 @@ export async function main() {
requestTimeout: env.clickhouse.requestTimeout,
onReadEnd(query, timings) {
clickHouseReadDuration.labels({ query }).observe(timings.totalSeconds);
clickHouseElapsedDuration.labels({ query }).observe(timings.elapsedSeconds);
if (timings.elapsedSeconds !== undefined) {
clickHouseElapsedDuration.labels({ query }).observe(timings.elapsedSeconds);
}
},
},
cdn: env.cdn,

2
packages/services/usage-estimator/src/estimator.ts
View file

@ -15,7 +15,7 @@ export function createEstimator(config: {
label: string,
timings: {
totalSeconds: number;
elapsedSeconds: number;
elapsedSeconds?: number;
},
) => void;
};

5
packages/services/usage-estimator/src/index.ts
View file

@ -46,7 +46,10 @@ async function main() {
password: env.clickhouse.password,
onReadEnd(query, timings) {
clickHouseReadDuration.labels({ query }).observe(timings.totalSeconds);
clickHouseElapsedDuration.labels({ query }).observe(timings.elapsedSeconds);
if (timings.elapsedSeconds !== undefined) {
clickHouseElapsedDuration.labels({ query }).observe(timings.elapsedSeconds);
}
},
},
});