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!

selfhosted support

Blue Mouse8d3a7bf89c81
diff --git a/backend/apps/selfhosted/src/analytics/analytics.service.ts b/backend/apps/selfhosted/src/analytics/analytics.service.ts
index c0249b35d..69bacc0a8 100644
--- a/backend/apps/selfhosted/src/analytics/analytics.service.ts
+++ b/backend/apps/selfhosted/src/analytics/analytics.service.ts
@@ -2377,37 +2377,6 @@ export class AnalyticsService {
): Promise<object | void> {
const { x, format } = this.generateUTCXAxis(timeBucket, from, to)
- // if (false) {
- // const query = this.generateCustomEventsAggregationQuery(
- // timeBucket,
- // filtersQuery,
- // safeTimezone,
- // ChartRenderMode.PERIODICAL,
- // )
-
- // const { data } = await clickhouse
- // .query({
- // query,
- // query_params: paramsData.params,
- // })
- // .then(resultSet => resultSet.json<TrafficCEFilterCHResponse>())
-
- // const uniques =
- // this.extractCustomEventsChartData(result, xShifted)?._unknown_event ||
- // []
-
- // const sdur = Array(_size(xShifted)).fill(0)
-
- // return Promise.resolve({
- // chart: {
- // x: xShifted,
- // visits: uniques,
- // uniques,
- // sdur,
- // },
- // })
- // }
-
const query = this.generateSessionAggregationQuery(timeBucket, filtersQuery)
const { data } = await clickhouse
@@ -2976,35 +2945,70 @@ export class AnalyticsService {
return parsed
}
+ processPageflow(pages: IPageflow[]) {
+ if (_isEmpty(pages)) {
+ return []
+ }
+
+ return _map(pages, (page: IPageflow) => {
+ if (!page.metadata) {
+ return page
+ }
+
+ return {
+ ...page,
+ metadata: _map(page.metadata, ([key, value]: [string, string]) => ({
+ key,
+ value,
+ })),
+ }
+ })
+ }
+
async getSessionDetails(
pid: string,
psid: string,
safeTimezone: string,
): Promise<any> {
const queryPages = `
- SELECT
- *
- FROM (
+ WITH events_with_meta AS (
SELECT
- 'pageview' AS type,
- pg AS value,
- toTimeZone(analytics.created, '${safeTimezone}') AS created
+ 'pageview' AS type,
+ pg AS value,
+ toTimeZone(analytics.created, '${safeTimezone}') AS created,
+ pid,
+ psid,
+ groupArray(tuple(meta.key, meta.value)) AS metadata
FROM analytics
+ ARRAY JOIN meta.key, meta.value
WHERE
- pid = {pid:FixedString(12)}
- AND psid = {psid:String}
+ pid = {pid:FixedString(12)}
+ AND psid = {psid:String}
+ GROUP BY type, value, created, pid, psid
UNION ALL
SELECT
- 'event' AS type,
- ev AS value,
- toTimeZone(customEV.created, '${safeTimezone}') AS created
+ 'event' AS type,
+ ev AS value,
+ toTimeZone(customEV.created, '${safeTimezone}') AS created,
+ pid,
+ psid,
+ groupArray(tuple(meta.key, meta.value)) AS metadata
FROM customEV
+ ARRAY JOIN meta.key, meta.value
WHERE
- pid = {pid:FixedString(12)}
- AND psid = {psid:String}
+ pid = {pid:FixedString(12)}
+ AND psid = {psid:String}
+ GROUP BY type, value, created, pid, psid
)
+
+ SELECT
+ type,
+ value,
+ created,
+ metadata
+ FROM events_with_meta
ORDER BY created ASC;
`
@@ -3106,7 +3110,13 @@ export class AnalyticsService {
chartData = groupedChart.chart
}
- return { pages, details, psid, chart: chartData, timeBucket }
+ return {
+ pages: this.processPageflow(pages),
+ details,
+ psid,
+ chart: chartData,
+ timeBucket,
+ }
}
async getSessionsList(
diff --git a/backend/apps/selfhosted/src/analytics/interfaces/index.ts b/backend/apps/selfhosted/src/analytics/interfaces/index.ts
index 971910973..d461f813c 100644
--- a/backend/apps/selfhosted/src/analytics/interfaces/index.ts
+++ b/backend/apps/selfhosted/src/analytics/interfaces/index.ts
@@ -175,6 +175,7 @@ export interface IPageflow {
type: 'pageview' | 'event'
value: string
created: string
+ metadata?: [string, string][]
}
export interface IPageProperty {