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!

accurate session updates

Blue Mouse83f508e8bb8a
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index 65a81b08e..a55aba40d 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -1257,6 +1257,31 @@ export class AnalyticsService {
const now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')
try {
+ // Read current session data to preserve pageviews/events counts
+ // TODO: Potentially slow because every write request reads from the database - consider caching or other optimisation
+ const query = `
+ SELECT firstSeen, pageviews, events
+ FROM sessions FINAL
+ WHERE psid = {psid:UInt64}
+ AND pid = {pid:FixedString(12)}
+ LIMIT 1
+ `
+
+ const { data } = await clickhouse
+ .query({
+ query,
+ query_params: { psid, pid },
+ })
+ .then(resultSet =>
+ resultSet.json<{
+ firstSeen: string
+ pageviews: number
+ events: number
+ }>(),
+ )
+
+ const existingSession = data[0]
+
await clickhouse.insert({
table: 'sessions',
format: 'JSONEachRow',
@@ -1265,10 +1290,10 @@ export class AnalyticsService {
psid,
pid,
profileId,
- firstSeen: now,
+ firstSeen: existingSession?.firstSeen ?? now,
lastSeen: now,
- pageviews: 0,
- events: 0,
+ pageviews: existingSession?.pageviews ?? 0,
+ events: existingSession?.events ?? 0,
},
],
clickhouse_settings: { async_insert: 1 },
diff --git a/backend/apps/community/src/analytics/analytics.service.ts b/backend/apps/community/src/analytics/analytics.service.ts
index d74baa1cf..94e4b7928 100644
--- a/backend/apps/community/src/analytics/analytics.service.ts
+++ b/backend/apps/community/src/analytics/analytics.service.ts
@@ -1270,6 +1270,31 @@ export class AnalyticsService {
const now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')
try {
+ // Read current session data to preserve pageviews/events counts
+ // TODO: Potentially slow because every write request reads from the database - consider caching or other optimisation
+ const query = `
+ SELECT firstSeen, pageviews, events
+ FROM sessions FINAL
+ WHERE psid = {psid:UInt64}
+ AND pid = {pid:FixedString(12)}
+ LIMIT 1
+ `
+
+ const { data } = await clickhouse
+ .query({
+ query,
+ query_params: { psid, pid },
+ })
+ .then(resultSet =>
+ resultSet.json<{
+ firstSeen: string
+ pageviews: number
+ events: number
+ }>(),
+ )
+
+ const existingSession = data[0]
+
await clickhouse.insert({
table: 'sessions',
format: 'JSONEachRow',
@@ -1278,10 +1303,10 @@ export class AnalyticsService {
psid,
pid,
profileId,
- firstSeen: now,
+ firstSeen: existingSession?.firstSeen ?? now,
lastSeen: now,
- pageviews: 0,
- events: 0,
+ pageviews: existingSession?.pageviews ?? 0,
+ events: existingSession?.events ?? 0,
},
],
clickhouse_settings: { async_insert: 1 },