The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove timeline metadata diagnostics (#24660)
Félix Malfaite654e029cbe9
diff --git a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.tsindex 2999934fe78..d567098f00f 100644--- a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts+++ b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts@@ -93,5 +93,4 @@ export enum MetricsKeys {WorkspaceMigrationActionCount = 'workspace-migration/action-count',OrmV2ReadPathUsed = 'orm-v2/read-path-used',OrmV2WritePathUsed = 'orm-v2/write-path-used',- TimelineActivityMetadataIssue = 'timeline-activity/metadata-issue',}diff --git a/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.ts b/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.tsdeleted file mode 100644index cb2dbdf6266..00000000000--- a/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.ts+++ /dev/null@@ -1,28 +0,0 @@-import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';--describe('TimelineActivityMetadataDiagnosticsService', () => {- it('rate-limits repeated metadata diagnostics from event batches', () => {- const incrementCounterBy = jest.fn();- const service = new TimelineActivityMetadataDiagnosticsService({- incrementCounterBy,- } as never);- const now = jest.spyOn(Date, 'now').mockReturnValue(1_000_000);- const issue = {- action: 'linked',- objectUniversalIdentifier: '00000000-0000-4000-8000-000000000001',- reason: 'invalid-contract' as const,- workspaceId: '00000000-0000-4000-8000-000000000002',- };-- service.report(issue);- service.report(issue);-- expect(incrementCounterBy).toHaveBeenCalledTimes(1);-- now.mockReturnValue(1_300_000);- service.report(issue);-- expect(incrementCounterBy).toHaveBeenCalledTimes(2);- now.mockRestore();- });-});diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.tsdeleted file mode 100644index dc9370a74ca..00000000000--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.ts+++ /dev/null@@ -1,74 +0,0 @@-import { Injectable, Logger } from '@nestjs/common';--import { isDefined } from 'twenty-shared/utils';--import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';-import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';--type TimelineActivityMetadataIssue = {- workspaceId: string;- reason:- | 'ambiguous-declared-rule'- | 'ambiguous-resolver'- | 'invalid-contract'- | 'missing-type';- action: string;- objectUniversalIdentifier: string | null;-};--type TimelineActivityMetadataIssueDetails = Pick<- TimelineActivityMetadataIssue,- 'action' | 'objectUniversalIdentifier'->;--const DIAGNOSTIC_REPORT_INTERVAL_MS = 5 * 60 * 1000;--@Injectable()-export class TimelineActivityMetadataDiagnosticsService {- private readonly logger = new Logger(- TimelineActivityMetadataDiagnosticsService.name,- );- private readonly lastReportedAtByIssueKey = new Map<string, number>();-- constructor(private readonly metricsService: MetricsService) {}-- reportAll({- workspaceId,- reason,- issues,- }: Pick<TimelineActivityMetadataIssue, 'workspaceId' | 'reason'> & {- issues: TimelineActivityMetadataIssueDetails[];- }): void {- for (const issue of issues) {- this.report({ workspaceId, reason, ...issue });- }- }-- report(issue: TimelineActivityMetadataIssue): void {- const issueKey = [- issue.workspaceId,- issue.reason,- issue.action,- issue.objectUniversalIdentifier,- ].join('|');- const now = Date.now();- const lastReportedAt = this.lastReportedAtByIssueKey.get(issueKey);-- if (- isDefined(lastReportedAt) &&- now - lastReportedAt < DIAGNOSTIC_REPORT_INTERVAL_MS- ) {- return;- }-- this.lastReportedAtByIssueKey.set(issueKey, now);- this.logger.warn(- `Skipping timeline activity metadata: ${JSON.stringify(issue)}`,- );- this.metricsService.incrementCounterBy({- key: MetricsKeys.TimelineActivityMetadataIssue,- amount: 1,- attributes: { reason: issue.reason },- });- }-}diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.tsindex ab01a6bf1ee..3cda5e7f2b4 100644--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts@@ -8,7 +8,6 @@ import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modulesimport { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type FlatTimelineActivityTypeMaps } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type-maps.type';-import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';import { buildDirectRelationTargetShape } from 'src/modules/timeline/utils/build-direct-relation-target-shape.util';import { buildJunctionTargetShape } from 'src/modules/timeline/utils/build-junction-target-shape.util';@@ -45,7 +44,6 @@ export class TimelineActivityRoutingPlanService {constructor(private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,- private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,) {}async shouldProcessEvent({@@ -121,7 +119,7 @@ export class TimelineActivityRoutingPlanService {return cachedRoutingPlan.routingPlan;}- const routingPlan = this.buildRoutingPlan({ workspaceId, ...data });+ const routingPlan = this.buildRoutingPlan(data);this.routingPlanByWorkspaceId.set(workspaceId, {cacheKey,@@ -132,51 +130,24 @@ export class TimelineActivityRoutingPlanService {}private buildRoutingPlan({- workspaceId,flatObjectMetadataMaps,flatFieldMetadataMaps,flatTimelineActivityTypeMaps,}: {- workspaceId: string;flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;flatTimelineActivityTypeMaps: FlatTimelineActivityTypeMaps;}): TimelineActivityRoutingPlan {- const {- effectiveTimelineActivityTypes,- routingConflicts,- resolverConflicts,- invalidContracts,- resolveTimelineActivityType,- } = buildTimelineActivityTypeResolution({- ...flatTimelineActivityTypeMaps,- objectMetadataByUniversalIdentifier:- flatObjectMetadataMaps.byUniversalIdentifier,- });-- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'ambiguous-declared-rule',- issues: routingConflicts,- });- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'ambiguous-resolver',- issues: resolverConflicts,- });- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'invalid-contract',- issues: invalidContracts,- });+ const { effectiveTimelineActivityTypes, resolveTimelineActivityType } =+ buildTimelineActivityTypeResolution({+ ...flatTimelineActivityTypeMaps,+ objectMetadataByUniversalIdentifier:+ flatObjectMetadataMaps.byUniversalIdentifier,+ });const activeTimelineActivityTypes = effectiveTimelineActivityTypes.filter((timelineActivityType) => timelineActivityType.isActive,);- const invalidThroughRules: {- action: string;- objectUniversalIdentifier: string | null;- }[] = [];const throughRules = activeTimelineActivityTypes.map((timelineActivityType): TimelineActivityRule | undefined => {const routing =@@ -203,12 +174,6 @@ export class TimelineActivityRoutingPlanService {!isDefined(sourceFlatObjectMetadata) ||!isDefined(relationFlatFieldMetadata)) {- invalidThroughRules.push({- action: timelineActivityType.action,- objectUniversalIdentifier:- timelineActivityType.objectUniversalIdentifier,- });-return undefined;}@@ -225,12 +190,6 @@ export class TimelineActivityRoutingPlanService {});if (!isDefined(targetShape)) {- invalidThroughRules.push({- action: timelineActivityType.action,- objectUniversalIdentifier:- timelineActivityType.objectUniversalIdentifier,- });-return undefined;}@@ -254,12 +213,6 @@ export class TimelineActivityRoutingPlanService {}).filter(isDefined);- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'invalid-contract',- issues: invalidThroughRules,- });-const eligibleNonAuditedObjectMetadataIds = new Set(throughRules.flatMap((rule) => [rule.sourceFlatObjectMetadata.id,diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.tsindex 651ed9e780c..6450c2081df 100644--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts@@ -5,7 +5,6 @@ import { isDefined } from 'twenty-shared/utils';import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';import { TimelineException } from 'src/modules/timeline/exceptions/timeline.exception';-import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';import {buildTimelineActivityTypeResolution,toResolvedTimelineActivityType,@@ -17,7 +16,6 @@ import {export class TimelineActivityTypeCacheService {constructor(private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,- private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,) {}async getTimelineActivityTypeResolver(@@ -34,23 +32,13 @@ export class TimelineActivityTypeCacheService {},);- const { resolveTimelineActivityType, resolverConflicts, invalidContracts } =- buildTimelineActivityTypeResolution({+ const { resolveTimelineActivityType } = buildTimelineActivityTypeResolution(+ {...flatTimelineActivityTypeMaps,objectMetadataByUniversalIdentifier:flatObjectMetadataMaps.byUniversalIdentifier,- });-- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'ambiguous-resolver',- issues: resolverConflicts,- });- this.timelineActivityMetadataDiagnosticsService.reportAll({- workspaceId,- reason: 'invalid-contract',- issues: invalidContracts,- });+ },+ );return resolveTimelineActivityType;}diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.tsindex 42f83f16d38..18dd0fe3f01 100644--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts@@ -31,7 +31,6 @@ import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-aimport { resolveLinkedRecordCachedName } from 'src/modules/timeline/utils/resolve-linked-record-cached-name.util';import { resolveTimelineActivityHappensAt } from 'src/modules/timeline/utils/resolve-timeline-activity-happens-at.util';import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';-import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';import { doesTimelineActivityLinkChange } from 'src/modules/timeline/utils/does-timeline-activity-link-change.util';import { resolveTimelineActivityRuleAction } from 'src/modules/timeline/utils/resolve-timeline-activity-rule-action.util';@@ -108,7 +107,6 @@ export class TimelineActivityService {private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,private readonly timelineActivityRoutingPlanService: TimelineActivityRoutingPlanService,private readonly timelineActivityTargetQueryService: TimelineActivityTargetQueryService,- private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,) {}async upsertEvents({@@ -229,33 +227,20 @@ export class TimelineActivityService {private resolveTimelineActivityTypeForRule({rule,ruleAction,- workspaceId,resolveTimelineActivityType,}: {rule: TimelineActivityRule;ruleAction: TimelineActivityRuleAction;- workspaceId: string;resolveTimelineActivityType: TimelineActivityTypeResolver;}): ResolvedTimelineActivityType | undefined {- const timelineActivityType =+ return (rule.timelineActivityType ??resolveTimelineActivityType({action: ruleAction,objectUniversalIdentifier:rule.sourceFlatObjectMetadata.universalIdentifier,- });-- if (!isDefined(timelineActivityType)) {- this.timelineActivityMetadataDiagnosticsService.report({- workspaceId,- reason: 'missing-type',- action: ruleAction,- objectUniversalIdentifier:- rule.sourceFlatObjectMetadata.universalIdentifier,- });- }-- return timelineActivityType;+ })+ );}private async buildPayloadsForSourceRule({@@ -280,7 +265,6 @@ export class TimelineActivityService {const timelineActivityType = this.resolveTimelineActivityTypeForRule({rule,ruleAction,- workspaceId,resolveTimelineActivityType,});@@ -420,7 +404,6 @@ export class TimelineActivityService {const timelineActivityType = this.resolveTimelineActivityTypeForRule({rule,ruleAction,- workspaceId,resolveTimelineActivityType,});diff --git a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts b/packages/twenty-server/src/modules/timeline/timeline-activity.module.tsindex 1ac620f4fa3..c598e087220 100644--- a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts+++ b/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts@@ -8,8 +8,6 @@ import { TimelineActivityTargetQueryService } from 'src/modules/timeline/serviceimport { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';-import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';-import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';@Module({imports: [@@ -18,14 +16,12 @@ import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline]),TwentyORMModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,- MetricsModule,],providers: [TimelineActivityService,TimelineActivityRoutingPlanService,TimelineActivityTargetQueryService,TimelineActivityTypeCacheService,- TimelineActivityMetadataDiagnosticsService,],exports: [TimelineActivityService,