📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
(improvement) Performance birdseye measures support (#223)
Andrii Romasiunfbd3f982ba41
diff --git a/apps/production/src/analytics/analytics.controller.ts b/apps/production/src/analytics/analytics.controller.tsindex 6c7bf652c..293dd1eb0 100644--- a/apps/production/src/analytics/analytics.controller.ts+++ b/apps/production/src/analytics/analytics.controller.ts@@ -957,8 +957,15 @@ export class AnalyticsController {timezone = DEFAULT_TIMEZONE,filters,} = data+ let { measure = DEFAULT_MEASURE } = dataconst pidsArray = getPIDsArray(pids, pid)+ this.analyticsService.checkIfPerfMeasureIsValid(measure)++ if (measure === 'quantiles') {+ measure = DEFAULT_MEASURE+ }+const validationPromises = _map(pidsArray, async currentPID => {this.analyticsService.validatePID(currentPID)await this.analyticsService.checkProjectAccess(@@ -979,6 +986,7 @@ export class AnalyticsController {to,timezone,filters,+ measure,)}diff --git a/apps/production/src/analytics/analytics.service.ts b/apps/production/src/analytics/analytics.service.tsindex c68b25ccc..4e049daef 100644--- a/apps/production/src/analytics/analytics.service.ts+++ b/apps/production/src/analytics/analytics.service.ts@@ -1509,6 +1509,7 @@ export class AnalyticsService {to?: string,timezone?: string,filters?: string,+ measure: PerfMeasure = 'median',): Promise<IOverallPerformance> {// eslint-disable-next-linelet _from: string@@ -1540,6 +1541,18 @@ export class AnalyticsService {true,)+ const cols = ['dns', 'tls', 'conn', 'response', 'render', 'domLoad', 'ttfb']++ const measures = {+ average: 'avg',+ median: 'median',+ p95: 'quantileExact(0.95)',+ }++ const columnSelectors = cols+ .map(col => `${measures[measure]}(${col}) as ${col}`)+ .join(', ')+const promises = pids.map(async pid => {if (!isValidPID(pid)) {throw new BadRequestException(@@ -1549,7 +1562,7 @@ export class AnalyticsService {try {if (period === 'all') {- const queryAll = `SELECT avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery}`+ const queryAll = `SELECT ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery}`const rawResult = <Array<Partial<PerformanceCHResponse>>>(await clickhouse.query(queryAll, {@@ -1615,8 +1628,8 @@ export class AnalyticsService {.format('YYYY-MM-DD HH:mm:ss')}- const queryCurrent = `SELECT 1 AS sortOrder, avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodFormatted:String} AND {now:String} ${filtersQuery}`- const queryPrevious = `SELECT 2 AS sortOrder, avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodSubtracted:String} AND {periodFormatted:String} ${filtersQuery}`+ const queryCurrent = `SELECT 1 AS sortOrder, ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodFormatted:String} AND {now:String} ${filtersQuery}`+ const queryPrevious = `SELECT 2 AS sortOrder, ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodSubtracted:String} AND {periodFormatted:String} ${filtersQuery}`const query = `${queryCurrent} UNION ALL ${queryPrevious}`diff --git a/apps/selfhosted/src/analytics/analytics.controller.ts b/apps/selfhosted/src/analytics/analytics.controller.tsindex 637988e2d..1bc62af34 100644--- a/apps/selfhosted/src/analytics/analytics.controller.ts+++ b/apps/selfhosted/src/analytics/analytics.controller.ts@@ -842,8 +842,15 @@ export class AnalyticsController {timezone = DEFAULT_TIMEZONE,filters,} = data+ let { measure = DEFAULT_MEASURE } = dataconst pidsArray = getPIDsArray(pids, pid)+ this.analyticsService.checkIfPerfMeasureIsValid(measure)++ if (measure === 'quantiles') {+ measure = DEFAULT_MEASURE+ }+const validationPromises = _map(pidsArray, async currentPID => {this.analyticsService.validatePID(currentPID)await this.analyticsService.checkProjectAccess(currentPID, uid)@@ -858,6 +865,7 @@ export class AnalyticsController {to,timezone,filters,+ measure,)}diff --git a/apps/selfhosted/src/analytics/analytics.service.ts b/apps/selfhosted/src/analytics/analytics.service.tsindex 282de7c13..4ecee37f5 100644--- a/apps/selfhosted/src/analytics/analytics.service.ts+++ b/apps/selfhosted/src/analytics/analytics.service.ts@@ -1256,6 +1256,7 @@ export class AnalyticsService {to?: string,timezone?: string,filters?: string,+ measure: PerfMeasure = 'median',): Promise<IOverallPerformance> {// eslint-disable-next-linelet _from: string@@ -1287,6 +1288,18 @@ export class AnalyticsService {true,)+ const cols = ['dns', 'tls', 'conn', 'response', 'render', 'domLoad', 'ttfb']++ const measures = {+ average: 'avg',+ median: 'median',+ p95: 'quantileExact(0.95)',+ }++ const columnSelectors = cols+ .map(col => `${measures[measure]}(${col}) as ${col}`)+ .join(', ')+const promises = pids.map(async pid => {if (!isValidPID(pid)) {throw new BadRequestException(@@ -1296,7 +1309,7 @@ export class AnalyticsService {try {if (period === 'all') {- const queryAll = `SELECT avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery}`+ const queryAll = `SELECT ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} ${filtersQuery}`const rawResult = <Array<Partial<PerformanceCHResponse>>>(await clickhouse.query(queryAll, {@@ -1362,8 +1375,8 @@ export class AnalyticsService {.format('YYYY-MM-DD HH:mm:ss')}- const queryCurrent = `SELECT 1 AS sortOrder, avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodFormatted:String} AND {now:String} ${filtersQuery}`- const queryPrevious = `SELECT 2 AS sortOrder, avg(dns) AS dns, avg(tls) as tls, avg(conn) as conn, avg(response) as response, avg(render) as render, avg(domLoad) as domLoad, avg(ttfb) as ttfb FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodSubtracted:String} AND {periodFormatted:String} ${filtersQuery}`+ const queryCurrent = `SELECT 1 AS sortOrder, ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodFormatted:String} AND {now:String} ${filtersQuery}`+ const queryPrevious = `SELECT 2 AS sortOrder, ${columnSelectors} FROM performance WHERE pid = {pid:FixedString(12)} AND created BETWEEN {periodSubtracted:String} AND {periodFormatted:String} ${filtersQuery}`const query = `${queryCurrent} UNION ALL ${queryPrevious}`