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!

Refactor event ingest transformers & geo IP function

Blue Mouseefde3982c818
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index ea5e6b89a..515ad4f01 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -1488,27 +1488,27 @@ export class AnalyticsController {
const { name, message, lineno, colno, filename, stackTrace, meta } =
errorDTO
- const transformed = errorEventTransformer(
+ const transformed = errorEventTransformer({
psid,
profileId,
- this.analyticsService.getErrorID(errorDTO),
- errorDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- errorDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- errorDTO.lc,
- country,
- region,
- regionCode,
- city,
+ eid: this.analyticsService.getErrorID(errorDTO),
+ pid: errorDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: errorDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: errorDTO.lc,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
name,
message,
lineno,
@@ -1516,7 +1516,7 @@ export class AnalyticsController {
filename,
stackTrace,
meta,
- )
+ })
try {
await clickhouse.insert({
@@ -1642,35 +1642,35 @@ export class AnalyticsController {
enrichTrafficSource(eventsDTO)
- const transformed = customEventTransformer(
+ const transformed = customEventTransformer({
psid,
profileId,
- eventsDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- eventsDTO.ev,
- eventsDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- eventsDTO.lc,
- eventsDTO.ref,
- eventsDTO.so,
- eventsDTO.me,
- eventsDTO.ca,
- eventsDTO.te,
- eventsDTO.co,
- country,
- region,
- regionCode,
- city,
+ pid: eventsDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ ev: eventsDTO.ev,
+ pg: eventsDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: eventsDTO.lc,
+ ref: eventsDTO.ref,
+ so: eventsDTO.so,
+ me: eventsDTO.me,
+ ca: eventsDTO.ca,
+ te: eventsDTO.te,
+ co: eventsDTO.co,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- eventsDTO.meta,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: eventsDTO.meta,
+ })
try {
await clickhouse.insert({
@@ -1813,34 +1813,34 @@ export class AnalyticsController {
enrichTrafficSource(logDTO)
- const transformed = trafficTransformer(
+ const transformed = trafficTransformer({
psid,
profileId,
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- logDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- logDTO.lc,
- logDTO.ref,
- logDTO.so,
- logDTO.me,
- logDTO.ca,
- logDTO.te,
- logDTO.co,
- country,
- region,
- regionCode,
- city,
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: logDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: logDTO.lc,
+ ref: logDTO.ref,
+ so: logDTO.so,
+ me: logDTO.me,
+ ca: logDTO.ca,
+ te: logDTO.te,
+ co: logDTO.co,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- logDTO.meta,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: logDTO.meta,
+ })
let perfTransformed = null
@@ -1856,21 +1856,21 @@ export class AnalyticsController {
ttfb,
} = logDTO.perf
- perfTransformed = performanceTransformer(
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- logDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- country,
- region,
- regionCode,
- city,
+ perfTransformed = performanceTransformer({
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: logDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
dns,
tls,
conn,
@@ -1879,7 +1879,7 @@ export class AnalyticsController {
domLoad,
pageLoad,
ttfb,
- )
+ })
}
try {
@@ -1979,34 +1979,34 @@ export class AnalyticsController {
const { deviceType, browserName, browserVersion, osName, osVersion } =
await this.analyticsService.getRequestInformation(headers)
- const transformed = trafficTransformer(
+ const transformed = trafficTransformer({
psid,
profileId,
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- null,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- country,
- region,
- regionCode,
- city,
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: null,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: null,
+ ref: null,
+ so: null,
+ me: null,
+ ca: null,
+ te: null,
+ co: null,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- null,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: null,
+ })
try {
await clickhouse.insert({
diff --git a/backend/apps/cloud/src/analytics/utils/transformers.ts b/backend/apps/cloud/src/analytics/utils/transformers.ts
index 1bcdf93c1..b420cdac8 100644
--- a/backend/apps/cloud/src/analytics/utils/transformers.ts
+++ b/backend/apps/cloud/src/analytics/utils/transformers.ts
@@ -23,34 +23,63 @@ const processMetaKV = (
}
}
-export const trafficTransformer = (
- psid: string,
- profileId: string,
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- ref: string | null,
- so: string | null,
- me: string | null,
- ca: string | null,
- te: string | null,
- co: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- meta: Record<string, string> | null,
-) => {
+interface TrafficTransformerOptions {
+ psid: string
+ profileId: string
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ ref?: string | null
+ so?: string | null
+ me?: string | null
+ ca?: string | null
+ te?: string | null
+ co?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const trafficTransformer = ({
+ psid,
+ profileId,
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ ref,
+ so,
+ me,
+ ca,
+ te,
+ co,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ meta,
+}: TrafficTransformerOptions) => {
return {
psid,
profileId,
@@ -82,35 +111,65 @@ export const trafficTransformer = (
}
}
-export const customEventTransformer = (
- psid: string,
- profileId: string,
- pid: string,
- host: string | null,
- ev: string,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- ref: string | null,
- so: string | null,
- me: string | null,
- ca: string | null,
- te: string | null,
- co: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- meta: Record<string, string> | null,
-) => {
+interface CustomEventTransformerOptions {
+ psid: string
+ profileId: string
+ pid: string
+ host?: string | null
+ ev: string
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ ref?: string | null
+ so?: string | null
+ me?: string | null
+ ca?: string | null
+ te?: string | null
+ co?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const customEventTransformer = ({
+ psid,
+ profileId,
+ pid,
+ host,
+ ev,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ ref,
+ so,
+ me,
+ ca,
+ te,
+ co,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ meta,
+}: CustomEventTransformerOptions) => {
return {
psid,
profileId,
@@ -143,35 +202,65 @@ export const customEventTransformer = (
}
}
-export const errorEventTransformer = (
- psid: string,
- profileId: string,
- eid: string,
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- name: string | null,
- message: string | null,
- lineno: number | null,
- colno: number | null,
- filename: string | null,
- stackTrace: string | null,
- meta: Record<string, string> | null,
-) => {
+interface ErrorEventTransformerOptions {
+ psid: string
+ profileId: string
+ eid: string
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ name?: string | null
+ message?: string | null
+ lineno?: number | null
+ colno?: number | null
+ filename?: string | null
+ stackTrace?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const errorEventTransformer = ({
+ psid,
+ profileId,
+ eid,
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ name,
+ message,
+ lineno,
+ colno,
+ filename,
+ stackTrace,
+ meta,
+}: ErrorEventTransformerOptions) => {
return {
psid,
profileId,
@@ -204,30 +293,55 @@ export const errorEventTransformer = (
}
}
-export const performanceTransformer = (
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- dns: number,
- tls: number,
- conn: number,
- response: number,
- render: number,
- domLoad: number,
- pageLoad: number,
- ttfb: number,
-) => {
+interface PerformanceTransformerOptions {
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ dns: number
+ tls: number
+ conn: number
+ response: number
+ render: number
+ domLoad: number
+ pageLoad: number
+ ttfb: number
+}
+
+export const performanceTransformer = ({
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ dns,
+ tls,
+ conn,
+ response,
+ render,
+ domLoad,
+ pageLoad,
+ ttfb,
+}: PerformanceTransformerOptions) => {
return {
pid,
host: host || null,
diff --git a/backend/apps/cloud/src/common/utils.ts b/backend/apps/cloud/src/common/utils.ts
index c155558d8..a896ee980 100644
--- a/backend/apps/cloud/src/common/utils.ts
+++ b/backend/apps/cloud/src/common/utils.ts
@@ -290,10 +290,10 @@ export const getIPDetails = (ip: string, tz?: string): IPDetails => {
const region = data?.subdivisions?.[0]?.names?.en || null
const regionCode = data?.subdivisions?.[0]?.iso_code || null
- const isp = data?.traits?.isp || null
- const organization = data?.traits?.organization || null
- const userType = data?.traits?.user_type || null
- const connectionType = data?.traits?.connection_type || null
+ const isp = traits.isp || null
+ const organization = traits.organization || null
+ const userType = traits.user_type || null
+ const connectionType = traits.connection_type || null
if (country) {
return {
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index 077127e9a..43d1e0ab4 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -1145,35 +1145,35 @@ export class AnalyticsController {
enrichTrafficSource(eventsDTO)
- const transformed = customEventTransformer(
+ const transformed = customEventTransformer({
psid,
profileId,
- eventsDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- eventsDTO.ev,
- eventsDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- eventsDTO.lc,
- eventsDTO.ref,
- eventsDTO.so,
- eventsDTO.me,
- eventsDTO.ca,
- eventsDTO.te,
- eventsDTO.co,
- country,
- region,
- regionCode,
- city,
+ pid: eventsDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ ev: eventsDTO.ev,
+ pg: eventsDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: eventsDTO.lc,
+ ref: eventsDTO.ref,
+ so: eventsDTO.so,
+ me: eventsDTO.me,
+ ca: eventsDTO.ca,
+ te: eventsDTO.te,
+ co: eventsDTO.co,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- eventsDTO.meta,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: eventsDTO.meta,
+ })
try {
await clickhouse.insert({
@@ -1315,34 +1315,34 @@ export class AnalyticsController {
enrichTrafficSource(logDTO)
- const transformed = trafficTransformer(
+ const transformed = trafficTransformer({
psid,
profileId,
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- logDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- logDTO.lc,
- logDTO.ref,
- logDTO.so,
- logDTO.me,
- logDTO.ca,
- logDTO.te,
- logDTO.co,
- country,
- region,
- regionCode,
- city,
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: logDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: logDTO.lc,
+ ref: logDTO.ref,
+ so: logDTO.so,
+ me: logDTO.me,
+ ca: logDTO.ca,
+ te: logDTO.te,
+ co: logDTO.co,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- logDTO.meta,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: logDTO.meta,
+ })
let perfTransformed = null
@@ -1358,21 +1358,21 @@ export class AnalyticsController {
ttfb,
} = logDTO.perf
- perfTransformed = performanceTransformer(
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- logDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- country,
- region,
- regionCode,
- city,
+ perfTransformed = performanceTransformer({
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: logDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
dns,
tls,
conn,
@@ -1381,7 +1381,7 @@ export class AnalyticsController {
domLoad,
pageLoad,
ttfb,
- )
+ })
}
try {
@@ -1483,34 +1483,34 @@ export class AnalyticsController {
const { deviceType, browserName, browserVersion, osName, osVersion } =
await this.analyticsService.getRequestInformation(headers)
- const transformed = trafficTransformer(
+ const transformed = trafficTransformer({
psid,
profileId,
- logDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- null,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- country,
- region,
- regionCode,
- city,
+ pid: logDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: null,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: null,
+ ref: null,
+ so: null,
+ me: null,
+ ca: null,
+ te: null,
+ co: null,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
- null,
- )
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
+ meta: null,
+ })
try {
await clickhouse.insert({
@@ -1863,27 +1863,27 @@ export class AnalyticsController {
const { name, message, lineno, colno, filename, stackTrace, meta } =
errorDTO
- const transformed = errorEventTransformer(
+ const transformed = errorEventTransformer({
psid,
profileId,
- this.analyticsService.getErrorID(errorDTO),
- errorDTO.pid,
- this.analyticsService.getHostFromOrigin(headers.origin),
- errorDTO.pg,
- deviceType,
- browserName,
- browserVersion,
- osName,
- osVersion,
- errorDTO.lc,
- country,
- region,
- regionCode,
- city,
+ eid: this.analyticsService.getErrorID(errorDTO),
+ pid: errorDTO.pid,
+ host: this.analyticsService.getHostFromOrigin(headers.origin),
+ pg: errorDTO.pg,
+ dv: deviceType,
+ br: browserName,
+ brv: browserVersion,
+ os: osName,
+ osv: osVersion,
+ lc: errorDTO.lc,
+ cc: country,
+ rg: region,
+ rgc: regionCode,
+ ct: city,
isp,
- organization,
- userType,
- connectionType,
+ og: organization,
+ ut: userType,
+ ctp: connectionType,
name,
message,
lineno,
@@ -1891,7 +1891,7 @@ export class AnalyticsController {
filename,
stackTrace,
meta,
- )
+ })
try {
await clickhouse.insert({
diff --git a/backend/apps/community/src/analytics/utils/transformers.ts b/backend/apps/community/src/analytics/utils/transformers.ts
index 1bcdf93c1..b420cdac8 100644
--- a/backend/apps/community/src/analytics/utils/transformers.ts
+++ b/backend/apps/community/src/analytics/utils/transformers.ts
@@ -23,34 +23,63 @@ const processMetaKV = (
}
}
-export const trafficTransformer = (
- psid: string,
- profileId: string,
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- ref: string | null,
- so: string | null,
- me: string | null,
- ca: string | null,
- te: string | null,
- co: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- meta: Record<string, string> | null,
-) => {
+interface TrafficTransformerOptions {
+ psid: string
+ profileId: string
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ ref?: string | null
+ so?: string | null
+ me?: string | null
+ ca?: string | null
+ te?: string | null
+ co?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const trafficTransformer = ({
+ psid,
+ profileId,
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ ref,
+ so,
+ me,
+ ca,
+ te,
+ co,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ meta,
+}: TrafficTransformerOptions) => {
return {
psid,
profileId,
@@ -82,35 +111,65 @@ export const trafficTransformer = (
}
}
-export const customEventTransformer = (
- psid: string,
- profileId: string,
- pid: string,
- host: string | null,
- ev: string,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- ref: string | null,
- so: string | null,
- me: string | null,
- ca: string | null,
- te: string | null,
- co: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- meta: Record<string, string> | null,
-) => {
+interface CustomEventTransformerOptions {
+ psid: string
+ profileId: string
+ pid: string
+ host?: string | null
+ ev: string
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ ref?: string | null
+ so?: string | null
+ me?: string | null
+ ca?: string | null
+ te?: string | null
+ co?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const customEventTransformer = ({
+ psid,
+ profileId,
+ pid,
+ host,
+ ev,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ ref,
+ so,
+ me,
+ ca,
+ te,
+ co,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ meta,
+}: CustomEventTransformerOptions) => {
return {
psid,
profileId,
@@ -143,35 +202,65 @@ export const customEventTransformer = (
}
}
-export const errorEventTransformer = (
- psid: string,
- profileId: string,
- eid: string,
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- os: string | null,
- osv: string | null,
- lc: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- name: string | null,
- message: string | null,
- lineno: number | null,
- colno: number | null,
- filename: string | null,
- stackTrace: string | null,
- meta: Record<string, string> | null,
-) => {
+interface ErrorEventTransformerOptions {
+ psid: string
+ profileId: string
+ eid: string
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ os?: string | null
+ osv?: string | null
+ lc?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ name?: string | null
+ message?: string | null
+ lineno?: number | null
+ colno?: number | null
+ filename?: string | null
+ stackTrace?: string | null
+ meta?: Record<string, string> | null
+}
+
+export const errorEventTransformer = ({
+ psid,
+ profileId,
+ eid,
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ os,
+ osv,
+ lc,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ name,
+ message,
+ lineno,
+ colno,
+ filename,
+ stackTrace,
+ meta,
+}: ErrorEventTransformerOptions) => {
return {
psid,
profileId,
@@ -204,30 +293,55 @@ export const errorEventTransformer = (
}
}
-export const performanceTransformer = (
- pid: string,
- host: string | null,
- pg: string | null,
- dv: string | null,
- br: string | null,
- brv: string | null,
- cc: string | null,
- rg: string | null,
- rgc: string | null,
- ct: string | null,
- isp: string | null,
- og: string | null,
- ut: string | null,
- ctp: string | null,
- dns: number,
- tls: number,
- conn: number,
- response: number,
- render: number,
- domLoad: number,
- pageLoad: number,
- ttfb: number,
-) => {
+interface PerformanceTransformerOptions {
+ pid: string
+ host?: string | null
+ pg?: string | null
+ dv?: string | null
+ br?: string | null
+ brv?: string | null
+ cc?: string | null
+ rg?: string | null
+ rgc?: string | null
+ ct?: string | null
+ isp?: string | null
+ og?: string | null
+ ut?: string | null
+ ctp?: string | null
+ dns: number
+ tls: number
+ conn: number
+ response: number
+ render: number
+ domLoad: number
+ pageLoad: number
+ ttfb: number
+}
+
+export const performanceTransformer = ({
+ pid,
+ host,
+ pg,
+ dv,
+ br,
+ brv,
+ cc,
+ rg,
+ rgc,
+ ct,
+ isp,
+ og,
+ ut,
+ ctp,
+ dns,
+ tls,
+ conn,
+ response,
+ render,
+ domLoad,
+ pageLoad,
+ ttfb,
+}: PerformanceTransformerOptions) => {
return {
pid,
host: host || null,
diff --git a/backend/apps/community/src/common/utils.ts b/backend/apps/community/src/common/utils.ts
index 3689ee731..61a1d6c10 100644
--- a/backend/apps/community/src/common/utils.ts
+++ b/backend/apps/community/src/common/utils.ts
@@ -1155,10 +1155,10 @@ const getIPDetails = (ip: string, tz?: string): IPDetails => {
const region = data?.subdivisions?.[0]?.names?.en || null
const regionCode = data?.subdivisions?.[0]?.iso_code || null
- const isp = data?.traits?.isp || null
- const organization = data?.traits?.organization || null
- const userType = data?.traits?.user_type || null
- const connectionType = data?.traits?.connection_type || null
+ const isp = traits.isp || null
+ const organization = traits.organization || null
+ const userType = traits.user_type || null
+ const connectionType = traits.connection_type || null
if (country) {
return {
diff --git a/docs/content/docs/api/stats.mdx b/docs/content/docs/api/stats.mdx
index 605761b21..92a7e70b3 100644
--- a/docs/content/docs/api/stats.mdx
+++ b/docs/content/docs/api/stats.mdx
@@ -1547,7 +1547,11 @@ curl 'https://api.swetrix.com/log?pid=YOUR_PROJECT_ID&timeBucket=day&period=7d&f
"me": [],
"ca": [],
"te": [],
- "co": []
+ "co": [],
+ "isp": [],
+ "og": [],
+ "ut": [],
+ "ctp": []
},
"chart": {
"x": [