📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Track data imports
Blue Moused65a3866ff0d
diff --git a/backend/apps/cloud/src/data-import/data-import.controller.ts b/backend/apps/cloud/src/data-import/data-import.controller.tsindex 5edb0ff75..b8b812ff5 100644--- a/backend/apps/cloud/src/data-import/data-import.controller.ts+++ b/backend/apps/cloud/src/data-import/data-import.controller.ts@@ -18,6 +18,7 @@ import {Query,Logger,Headers,+ Ip,} from '@nestjs/common'import { FileInterceptor } from '@nestjs/platform-express'import { diskStorage } from 'multer'@@ -33,6 +34,8 @@ import { DataImportService } from './data-import.service'import { UploadImportDto } from './dto'import { getMapper, SUPPORTED_PROVIDERS } from './mappers'import { DataImportJobData, DATA_IMPORT_QUEUE } from './data-import.processor'+import { trackCustom } from '../common/analytics'+import { getIPFromHeaders } from '../common/utils'const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100 MBconst IMPORT_TMP_DIR = path.resolve(os.tmpdir(), 'swetrix-imports')@@ -83,6 +86,8 @@ export class DataImportController {@CurrentUserId() uid: string,@UploadedFile() file: Express.Multer.File,@Body() dto: UploadImportDto,+ @Headers() headers: Record<string, string>,+ @Ip() requestIp: string,) {const project = await this.projectService.getFullProject(projectId)this.projectService.allowedToManage(project, uid)@@ -107,6 +112,9 @@ export class DataImportController {)}+ const ip = getIPFromHeaders(headers) || requestIp || ''+ const userAgent = headers['user-agent'] || ''+let dataImporttry {dataImport = await this.dataImportService.create(projectId, dto.provider)@@ -124,6 +132,8 @@ export class DataImportController {projectId,provider: dto.provider,fileName: file.filename,+ ip,+ userAgent,},{attempts: 1,@@ -140,6 +150,11 @@ export class DataImportController {)}+ await trackCustom(ip, userAgent, {+ ev: 'DATA_IMPORT_STARTED',+ meta: { provider: dto.provider },+ })+return dataImport}diff --git a/backend/apps/cloud/src/data-import/data-import.processor.ts b/backend/apps/cloud/src/data-import/data-import.processor.tsindex bb68b50fb..783f67973 100644--- a/backend/apps/cloud/src/data-import/data-import.processor.ts+++ b/backend/apps/cloud/src/data-import/data-import.processor.ts@@ -10,6 +10,7 @@ import { DataImportStatus } from './entity/data-import.entity'import { getMapper } from './mappers'import { ImportError } from './mappers/mapper.interface'import { clickhouse } from '../common/integrations/clickhouse'+import { trackCustom } from '../common/analytics'const CLICKHOUSE_DB = process.env.CLICKHOUSE_DATABASE || 'analytics'const BATCH_SIZE = 5000@@ -23,6 +24,8 @@ export interface DataImportJobData {projectId: stringprovider: stringfileName: string+ ip: string+ userAgent: string}@Processor(DATA_IMPORT_QUEUE, { concurrency: 1 })@@ -34,7 +37,8 @@ export class DataImportProcessor extends WorkerHost {}async process(job: Job<DataImportJobData>): Promise<void> {- const { id, importId, projectId, provider, fileName } = job.data+ const { id, importId, projectId, provider, fileName, ip, userAgent } =+ job.dataconst filePath = this.getImportFilePath(fileName)try {@@ -160,6 +164,11 @@ export class DataImportProcessor extends WorkerHost {})this.logger.log(`Import ${id} completed: ${importedRows} rows imported`)++ await trackCustom(ip, userAgent, {+ ev: 'DATA_IMPORT_FINISHED',+ meta: { provider, status: 'success', rows: importedRows },+ })} catch (error) {this.logger.error(`Import ${id} failed: ${error.message}`, error.stack)@@ -177,6 +186,11 @@ export class DataImportProcessor extends WorkerHost {: 'An unexpected error occurred while processing the import. Please try again or contact support.'await this.dataImportService.markFailed(id, userMessage)++ await trackCustom(ip, userAgent, {+ ev: 'DATA_IMPORT_FINISHED',+ meta: { provider, status: 'error', rows: importedRows },+ })}} finally {this.cleanupFile(fileName)