From 8a00d159a6ac4babcc4e285ba0585fd071275fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 6 Oct 2023 06:50:14 +0200 Subject: [PATCH] Revert "fix: naming of segments for sqs handlers" This reverts commit d244cc0d5f2c29e087ec80f153295cc3dd2220d6. --- packages/auth/src/Bootstrap/Container.ts | 7 ++++++- .../Infra/SQS/SQSDomainEventSubscriberFactory.ts | 3 +-- .../src/Infra/SQS/SQSXRayEventMessageHandler.ts | 5 +++-- packages/files/src/Bootstrap/Container.ts | 7 ++++++- packages/revisions/src/Bootstrap/Container.ts | 13 +++++++++++-- packages/syncing-server/src/Bootstrap/Container.ts | 7 ++++++- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/packages/auth/src/Bootstrap/Container.ts b/packages/auth/src/Bootstrap/Container.ts index dba38a3a4..bebd41b97 100644 --- a/packages/auth/src/Bootstrap/Container.ts +++ b/packages/auth/src/Bootstrap/Container.ts @@ -190,6 +190,7 @@ import { ControllerContainer, ControllerContainerInterface, MapperInterface, + ServiceIdentifier, SharedVaultUser, } from '@standardnotes/domain-core' import { SessionTracePersistenceMapper } from '../Mapping/SessionTracePersistenceMapper' @@ -1235,7 +1236,11 @@ export class ContainerConfigLoader { .bind(TYPES.Auth_DomainEventMessageHandler) .toConstantValue( isConfiguredForAWSProduction - ? new SQSXRayEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)) + ? new SQSXRayEventMessageHandler( + ServiceIdentifier.NAMES.AuthWorker, + eventHandlers, + container.get(TYPES.Auth_Logger), + ) : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)), ) diff --git a/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriberFactory.ts b/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriberFactory.ts index 69f018fbe..fe8d1936a 100644 --- a/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriberFactory.ts +++ b/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriberFactory.ts @@ -5,7 +5,6 @@ import { DomainEventSubscriberFactoryInterface, DomainEventSubscriberInterface, } from '@standardnotes/domain-events' -import { Segment, captureAWSv3Client } from 'aws-xray-sdk' export class SQSDomainEventSubscriberFactory implements DomainEventSubscriberFactoryInterface { constructor( @@ -19,7 +18,7 @@ export class SQSDomainEventSubscriberFactory implements DomainEventSubscriberFac attributeNames: ['All'], messageAttributeNames: ['compression', 'event'], queueUrl: this.queueUrl, - sqs: captureAWSv3Client(this.sqs, new Segment('test')), + sqs: this.sqs, handleMessage: /* istanbul ignore next */ async (message: Message) => await this.domainEventMessageHandler.handleMessage(message.Body), diff --git a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts index 01bf1f3b6..50dcde19c 100644 --- a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts +++ b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts @@ -10,6 +10,7 @@ import { export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInterface { constructor( + private serviceName: string, private handlers: Map, private logger: Logger, ) {} @@ -32,14 +33,14 @@ export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInte this.logger.debug(`Received event: ${domainEvent.type}`) - const xRaySegment = new Segment(domainEvent.type) + const xRaySegment = new Segment(this.serviceName) if (domainEvent.meta.correlation.userIdentifierType === 'uuid') { xRaySegment.setUser(domainEvent.meta.correlation.userIdentifier) } await captureAsyncFunc( - `${handler.constructor.name}.handle`, + domainEvent.type, async (subsegment?: Subsegment) => { await handler.handle(domainEvent) diff --git a/packages/files/src/Bootstrap/Container.ts b/packages/files/src/Bootstrap/Container.ts index 2ddf2dcc9..88dd270c5 100644 --- a/packages/files/src/Bootstrap/Container.ts +++ b/packages/files/src/Bootstrap/Container.ts @@ -54,6 +54,7 @@ import { S3FileMover } from '../Infra/S3/S3FileMover' import { FSFileMover } from '../Infra/FS/FSFileMover' import { MoveFile } from '../Domain/UseCase/MoveFile/MoveFile' import { SharedVaultValetTokenAuthMiddleware } from '../Infra/InversifyExpress/Middleware/SharedVaultValetTokenAuthMiddleware' +import { ServiceIdentifier } from '@standardnotes/domain-core' export class ContainerConfigLoader { async load(configuration?: { @@ -306,7 +307,11 @@ export class ContainerConfigLoader { .bind(TYPES.Files_DomainEventMessageHandler) .toConstantValue( env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger)) + ? new SQSXRayEventMessageHandler( + ServiceIdentifier.NAMES.FilesWorker, + eventHandlers, + container.get(TYPES.Files_Logger), + ) : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger)), ) container diff --git a/packages/revisions/src/Bootstrap/Container.ts b/packages/revisions/src/Bootstrap/Container.ts index ec8d8c458..437b130a7 100644 --- a/packages/revisions/src/Bootstrap/Container.ts +++ b/packages/revisions/src/Bootstrap/Container.ts @@ -1,4 +1,9 @@ -import { ControllerContainer, ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core' +import { + ControllerContainer, + ControllerContainerInterface, + MapperInterface, + ServiceIdentifier, +} from '@standardnotes/domain-core' import Redis from 'ioredis' import { Container, interfaces } from 'inversify' import { MongoRepository, Repository } from 'typeorm' @@ -525,7 +530,11 @@ export class ContainerConfigLoader { .bind(TYPES.Revisions_DomainEventMessageHandler) .toConstantValue( env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger)) + ? new SQSXRayEventMessageHandler( + ServiceIdentifier.NAMES.RevisionsWorker, + eventHandlers, + container.get(TYPES.Revisions_Logger), + ) : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger)), ) diff --git a/packages/syncing-server/src/Bootstrap/Container.ts b/packages/syncing-server/src/Bootstrap/Container.ts index 967e305be..3aae72f10 100644 --- a/packages/syncing-server/src/Bootstrap/Container.ts +++ b/packages/syncing-server/src/Bootstrap/Container.ts @@ -64,6 +64,7 @@ import { ControllerContainer, ControllerContainerInterface, MapperInterface, + ServiceIdentifier, SharedVaultUser, } from '@standardnotes/domain-core' import { BaseItemsController } from '../Infra/InversifyExpressUtils/Base/BaseItemsController' @@ -1172,7 +1173,11 @@ export class ContainerConfigLoader { .bind(TYPES.Sync_DomainEventMessageHandler) .toConstantValue( env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger)) + ? new SQSXRayEventMessageHandler( + ServiceIdentifier.NAMES.SyncingServerWorker, + eventHandlers, + container.get(TYPES.Sync_Logger), + ) : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger)), ) }