Skip to content

📈 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!

timebucket support for errors

Blue Mousefa601721ce1b
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index ab393f49c..081c8a194 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -1652,6 +1652,7 @@ export class AnalyticsController {
period,
from,
to,
+ timeBucket,
//
} = data
@@ -1663,7 +1664,7 @@ export class AnalyticsController {
await this.analyticsService.checkBillingAccess(pid)
- let timeBucket
+ let newTimeBucket = timeBucket
let diff
if (period === 'all') {
@@ -1672,17 +1673,15 @@ export class AnalyticsController {
'errors',
)
- timeBucket = res.timeBucket[0]
+ newTimeBucket = res.timeBucket[0]
diff = res.diff
- } else {
- timeBucket = getLowestPossibleTimeBucket(period, from, to)
}
const safeTimezone = this.analyticsService.getSafeTimezone(timezone)
const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(
from,
to,
- timeBucket,
+ newTimeBucket,
period,
safeTimezone,
diff,
@@ -1694,7 +1693,7 @@ export class AnalyticsController {
safeTimezone,
groupFromUTC,
groupToUTC,
- timeBucket,
+ newTimeBucket,
)
return result
diff --git a/backend/apps/cloud/src/analytics/dto/get-error.dto.ts b/backend/apps/cloud/src/analytics/dto/get-error.dto.ts
index c0d5e892c..102475697 100644
--- a/backend/apps/cloud/src/analytics/dto/get-error.dto.ts
+++ b/backend/apps/cloud/src/analytics/dto/get-error.dto.ts
@@ -5,6 +5,7 @@ import { GetDataDto } from './getData.dto'
export class GetErrorDto extends PickType(GetDataDto, [
'pid',
'period',
+ 'timeBucket',
'from',
'to',
'timezone',
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index a3de9627c..00b70ca7c 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -1587,6 +1587,7 @@ export class AnalyticsController {
period,
from,
to,
+ timeBucket,
//
} = data
@@ -1596,7 +1597,7 @@ export class AnalyticsController {
headers['x-password'],
)
- let timeBucket
+ let newTimeBucket = timeBucket
let diff
if (period === 'all') {
@@ -1605,17 +1606,15 @@ export class AnalyticsController {
'errors',
)
- timeBucket = res.timeBucket[0]
+ newTimeBucket = res.timeBucket[0]
diff = res.diff
- } else {
- timeBucket = getLowestPossibleTimeBucket(period, from, to)
}
const safeTimezone = this.analyticsService.getSafeTimezone(timezone)
const { groupFromUTC, groupToUTC } = this.analyticsService.getGroupFromTo(
from,
to,
- timeBucket,
+ newTimeBucket,
period,
safeTimezone,
diff,
@@ -1627,7 +1626,7 @@ export class AnalyticsController {
safeTimezone,
groupFromUTC,
groupToUTC,
- timeBucket,
+ newTimeBucket,
)
return result
diff --git a/backend/apps/community/src/analytics/dto/get-error.dto.ts b/backend/apps/community/src/analytics/dto/get-error.dto.ts
index c0d5e892c..102475697 100644
--- a/backend/apps/community/src/analytics/dto/get-error.dto.ts
+++ b/backend/apps/community/src/analytics/dto/get-error.dto.ts
@@ -5,6 +5,7 @@ import { GetDataDto } from './getData.dto'
export class GetErrorDto extends PickType(GetDataDto, [
'pid',
'period',
+ 'timeBucket',
'from',
'to',
'timezone',
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index b9a701624..127bced1a 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -675,6 +675,7 @@ export const getSession = (pid: string, psid: string, timezone = '', password: s
export const getError = (
pid: string,
eid: string,
+ timeBucket = 'hour',
period = '7d',
filters: any[] = [],
from = '',
@@ -684,7 +685,9 @@ export const getError = (
) =>
api
.get(
- `log/get-error?pid=${pid}&eid=${eid}&period=${period}&filters=${JSON.stringify(filters)}&from=${from}&to=${to}&timezone=${timezone}`,
+ `log/get-error?pid=${pid}&eid=${eid}&timeBucket=${timeBucket}&period=${period}&filters=${JSON.stringify(
+ filters,
+ )}&from=${from}&to=${to}&timezone=${timezone}`,
{
headers: {
'x-password': password,
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 714966109..3afb6d2a9 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -1594,9 +1594,9 @@ const ViewProject = () => {
}
if (period === 'custom' && dateRange) {
- error = await getError(id, eid, '', filters, from, to, timezone, projectPassword)
+ error = await getError(id, eid, timeBucket, '', filters, from, to, timezone, projectPassword)
} else {
- error = await getError(id, eid, period, filters, '', '', timezone, projectPassword)
+ error = await getError(id, eid, timeBucket, period, filters, '', '', timezone, projectPassword)
}
setActiveError(error)
@@ -1614,7 +1614,7 @@ const ViewProject = () => {
}
setErrorLoading(false)
},
- [dateRange, id, period, projectPassword, timezone, filters],
+ [dateRange, id, period, timeBucket, projectPassword, timezone, filters],
)
const loadSession = async (psid: string) => {