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!

fix: avoid ClickHouse psid cast errors and Paddle adjustment sync failures

Blue Mouse6118eed92a1a
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index 88def9264..51f238bd8 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -1444,22 +1444,29 @@ export class AnalyticsController {
.subtract(ONLINE_VISITORS_WINDOW_MINUTES, 'minute')
.format('YYYY-MM-DD HH:mm:ss')
- // Query ClickHouse for active sessions in the last 5 minutes
const query = `
- SELECT DISTINCT ON (psid)
- any(dv) AS dv,
- any(br) AS br,
- any(os) AS os,
- any(cc) AS cc,
- toString(ifNull(psid, 0)) AS psid
- FROM events
- WHERE
- pid = {pid:FixedString(12)}
- AND type IN ('pageview', 'custom_event')
- AND created >= {since:DateTime}
- AND psid IS NOT NULL
- AND psid != 0
- GROUP BY psid
+ SELECT
+ dv,
+ br,
+ os,
+ cc,
+ psidCasted AS psid
+ FROM (
+ SELECT
+ any(dv) AS dv,
+ any(br) AS br,
+ any(os) AS os,
+ any(cc) AS cc,
+ toString(psid) AS psidCasted
+ FROM events
+ WHERE
+ pid = {pid:FixedString(12)}
+ AND type IN ('pageview', 'custom_event')
+ AND created >= {since:DateTime}
+ AND psid IS NOT NULL
+ AND psid != 0
+ GROUP BY psid
+ )
`
const { data } = await clickhouse
diff --git a/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts b/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
index 6dbd95678..10890906d 100644
--- a/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
+++ b/backend/apps/cloud/src/revenue/adapters/paddle.adapter.ts
@@ -275,6 +275,14 @@ export class PaddleAdapter {
if (!response.ok) {
const errorText = await response.text()
+ if (this.isAdjustmentReadForbidden(response.status, errorText)) {
+ this.logger.warn(
+ { status: response.status, error: errorText },
+ 'Skipping Paddle adjustments sync because the API key cannot read adjustments',
+ )
+ return adjustments
+ }
+
this.logger.error(
{ status: response.status, error: errorText },
'Paddle API error fetching adjustments',
@@ -298,6 +306,15 @@ export class PaddleAdapter {
return adjustments
}
+ private isAdjustmentReadForbidden(
+ status: number,
+ errorText: string,
+ ): boolean {
+ return (
+ status === 403 && errorText.includes('not authorized to read adjustment')
+ )
+ }
+
private formatPaddleDate(date: Date): string {
return date.toISOString().split('.')[0] + 'Z'
}
diff --git a/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts b/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
index ddb299862..93cb9cfc7 100644
--- a/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
+++ b/backend/apps/cloud/src/revenue/interfaces/revenue.interface.ts
@@ -36,6 +36,7 @@ export interface RevenueTransaction {
}
export const PADDLE_REQUIRED_PERMISSIONS = [
+ 'adjustment.read',
'transaction.read',
'subscription.read',
'customer.read',
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index 1bccd9783..bd9e631c1 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -1087,21 +1087,29 @@ export class AnalyticsController {
.subtract(ONLINE_VISITORS_WINDOW_MINUTES, 'minute')
.format('YYYY-MM-DD HH:mm:ss')
- // Query ClickHouse for active sessions in the last 5 minutes
const query = `
- SELECT DISTINCT ON (psid)
- any(dv) AS dv,
- any(br) AS br,
- any(os) AS os,
- any(cc) AS cc,
- toString(psid) AS psid
- FROM events
- WHERE
- pid = {pid:FixedString(12)}
- AND type IN ('pageview', 'custom_event')
- AND created >= {since:DateTime}
- AND psid IS NOT NULL
- GROUP BY psid
+ SELECT
+ dv,
+ br,
+ os,
+ cc,
+ psidCasted AS psid
+ FROM (
+ SELECT
+ any(dv) AS dv,
+ any(br) AS br,
+ any(os) AS os,
+ any(cc) AS cc,
+ toString(psid) AS psidCasted
+ FROM events
+ WHERE
+ pid = {pid:FixedString(12)}
+ AND type IN ('pageview', 'custom_event')
+ AND created >= {since:DateTime}
+ AND psid IS NOT NULL
+ AND psid != 0
+ GROUP BY psid
+ )
`
const { data } = await clickhouse