Add logging on currentWorkspaceMember query (#6706)
We are experiencing slow GetCurrentUser endpoint, this is helping us troubleshoot
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
|
||||
|
||||
import { DataSource, DataSourceOptions } from 'typeorm';
|
||||
import { config } from 'dotenv';
|
||||
import { DataSource, DataSourceOptions } from 'typeorm';
|
||||
config();
|
||||
|
||||
export const typeORMCoreModuleOptions: TypeOrmModuleOptions = {
|
||||
|
||||
@ -40,18 +40,24 @@ export class UserService extends TypeOrmQueryService<User> {
|
||||
return null;
|
||||
}
|
||||
|
||||
console.time('loadWorkspaceMember repo');
|
||||
const workspaceMemberRepository =
|
||||
await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
|
||||
user.defaultWorkspaceId,
|
||||
'workspaceMember',
|
||||
);
|
||||
|
||||
console.timeEnd('loadWorkspaceMember repo');
|
||||
|
||||
console.time('loadWorkspaceMember find');
|
||||
const workspaceMember = await workspaceMemberRepository.findOne({
|
||||
where: {
|
||||
userId: user.id,
|
||||
},
|
||||
});
|
||||
|
||||
console.timeEnd('loadWorkspaceMember find');
|
||||
|
||||
return workspaceMember;
|
||||
}
|
||||
|
||||
@ -60,13 +66,22 @@ export class UserService extends TypeOrmQueryService<User> {
|
||||
return [];
|
||||
}
|
||||
|
||||
console.time('loadWorkspaceMembers repo');
|
||||
const workspaceMemberRepository =
|
||||
await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
|
||||
workspace.id,
|
||||
'workspaceMember',
|
||||
);
|
||||
|
||||
return workspaceMemberRepository.find();
|
||||
console.timeEnd('loadWorkspaceMembers repo');
|
||||
|
||||
console.time('loadWorkspaceMembers find');
|
||||
|
||||
const workspaceMembers = workspaceMemberRepository.find();
|
||||
|
||||
console.timeEnd('loadWorkspaceMembers find');
|
||||
|
||||
return workspaceMembers;
|
||||
}
|
||||
|
||||
async deleteUser(userId: string): Promise<User> {
|
||||
|
||||
@ -98,6 +98,7 @@ export class UserResolver {
|
||||
nullable: true,
|
||||
})
|
||||
async workspaceMember(@Parent() user: User): Promise<WorkspaceMember | null> {
|
||||
console.time('resolver workspaceMember');
|
||||
const workspaceMember = await this.userService.loadWorkspaceMember(user);
|
||||
|
||||
if (workspaceMember && workspaceMember.avatarUrl) {
|
||||
@ -108,6 +109,7 @@ export class UserResolver {
|
||||
|
||||
workspaceMember.avatarUrl = `${workspaceMember.avatarUrl}?token=${avatarUrlToken}`;
|
||||
}
|
||||
console.timeEnd('resolver workspaceMember');
|
||||
|
||||
// TODO: Fix typing disrepency between Entity and DTO
|
||||
return workspaceMember as WorkspaceMember | null;
|
||||
@ -117,6 +119,7 @@ export class UserResolver {
|
||||
nullable: true,
|
||||
})
|
||||
async workspaceMembers(@Parent() user: User): Promise<WorkspaceMember[]> {
|
||||
console.time('resolver workspaceMembers');
|
||||
const workspaceMembers = await this.userService.loadWorkspaceMembers(
|
||||
user.defaultWorkspace,
|
||||
);
|
||||
@ -132,6 +135,8 @@ export class UserResolver {
|
||||
}
|
||||
}
|
||||
|
||||
console.timeEnd('resolver workspaceMembers');
|
||||
|
||||
// TODO: Fix typing disrepency between Entity and DTO
|
||||
return workspaceMembers as WorkspaceMember[];
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@ export class WorkspaceEntityManager extends EntityManager {
|
||||
target: EntityTarget<Entity>,
|
||||
): WorkspaceRepository<Entity> {
|
||||
// find already created repository instance and return it if found
|
||||
|
||||
const repoFromMap = this.repositories.get(target);
|
||||
|
||||
if (repoFromMap) {
|
||||
|
||||
@ -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;
|
||||
},
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { Injectable, Type } from '@nestjs/common';
|
||||
|
||||
import { ObjectLiteral } from 'typeorm';
|
||||
import { v4 } from 'uuid';
|
||||
|
||||
import { WorkspaceDatasourceFactory } from 'src/engine/twenty-orm/factories/workspace-datasource.factory';
|
||||
import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
|
||||
@ -36,12 +37,19 @@ export class TwentyORMGlobalManager {
|
||||
);
|
||||
}
|
||||
|
||||
const logId = v4();
|
||||
|
||||
console.time(`createDataSource in orm ${logId}`);
|
||||
const workspaceDataSource = await this.workspaceDataSourceFactory.create(
|
||||
workspaceId,
|
||||
null,
|
||||
);
|
||||
|
||||
return workspaceDataSource.getRepository<T>(objectMetadataName);
|
||||
console.timeEnd(`createDataSource in orm ${logId}`);
|
||||
|
||||
const repository = workspaceDataSource.getRepository<T>(objectMetadataName);
|
||||
|
||||
return repository;
|
||||
}
|
||||
|
||||
async getDataSourceForWorkspace(workspaceId: string) {
|
||||
|
||||
Reference in New Issue
Block a user