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!

show paid users only

Blue Mousee55c4514badf
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index 33c26813d..91ee92c61 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -52,6 +52,7 @@ import { AppLoggerService } from '../logger/logger.service'
import {
redis,
REDIS_USERS_COUNT_KEY,
+ REDIS_TRIALS_COUNT_KEY,
REDIS_PROJECTS_COUNT_KEY,
REDIS_EVENTS_COUNT_KEY,
UNIQUE_SESSION_LIFE_TIME,
@@ -975,14 +976,16 @@ export class AnalyticsController {
REDIS_USERS_COUNT_KEY,
REDIS_PROJECTS_COUNT_KEY,
REDIS_EVENTS_COUNT_KEY,
+ REDIS_TRIALS_COUNT_KEY,
)
if (exists) {
const users = _toNumber(await redis.get(REDIS_USERS_COUNT_KEY))
+ const trials = _toNumber(await redis.get(REDIS_TRIALS_COUNT_KEY))
const projects = _toNumber(await redis.get(REDIS_PROJECTS_COUNT_KEY))
const events = _toNumber(await redis.get(REDIS_EVENTS_COUNT_KEY))
- return { users, projects, events }
+ return { users, trials, projects, events }
}
return this.analyticsService.getGeneralStats()
diff --git a/backend/apps/cloud/src/analytics/analytics.service.ts b/backend/apps/cloud/src/analytics/analytics.service.ts
index a27e34af5..8d9ca3c49 100644
--- a/backend/apps/cloud/src/analytics/analytics.service.ts
+++ b/backend/apps/cloud/src/analytics/analytics.service.ts
@@ -39,7 +39,7 @@ import {
} from '@nestjs/common'
import { isbot } from 'isbot'
-import { DEFAULT_TIMEZONE } from '../user/entities/user.entity'
+import { DEFAULT_TIMEZONE, PlanCode } from '../user/entities/user.entity'
import {
redis,
UNIQUE_SESSION_LIFE_TIME,
@@ -55,6 +55,7 @@ import {
REDIS_PROJECTS_COUNT_KEY,
REDIS_EVENTS_COUNT_KEY,
TRAFFIC_METAKEY_COLUMNS,
+ REDIS_TRIALS_COUNT_KEY,
} from '../common/constants'
import { clickhouse } from '../common/integrations/clickhouse'
import {
@@ -103,6 +104,7 @@ import { ProjectViewCustomEventMetaValueType } from '../project/entity/project-v
import { ProjectViewCustomEventDto } from '../project/dto/create-project-view.dto'
import { UAParser } from '@ua-parser-js/pro-business'
import { extensions } from './utils/ua-parser'
+import { In, Not } from 'typeorm'
dayjs.extend(utc)
dayjs.extend(dayjsTimezone)
@@ -4350,6 +4352,7 @@ export class AnalyticsService {
async getGeneralStats(): Promise<{
users: number
+ trials: number
projects: number
events: number
}> {
@@ -4365,7 +4368,12 @@ export class AnalyticsService {
SELECT 'errors' AS type, count(*) AS count FROM errors
`
- const users = await this.userService.count()
+ const users = await this.userService.count({
+ where: {
+ planCode: Not(In([PlanCode.free, PlanCode.trial, PlanCode.none])),
+ },
+ })
+ const trials = await this.userService.count()
const projects = await this.projectService.count()
const { data } = await clickhouse
.query({
@@ -4377,11 +4385,13 @@ export class AnalyticsService {
const events = data.reduce((total, row) => total + row.count, 0) as number
await redis.set(REDIS_USERS_COUNT_KEY, users, 'EX', 630)
+ await redis.set(REDIS_TRIALS_COUNT_KEY, trials, 'EX', 630)
await redis.set(REDIS_PROJECTS_COUNT_KEY, projects, 'EX', 630)
await redis.set(REDIS_EVENTS_COUNT_KEY, events, 'EX', 630)
return {
users,
+ trials,
projects,
events,
}
diff --git a/backend/apps/cloud/src/common/constants.ts b/backend/apps/cloud/src/common/constants.ts
index 50fab75e0..0fd0b1270 100644
--- a/backend/apps/cloud/src/common/constants.ts
+++ b/backend/apps/cloud/src/common/constants.ts
@@ -52,6 +52,7 @@ const getRedisCaptchaKey = (token: string) => `captcha_${hash(token)}`
const REDIS_SESSION_SALT_KEY = 'log_salt' // is updated every 24 hours
const REDIS_USERS_COUNT_KEY = 'stats:users_count'
+const REDIS_TRIALS_COUNT_KEY = 'stats:trials_count'
const REDIS_PROJECTS_COUNT_KEY = 'stats:projects_count'
const REDIS_EVENTS_COUNT_KEY = 'stats:events'
const REDIS_SSO_UUID = 'sso:uuid'
@@ -181,6 +182,7 @@ export {
redisProjectCountCacheTimeout,
REDIS_SESSION_SALT_KEY,
REDIS_USERS_COUNT_KEY,
+ REDIS_TRIALS_COUNT_KEY,
REDIS_PROJECTS_COUNT_KEY,
REDIS_EVENTS_COUNT_KEY,
SEND_WARNING_AT_PERC,
diff --git a/backend/apps/cloud/src/user/user.service.ts b/backend/apps/cloud/src/user/user.service.ts
index ee367ab93..06ecc23d0 100644
--- a/backend/apps/cloud/src/user/user.service.ts
+++ b/backend/apps/cloud/src/user/user.service.ts
@@ -155,7 +155,7 @@ export class UserService {
return this.usersRepository.delete(id)
}
- async count(options?: any): Promise<number> {
+ async count(options?: FindManyOptions<User>): Promise<number> {
return this.usersRepository.count(options)
}