admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add logging on currentWorkspaceMember query (#6706)

Browse Source 
We are experiencing slow GetCurrentUser endpoint, this is helping us
troubleshoot
This commit is contained in:
Charles Bochet
2024-08-21 11:48:20 +02:00
committed by GitHub
parent 6caa78008f
commit 614a81860f
6 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts
View File

@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { EntitySchema, Repository } from 'typeorm';
import { v4 } from 'uuid';
import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
@ -28,11 +29,19 @@ export class WorkspaceDatasourceFactory {
workspaceId: string,
workspaceMetadataVersion: string | null,
): Promise<WorkspaceDataSource> {
const desiredWorkspaceMetadataVersion =
workspaceMetadataVersion ??
(await this.workspaceMetadataVersionService.getMetadataVersion(
const logId = v4();
console.time(`fetch in datasource factory ${logId}`);
const latestWorkspaceMetadataVersion =
await this.workspaceMetadataVersionService.getMetadataVersion(
workspaceId,
));
);
console.timeEnd(`fetch in datasource factory ${logId}`);
const desiredWorkspaceMetadataVersion =
workspaceMetadataVersion ?? latestWorkspaceMetadataVersion;
if (!desiredWorkspaceMetadataVersion) {
throw new Error(
@ -40,11 +49,6 @@ export class WorkspaceDatasourceFactory {
);
}
const latestWorkspaceMetadataVersion =
await this.workspaceMetadataVersionService.getMetadataVersion(
workspaceId,
);
if (latestWorkspaceMetadataVersion !== desiredWorkspaceMetadataVersion) {
throw new Error(
`Workspace metadata version mismatch detected for workspace ${workspaceId}. Current version: ${latestWorkspaceMetadataVersion}. Desired version: ${desiredWorkspaceMetadataVersion}`,
@ -80,6 +84,9 @@ export class WorkspaceDatasourceFactory {
const workspaceDataSource = await workspaceDataSourceCacheInstance.execute(
`${workspaceId}-${latestWorkspaceMetadataVersion}`,
async () => {
const logId = v4();
console.log('Creating workspace fresh data source...' + logId);
const dataSourceMetadata =
await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceId(
workspaceId,
@ -97,6 +104,7 @@ export class WorkspaceDatasourceFactory {
);
}
console.time('create entity schema' + logId);
const cachedEntitySchemaOptions =
await this.workspaceCacheStorageService.getORMEntitySchema(
workspaceId,
@ -122,7 +130,9 @@ export class WorkspaceDatasourceFactory {
cachedEntitySchemas = entitySchemas;
}
console.timeEnd('create entity schema' + logId);
console.time('create workspace data source' + logId);
const workspaceDataSource = new WorkspaceDataSource(
{
workspaceId,
@ -146,7 +156,11 @@ export class WorkspaceDatasourceFactory {
},
);
console.timeEnd('create workspace data source' + logId);
console.time('initialize workspace data source' + logId);
await workspaceDataSource.initialize();
console.timeEnd('initialize workspace data source' + logId);
return workspaceDataSource;
},