chore(release): publish new version

- @standardnotes/analytics@2.27.9 - @standardnotes/api-gateway@1.76.1 - @standardnotes/auth-server@1.150.8 - @standardnotes/domain-events-infra@1.14.6 - @standardnotes/event-store@1.12.9 - @standardnotes/files-server@1.26.1 - @standardnotes/home-server@1.16.25 - @standardnotes/revisions-server@1.39.2 - @standardnotes/scheduler-server@1.21.9 - @standardnotes/syncing-server@1.111.1 - @standardnotes/websockets-server@1.11.9
fix(domain-events-infra): setting user metadata on workers
2026-01-21 17:04:28 -05:00 · 2023-10-05 05:36:39 +00:00 · 2023-10-05 07:16:18 +02:00 · 2023-10-04 18:03:38 +00:00 · 2023-10-04 19:44:25 +02:00 · 2023-10-04 19:39:16 +02:00
46 changed files with 479 additions and 59 deletions
--- a/.github/workflows/common-deploy.yml
+++ b/.github/workflows/common-deploy.yml
@@ -38,6 +38,10 @@ jobs:
      run: |
        jq '(.containerDefinitions[] | select(.name=="${{ inputs.service_name }}-prod") | .environment[] | select(.name=="VERSION")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json

+    - name: Fill in the new package version in the Amazon ECS task definition
+      run: |
+        jq '(.containerDefinitions[] | select(.name=="${{ inputs.service_name }}-prod") | .environment[] | select(.name=="npm_package_version")).value = "${{ github.sha }}"' task-definition.json > tmp.json && mv tmp.json task-definition.json
+
    - name: Fill in the new image ID in the Amazon ECS task definition
      id: task-def-prod
      uses: aws-actions/amazon-ecs-render-task-definition@v1
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -104,11 +104,11 @@ jobs:
      suite: 'base'
    secrets: inherit

-  e2e-vaults:
-    needs: build
-    name: E2E Vaults Suite
-    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-    with:
-      snjs_image_tag: 'latest'
-      suite: 'vaults'
-    secrets: inherit
+  # e2e-vaults:
+  #   needs: build
+  #   name: E2E Vaults Suite
+  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+  #   with:
+  #     snjs_image_tag: 'latest'
+  #     suite: 'vaults'
+  #   secrets: inherit
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -104,23 +104,23 @@ jobs:
      suite: 'base'
    secrets: inherit

-  e2e-vaults:
-    needs: build
-    name: E2E Vaults Suite
-    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
-    with:
-      snjs_image_tag: 'latest'
-      suite: 'vaults'
-    secrets: inherit
+  # e2e-vaults:
+  #   needs: build
+  #   name: E2E Vaults Suite
+  #   uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+  #   with:
+  #     snjs_image_tag: 'latest'
+  #     suite: 'vaults'
+  #   secrets: inherit

  publish-self-hosting:
-    needs: [ test, lint, e2e-base, e2e-vaults ]
+    needs: [ test, lint, e2e-base ]
    name: Publish Self Hosting Docker Image
    uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
    secrets: inherit

  publish-services:
-    needs: [ test, lint, e2e-base, e2e-vaults ]
+    needs: [ test, lint, e2e-base ]

    runs-on: ubuntu-latest

--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -5797,6 +5797,7 @@ const RAW_RUNTIME_STATE =
          ["@types/prettyjson", "npm:0.0.30"],\
          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
          ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
+          ["aws-xray-sdk", "npm:3.5.2"],\
          ["axios", "npm:1.4.0"],\
          ["cors", "npm:2.8.5"],\
          ["dotenv", "npm:16.1.3"],\
@@ -6053,6 +6054,7 @@ const RAW_RUNTIME_STATE =
          ["@types/uuid", "npm:9.0.3"],\
          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
          ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
+          ["aws-xray-sdk", "npm:3.5.2"],\
          ["connect-busboy", "npm:1.0.0"],\
          ["cors", "npm:2.8.5"],\
          ["dayjs", "npm:1.11.7"],\
@@ -6188,6 +6190,7 @@ const RAW_RUNTIME_STATE =
          ["@types/node", "npm:20.5.7"],\
          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
          ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
+          ["aws-xray-sdk", "npm:3.5.2"],\
          ["cors", "npm:2.8.5"],\
          ["dotenv", "npm:16.1.3"],\
          ["eslint", "npm:8.41.0"],\
@@ -6379,6 +6382,7 @@ const RAW_RUNTIME_STATE =
          ["@types/uuid", "npm:9.0.3"],\
          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
          ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
+          ["aws-xray-sdk", "npm:3.5.2"],\
          ["axios", "npm:1.4.0"],\
          ["cors", "npm:2.8.5"],\
          ["dotenv", "npm:16.1.3"],\
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.27.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.8...@standardnotes/analytics@2.27.9) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.27.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.7...@standardnotes/analytics@2.27.8) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.27.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.6...@standardnotes/analytics@2.27.7) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.27.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.5...@standardnotes/analytics@2.27.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.27.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.4...@standardnotes/analytics@2.27.5) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/analytics
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.27.5",
+  "version": "2.27.9",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.76.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.0...@standardnotes/api-gateway@1.76.1) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.76.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.13...@standardnotes/api-gateway@1.76.0) (2023-10-04)
+
+### Features
+
+* **api-gateaway:** configure aws-xray-sdk ([dc76113](https://github.com/standardnotes/api-gateway/commit/dc7611391515dd49a8e9b7ce8ac5e128cd7af0a8))
+
+## [1.75.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.12...@standardnotes/api-gateway@1.75.13) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.75.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.11...@standardnotes/api-gateway@1.75.12) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.75.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.10...@standardnotes/api-gateway@1.75.11) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.75.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.75.9...@standardnotes/api-gateway@1.75.10) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/api-gateway
--- a/packages/api-gateway/bin/server.ts
+++ b/packages/api-gateway/bin/server.ts
@@ -29,6 +29,7 @@ import helmet from 'helmet'
 import * as cors from 'cors'
 import { text, json, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const robots = require('express-robots-txt')

@@ -36,15 +37,27 @@ import { InversifyExpressServer } from 'inversify-express-utils'
 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import { TYPES } from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
+import { ServiceIdentifier } from '@standardnotes/domain-core'

 const container = new ContainerConfigLoader()
 void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const server = new InversifyExpressServer(container)

  server.setConfig((app) => {
+    if (isConfiguredForAWSProduction) {
+      app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.ApiGateway))
+    }
+
    app.use((_request: Request, response: Response, next: NextFunction) => {
      response.setHeader('X-API-Gateway-Version', container.get(TYPES.ApiGateway_VERSION))
      next()
@@ -104,6 +117,10 @@ void container.load().then((container) => {

  const serverInstance = server.build()

+  if (isConfiguredForAWSProduction) {
+    serverInstance.use(AWSXRay.express.closeSegment())
+  }
+
  serverInstance.listen(env.get('PORT'))

  logger.info(`Server started on port ${process.env.PORT}`)
--- a/packages/api-gateway/package.json
+++ b/packages/api-gateway/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.75.10",
+  "version": "1.76.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -31,6 +31,7 @@
    "@standardnotes/domain-events-infra": "workspace:*",
    "@standardnotes/security": "workspace:*",
    "@standardnotes/time": "workspace:*",
+    "aws-xray-sdk": "^3.5.2",
    "axios": "^1.1.3",
    "cors": "2.8.5",
    "dotenv": "^16.0.1",
--- a/packages/auth/CHANGELOG.md
+++ b/packages/auth/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.150.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.7...@standardnotes/auth-server@1.150.8) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.150.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.6...@standardnotes/auth-server@1.150.7) (2023-10-04)
+
+### Bug Fixes
+
+* identifying services in workers ([eab78b3](https://github.com/standardnotes/server/commit/eab78b3a95ec82cb779d069d172169bfa92368c9))
+
+## [1.150.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.5...@standardnotes/auth-server@1.150.6) (2023-10-04)
+
+### Bug Fixes
+
+* **auth:** disable users from registering to MongoDB ([d4579ce](https://github.com/standardnotes/server/commit/d4579ce21ed34ba433deb1fe2ff25c073fbe9622))
+
+## [1.150.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.4...@standardnotes/auth-server@1.150.5) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
 ## [1.150.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.3...@standardnotes/auth-server@1.150.4) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/auth-server
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.150.4",
+  "version": "1.150.8",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- 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'
@@ -1237,7 +1238,11 @@ export class ContainerConfigLoader {
        .bind<DomainEventMessageHandlerInterface>(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)),
        )

--- a/packages/auth/src/Domain/UseCase/Register.spec.ts
+++ b/packages/auth/src/Domain/UseCase/Register.spec.ts
@@ -84,14 +84,11 @@ describe('Register', () => {
    expect(settingService.applyDefaultSettingsUponRegistration).toHaveBeenCalled()
  })

-  it('should register a new user with default role and transition role', async () => {
+  it('should register a new user with default set of roles', async () => {
    const role = new Role()
    role.name = RoleName.NAMES.CoreUser

-    const transitionRole = new Role()
-    transitionRole.name = RoleName.NAMES.TransitionUser
-
-    roleRepository.findOneByName = jest.fn().mockReturnValueOnce(role).mockReturnValueOnce(transitionRole)
+    roleRepository.findOneByName = jest.fn().mockReturnValueOnce(role)

    expect(
      await createUseCase().execute({
@@ -120,7 +117,7 @@ describe('Register', () => {
      version: '004',
      createdAt: new Date(1),
      updatedAt: new Date(1),
-      roles: Promise.resolve([role, transitionRole]),
+      roles: Promise.resolve([role]),
    })
  })

--- a/packages/auth/src/Domain/UseCase/Register.ts
+++ b/packages/auth/src/Domain/UseCase/Register.ts
@@ -77,10 +77,6 @@ export class Register implements UseCaseInterface {
    if (defaultRole) {
      roles.push(defaultRole)
    }
-    const transitionRole = await this.roleRepository.findOneByName(RoleName.NAMES.TransitionUser)
-    if (transitionRole) {
-      roles.push(transitionRole)
-    }
    user.roles = Promise.resolve(roles)

    Object.assign(user, registrationFields)
--- a/packages/domain-core/CHANGELOG.md
+++ b/packages/domain-core/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.34.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.34.1...@standardnotes/domain-core@1.34.2) (2023-10-04)
+
+### Bug Fixes
+
+* identifying services in workers ([eab78b3](https://github.com/standardnotes/server/commit/eab78b3a95ec82cb779d069d172169bfa92368c9))
+
 ## [1.34.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.34.0...@standardnotes/domain-core@1.34.1) (2023-09-27)

 ### Bug Fixes
--- a/packages/domain-core/package.json
+++ b/packages/domain-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.34.1",
+  "version": "1.34.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-core/src/Domain/Service/ServiceIdentifier.ts
+++ b/packages/domain-core/src/Domain/Service/ServiceIdentifier.ts
@@ -6,9 +6,13 @@ export class ServiceIdentifier extends ValueObject<ServiceIdentifierProps> {
  static readonly NAMES = {
    ApiGateway: 'ApiGateway',
    Auth: 'Auth',
+    AuthWorker: 'AuthWorker',
    SyncingServer: 'SyncingServer',
+    SyncingServerWorker: 'SyncingServerWorker',
    Revisions: 'Revisions',
+    RevisionsWorker: 'RevisionsWorker',
    Files: 'Files',
+    FilesWorker: 'FilesWorker',
  }

  get value(): string {
--- a/packages/domain-events-infra/CHANGELOG.md
+++ b/packages/domain-events-infra/CHANGELOG.md
@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.14.6](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.5...@standardnotes/domain-events-infra@1.14.6) (2023-10-05)
+
+### Bug Fixes
+
+* **domain-events-infra:** setting user metadata on workers ([c4b6f17](https://github.com/standardnotes/server/commit/c4b6f17ebcfe7bd77b6741f881a0d1f13ba809a4))
+
+## [1.14.5](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.4...@standardnotes/domain-events-infra@1.14.5) (2023-10-04)
+
+### Bug Fixes
+
+* identifying services in workers ([eab78b3](https://github.com/standardnotes/server/commit/eab78b3a95ec82cb779d069d172169bfa92368c9))
+
+## [1.14.4](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.3...@standardnotes/domain-events-infra@1.14.4) (2023-10-04)
+
+### Bug Fixes
+
+* **domain-events-infra:** subsegment name ([ba7cbb9](https://github.com/standardnotes/server/commit/ba7cbb989ba3592ea0c13fc39f85e314517fbb2d))
+
+## [1.14.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.2...@standardnotes/domain-events-infra@1.14.3) (2023-10-04)
+
+### Bug Fixes
+
+* **domain-events-infra:** handling segments ([207ef9f](https://github.com/standardnotes/server/commit/207ef9f3e531b730f3f4869fb128354dbd659f46))
+* **domain-events-infra:** remove redundant flush ([64f1fe5](https://github.com/standardnotes/server/commit/64f1fe59c23894bda9ad40c6bdeaf2997a8b48ce))
+
 ## [1.14.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.1...@standardnotes/domain-events-infra@1.14.2) (2023-10-04)

 ### Bug Fixes
--- a/packages/domain-events-infra/package.json
+++ b/packages/domain-events-infra/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events-infra",
-  "version": "1.14.2",
+  "version": "1.14.6",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts
+++ b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts
@@ -1,6 +1,6 @@
 import { Logger } from 'winston'
 import * as zlib from 'zlib'
-import { Subsegment, captureAsyncFunc } from 'aws-xray-sdk'
+import { Segment, Subsegment, captureAsyncFunc } from 'aws-xray-sdk'

 import {
  DomainEventHandlerInterface,
@@ -10,6 +10,7 @@ import {

 export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInterface {
  constructor(
+    private serviceName: string,
    private handlers: Map<string, DomainEventHandlerInterface>,
    private logger: Logger,
  ) {}
@@ -32,13 +33,25 @@ export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInte

    this.logger.debug(`Received event: ${domainEvent.type}`)

-    await captureAsyncFunc(domainEvent.type, async (subsegment?: Subsegment) => {
-      await handler.handle(domainEvent)
+    const xRaySegment = new Segment(this.serviceName)

-      if (subsegment) {
-        subsegment.close()
-      }
-    })
+    if (domainEvent.meta.correlation.userIdentifierType === 'uuid') {
+      xRaySegment.addMetadata('userUuid', domainEvent.meta.correlation.userIdentifier)
+    }
+
+    await captureAsyncFunc(
+      domainEvent.type,
+      async (subsegment?: Subsegment) => {
+        await handler.handle(domainEvent)
+
+        if (subsegment) {
+          subsegment.close()
+        }
+      },
+      xRaySegment,
+    )
+
+    xRaySegment.close()
  }

  async handleError(error: Error): Promise<void> {
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.12.9](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.8...@standardnotes/event-store@1.12.9) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.8](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.7...@standardnotes/event-store@1.12.8) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.7](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.6...@standardnotes/event-store@1.12.7) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.6](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.5...@standardnotes/event-store@1.12.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.12.5](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.4...@standardnotes/event-store@1.12.5) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/event-store
--- a/packages/event-store/package.json
+++ b/packages/event-store/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.12.5",
+  "version": "1.12.9",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.26.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.26.0...@standardnotes/files-server@1.26.1) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+# [1.26.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.25.6...@standardnotes/files-server@1.26.0) (2023-10-04)
+
+### Features
+
+* add xray to syncing server and files ([6583ff6](https://github.com/standardnotes/files/commit/6583ff6cd90f7881c1a79c0f904f1b1db96fc5b3))
+
+## [1.25.6](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.25.5...@standardnotes/files-server@1.25.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.25.5](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.25.4...@standardnotes/files-server@1.25.5) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.25.4](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.25.3...@standardnotes/files-server@1.25.4) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
 ## [1.25.3](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.25.2...@standardnotes/files-server@1.25.3) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/files-server
--- a/packages/files/bin/server.ts
+++ b/packages/files/bin/server.ts
@@ -10,6 +10,7 @@ import helmet from 'helmet'
 import * as cors from 'cors'
 import { urlencoded, json, raw, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const robots = require('express-robots-txt')

@@ -17,15 +18,27 @@ import { InversifyExpressServer } from 'inversify-express-utils'
 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
+import { ServiceIdentifier } from '@standardnotes/domain-core'

 const container = new ContainerConfigLoader()
 void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const server = new InversifyExpressServer(container)

  server.setConfig((app) => {
+    if (isConfiguredForAWSProduction) {
+      app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Files))
+    }
+
    app.use((_request: Request, response: Response, next: NextFunction) => {
      response.setHeader('X-Files-Version', container.get(TYPES.Files_VERSION))
      next()
@@ -90,6 +103,10 @@ void container.load().then((container) => {

  const serverInstance = server.build()

+  if (isConfiguredForAWSProduction) {
+    serverInstance.use(AWSXRay.express.closeSegment())
+  }
+
  serverInstance.listen(env.get('PORT'))

  logger.info(`Server started on port ${process.env.PORT}`)
--- a/packages/files/bin/worker.ts
+++ b/packages/files/bin/worker.ts
@@ -8,6 +8,7 @@ import { Env } from '../src/Bootstrap/Env'
 import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
 import * as utc from 'dayjs/plugin/utc'
+import * as AWSXRay from 'aws-xray-sdk'

 const container = new ContainerConfigLoader()
 void container.load().then((container) => {
@@ -16,6 +17,14 @@ void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.enableManualMode()
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const logger: Logger = container.get(TYPES.Files_Logger)

  logger.info('Starting worker...')
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.25.3",
+  "version": "1.26.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -37,6 +37,7 @@
    "@standardnotes/sncrypto-common": "^1.13.4",
    "@standardnotes/sncrypto-node": "workspace:*",
    "@standardnotes/time": "workspace:*",
+    "aws-xray-sdk": "^3.5.2",
    "connect-busboy": "^1.0.0",
    "cors": "^2.8.5",
    "dayjs": "^1.11.6",
--- a/packages/files/src/Bootstrap/Container.ts
+++ b/packages/files/src/Bootstrap/Container.ts
@@ -1,5 +1,6 @@
 import * as winston from 'winston'
 import Redis from 'ioredis'
+import { captureAWSv3Client } from 'aws-xray-sdk'
 import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns'
 import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs'
 import { S3Client, S3ClientConfig } from '@aws-sdk/client-s3'
@@ -19,7 +20,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { StreamDownloadFile } from '../Domain/UseCase/StreamDownloadFile/StreamDownloadFile'
 import { FileDownloaderInterface } from '../Domain/Services/FileDownloaderInterface'
@@ -53,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?: {
@@ -83,7 +85,9 @@ export class ContainerConfigLoader {
      .toConstantValue(env.get('FILE_UPLOAD_PATH', true) ?? `${__dirname}/../../uploads`)

    const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
+    const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted'
    const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
+    const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting

    let logger: winston.Logger
    if (configuration?.logger) {
@@ -149,7 +153,11 @@ export class ContainerConfigLoader {
            secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
          }
        }
-        container.bind<SNSClient>(TYPES.Files_SNS).toConstantValue(new SNSClient(snsConfig))
+        let snsClient = new SNSClient(snsConfig)
+        if (isConfiguredForAWSProduction) {
+          snsClient = captureAWSv3Client(snsClient)
+        }
+        container.bind<SNSClient>(TYPES.Files_SNS).toConstantValue(snsClient)
      }

      if (env.get('SQS_QUEUE_URL', true)) {
@@ -165,7 +173,11 @@ export class ContainerConfigLoader {
            secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
          }
        }
-        container.bind<SQSClient>(TYPES.Files_SQS).toConstantValue(new SQSClient(sqsConfig))
+        let sqsClient = new SQSClient(sqsConfig)
+        if (isConfiguredForAWSProduction) {
+          sqsClient = captureAWSv3Client(sqsClient)
+        }
+        container.bind<SQSClient>(TYPES.Files_SQS).toConstantValue(sqsClient)
      }

      container
@@ -185,7 +197,10 @@ export class ContainerConfigLoader {
      if (env.get('S3_ENDPOINT', true)) {
        s3Opts.endpoint = env.get('S3_ENDPOINT', true)
      }
-      const s3Client = new S3Client(s3Opts)
+      let s3Client = new S3Client(s3Opts)
+      if (isConfiguredForAWSProduction) {
+        s3Client = captureAWSv3Client(s3Client)
+      }
      container.bind<S3Client>(TYPES.Files_S3).toConstantValue(s3Client)
      container.bind<FileDownloaderInterface>(TYPES.Files_FileDownloader).to(S3FileDownloader)
      container.bind<FileUploaderInterface>(TYPES.Files_FileUploader).to(S3FileUploader)
@@ -292,7 +307,11 @@ export class ContainerConfigLoader {
        .bind<DomainEventMessageHandlerInterface>(TYPES.Files_DomainEventMessageHandler)
        .toConstantValue(
          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(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
--- a/packages/home-server/CHANGELOG.md
+++ b/packages/home-server/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.16.25](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.24...@standardnotes/home-server@1.16.25) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.24](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.23...@standardnotes/home-server@1.16.24) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.23](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.22...@standardnotes/home-server@1.16.23) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.22](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.21...@standardnotes/home-server@1.16.22) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.21](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.20...@standardnotes/home-server@1.16.21) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.20](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.19...@standardnotes/home-server@1.16.20) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.16.19](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.18...@standardnotes/home-server@1.16.19) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/home-server
--- a/packages/home-server/package.json
+++ b/packages/home-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.16.19",
+  "version": "1.16.25",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/CHANGELOG.md
+++ b/packages/revisions/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.39.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.39.1...@standardnotes/revisions-server@1.39.2) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.39.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.39.0...@standardnotes/revisions-server@1.39.1) (2023-10-04)
+
+### Bug Fixes
+
+* identifying services in workers ([eab78b3](https://github.com/standardnotes/server/commit/eab78b3a95ec82cb779d069d172169bfa92368c9))
+
+# [1.39.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.10...@standardnotes/revisions-server@1.39.0) (2023-10-04)
+
+### Features
+
+* **revisions:** add aws-xray-sdk ([126989d](https://github.com/standardnotes/server/commit/126989df82391ba2f29034d41897f437596269b7))
+
+## [1.38.10](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.9...@standardnotes/revisions-server@1.38.10) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.38.9](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.8...@standardnotes/revisions-server@1.38.9) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
 ## [1.38.8](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.38.7...@standardnotes/revisions-server@1.38.8) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/revisions-server
--- a/packages/revisions/bin/server.ts
+++ b/packages/revisions/bin/server.ts
@@ -3,6 +3,7 @@ import 'reflect-metadata'
 import * as cors from 'cors'
 import { urlencoded, json, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'

 import { InversifyExpressServer } from 'inversify-express-utils'
 import TYPES from '../src/Bootstrap/Types'
@@ -11,14 +12,26 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container'

 import '../src/Infra/InversifyExpress/AnnotatedRevisionsController'
 import '../src/Infra/InversifyExpress/AnnotatedHealthCheckController'
+import { ServiceIdentifier } from '@standardnotes/domain-core'

 const container = new ContainerConfigLoader()
 void container.load().then((container) => {
  const env: Env = container.get(TYPES.Revisions_Env)

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const server = new InversifyExpressServer(container)

  server.setConfig((app) => {
+    if (isConfiguredForAWSProduction) {
+      app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Revisions))
+    }
+
    app.use((_request: Request, response: Response, next: NextFunction) => {
      response.setHeader('X-Revisions-Version', container.get(TYPES.Revisions_VERSION))
      next()
@@ -45,6 +58,10 @@ void container.load().then((container) => {

  const serverInstance = server.build()

+  if (isConfiguredForAWSProduction) {
+    serverInstance.use(AWSXRay.express.closeSegment())
+  }
+
  serverInstance.listen(env.get('PORT'))

  logger.info(`Server started on port ${process.env.PORT}`)
--- a/packages/revisions/bin/worker.ts
+++ b/packages/revisions/bin/worker.ts
@@ -1,6 +1,7 @@
 import 'reflect-metadata'

 import { Logger } from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'

 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
@@ -12,6 +13,14 @@ void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.enableManualMode()
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const logger: Logger = container.get(TYPES.Revisions_Logger)

  logger.info('Starting worker...')
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.38.8",
+  "version": "1.39.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -36,6 +36,7 @@
    "@standardnotes/responses": "^1.13.27",
    "@standardnotes/security": "workspace:^",
    "@standardnotes/time": "workspace:^",
+    "aws-xray-sdk": "^3.5.2",
    "cors": "2.8.5",
    "dotenv": "^16.0.1",
    "express": "^4.18.2",
--- a/packages/revisions/src/Bootstrap/Container.ts
+++ b/packages/revisions/src/Bootstrap/Container.ts
@@ -1,8 +1,14 @@
-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'
 import * as winston from 'winston'
+import { captureAWSv3Client } from 'aws-xray-sdk'
 import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns'

 import { Revision } from '../Domain/Revision/Revision'
@@ -30,12 +36,12 @@ import {
  DomainEventPublisherInterface,
 } from '@standardnotes/domain-events'
 import {
-  SQSNewRelicEventMessageHandler,
  SQSEventMessageHandler,
  SQSDomainEventSubscriberFactory,
  DirectCallEventMessageHandler,
  DirectCallDomainEventPublisher,
  SNSDomainEventPublisher,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { DumpRepositoryInterface } from '../Domain/Dump/DumpRepositoryInterface'
 import { AccountDeletionRequestedEventHandler } from '../Domain/Handler/AccountDeletionRequestedEventHandler'
@@ -90,6 +96,7 @@ export class ContainerConfigLoader {

    const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
    const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted'
+    const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting
    const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting
    const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true'
    const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
@@ -173,6 +180,10 @@ export class ContainerConfigLoader {
          }
        }

+        if (isConfiguredForAWSProduction) {
+          return captureAWSv3Client(new SNSClient(snsConfig))
+        }
+
        return new SNSClient(snsConfig)
      })

@@ -201,6 +212,10 @@ export class ContainerConfigLoader {
          }
        }

+        if (isConfiguredForAWSProduction) {
+          return captureAWSv3Client(new SQSClient(sqsConfig))
+        }
+
        return new SQSClient(sqsConfig)
      })

@@ -213,6 +228,10 @@ export class ContainerConfigLoader {
            apiVersion: 'latest',
            region: env.get('S3_AWS_REGION', true),
          })
+
+          if (isConfiguredForAWSProduction) {
+            return captureAWSv3Client(s3Client)
+          }
        }

        return s3Client
@@ -511,7 +530,11 @@ export class ContainerConfigLoader {
        .bind<DomainEventMessageHandlerInterface>(TYPES.Revisions_DomainEventMessageHandler)
        .toConstantValue(
          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(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)),
        )

--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.21.9](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.8...@standardnotes/scheduler-server@1.21.9) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.21.8](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.7...@standardnotes/scheduler-server@1.21.8) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.21.7](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.6...@standardnotes/scheduler-server@1.21.7) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.21.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.5...@standardnotes/scheduler-server@1.21.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.21.5](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.4...@standardnotes/scheduler-server@1.21.5) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/scheduler-server
--- a/packages/scheduler/package.json
+++ b/packages/scheduler/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.21.5",
+  "version": "1.21.9",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/settings/CHANGELOG.md
+++ b/packages/settings/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.21.42](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.41...@standardnotes/settings@1.21.42) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [1.21.41](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.40...@standardnotes/settings@1.21.41) (2023-09-27)

 **Note:** Version bump only for package @standardnotes/settings
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/settings",
-  "version": "1.21.41",
+  "version": "1.21.42",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/syncing-server/CHANGELOG.md
+++ b/packages/syncing-server/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.111.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.111.0...@standardnotes/syncing-server@1.111.1) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+# [1.111.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.110.8...@standardnotes/syncing-server@1.111.0) (2023-10-04)
+
+### Features
+
+* add xray to syncing server and files ([6583ff6](https://github.com/standardnotes/syncing-server-js/commit/6583ff6cd90f7881c1a79c0f904f1b1db96fc5b3))
+
+## [1.110.8](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.110.7...@standardnotes/syncing-server@1.110.8) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.110.7](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.110.6...@standardnotes/syncing-server@1.110.7) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.110.6](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.110.5...@standardnotes/syncing-server@1.110.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
 ## [1.110.5](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.110.4...@standardnotes/syncing-server@1.110.5) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/syncing-server
--- a/packages/syncing-server/bin/server.ts
+++ b/packages/syncing-server/bin/server.ts
@@ -11,20 +11,33 @@ import helmet from 'helmet'
 import * as cors from 'cors'
 import { urlencoded, json, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'

 import { InversifyExpressServer } from 'inversify-express-utils'
 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import { ServiceIdentifier } from '@standardnotes/domain-core'

 const container = new ContainerConfigLoader()
 void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const server = new InversifyExpressServer(container)

  server.setConfig((app) => {
+    if (isConfiguredForAWSProduction) {
+      app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.SyncingServer))
+    }
+
    app.use((_request: Request, response: Response, next: NextFunction) => {
      response.setHeader('X-SSJS-Version', container.get(TYPES.Sync_VERSION))
      next()
@@ -73,6 +86,10 @@ void container.load().then((container) => {

  const serverInstance = server.build()

+  if (isConfiguredForAWSProduction) {
+    serverInstance.use(AWSXRay.express.closeSegment())
+  }
+
  serverInstance.listen(env.get('PORT'))

  logger.info(`Server started on port ${process.env.PORT}`)
--- a/packages/syncing-server/bin/worker.ts
+++ b/packages/syncing-server/bin/worker.ts
@@ -1,6 +1,7 @@
 import 'reflect-metadata'

 import { Logger } from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'

 import TYPES from '../src/Bootstrap/Types'
 import { Env } from '../src/Bootstrap/Env'
@@ -12,6 +13,14 @@ void container.load().then((container) => {
  const env: Env = new Env()
  env.load()

+  const isConfiguredForAWSProduction =
+    env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted'
+
+  if (isConfiguredForAWSProduction) {
+    AWSXRay.enableManualMode()
+    AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+  }
+
  const logger: Logger = container.get(TYPES.Sync_Logger)

  logger.info('Starting worker...')
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.110.5",
+  "version": "1.111.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -40,6 +40,7 @@
    "@standardnotes/settings": "workspace:*",
    "@standardnotes/sncrypto-node": "workspace:*",
    "@standardnotes/time": "workspace:*",
+    "aws-xray-sdk": "^3.5.2",
    "axios": "^1.1.3",
    "cors": "2.8.5",
    "dotenv": "^16.0.1",
--- a/packages/syncing-server/src/Bootstrap/Container.ts
+++ b/packages/syncing-server/src/Bootstrap/Container.ts
@@ -5,6 +5,7 @@ import { Container, interfaces } from 'inversify'
 import { Env } from './Env'
 import TYPES from './Types'
 import { AppDataSource } from './DataSource'
+import { captureAWSv3Client } from 'aws-xray-sdk'
 import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns'
 import { ItemRepositoryInterface } from '../Domain/Item/ItemRepositoryInterface'
 import { SQLLegacyItemRepository } from '../Infra/TypeORM/SQLLegacyItemRepository'
@@ -16,7 +17,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { DomainEventFactoryInterface } from '../Domain/Event/DomainEventFactoryInterface'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
@@ -63,6 +64,7 @@ import {
  ControllerContainer,
  ControllerContainerInterface,
  MapperInterface,
+  ServiceIdentifier,
  SharedVaultUser,
 } from '@standardnotes/domain-core'
 import { BaseItemsController } from '../Infra/InversifyExpressUtils/Base/BaseItemsController'
@@ -231,6 +233,7 @@ export class ContainerConfigLoader {

    const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server'
    const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted'
+    const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting
    const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting
    const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true'
    const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
@@ -282,6 +285,10 @@ export class ContainerConfigLoader {
          }
        }

+        if (isConfiguredForAWSProduction) {
+          captureAWSv3Client(new SNSClient(snsConfig))
+        }
+
        return new SNSClient(snsConfig)
      })

@@ -310,6 +317,10 @@ export class ContainerConfigLoader {
          }
        }

+        if (isConfiguredForAWSProduction) {
+          captureAWSv3Client(new SQSClient(sqsConfig))
+        }
+
        return new SQSClient(sqsConfig)
      })

@@ -322,6 +333,10 @@ export class ContainerConfigLoader {
            apiVersion: 'latest',
            region: env.get('S3_AWS_REGION', true),
          })
+
+          if (isConfiguredForAWSProduction) {
+            captureAWSv3Client(s3Client)
+          }
        }

        return s3Client
@@ -1158,7 +1173,11 @@ export class ContainerConfigLoader {
        .bind<DomainEventMessageHandlerInterface>(TYPES.Sync_DomainEventMessageHandler)
        .toConstantValue(
          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(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)),
        )
    }
--- a/packages/websockets/CHANGELOG.md
+++ b/packages/websockets/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.11.9](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.8...@standardnotes/websockets-server@1.11.9) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.11.8](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.7...@standardnotes/websockets-server@1.11.8) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.11.7](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.6...@standardnotes/websockets-server@1.11.7) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.11.6](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.5...@standardnotes/websockets-server@1.11.6) (2023-10-04)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
 ## [1.11.5](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.4...@standardnotes/websockets-server@1.11.5) (2023-10-04)

 **Note:** Version bump only for package @standardnotes/websockets-server
--- a/packages/websockets/package.json
+++ b/packages/websockets/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.11.5",
+  "version": "1.11.9",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/yarn.lock
+++ b/yarn.lock
@@ -4667,6 +4667,7 @@ __metadata:
    "@types/prettyjson": "npm:^0.0.30"
    "@typescript-eslint/eslint-plugin": "npm:^6.5.0"
    "@typescript-eslint/parser": "npm:^6.5.0"
+    aws-xray-sdk: "npm:^3.5.2"
    axios: "npm:^1.1.3"
    cors: "npm:2.8.5"
    dotenv: "npm:^16.0.1"
@@ -4947,6 +4948,7 @@ __metadata:
    "@types/uuid": "npm:^9.0.3"
    "@typescript-eslint/eslint-plugin": "npm:^6.5.0"
    "@typescript-eslint/parser": "npm:^6.5.0"
+    aws-xray-sdk: "npm:^3.5.2"
    connect-busboy: "npm:^1.0.0"
    cors: "npm:^2.8.5"
    dayjs: "npm:^1.11.6"
@@ -5079,6 +5081,7 @@ __metadata:
    "@types/node": "npm:^20.5.7"
    "@typescript-eslint/eslint-plugin": "npm:^6.5.0"
    "@typescript-eslint/parser": "npm:^6.5.0"
+    aws-xray-sdk: "npm:^3.5.2"
    cors: "npm:2.8.5"
    dotenv: "npm:^16.0.1"
    eslint: "npm:^8.39.0"
@@ -5276,6 +5279,7 @@ __metadata:
    "@types/uuid": "npm:^9.0.3"
    "@typescript-eslint/eslint-plugin": "npm:^6.5.0"
    "@typescript-eslint/parser": "npm:^6.5.0"
+    aws-xray-sdk: "npm:^3.5.2"
    axios: "npm:^1.1.3"
    cors: "npm:2.8.5"
    dotenv: "npm:^16.0.1"
Author	SHA1	Message	Date
standardci	c4c3dfb823	chore(release): publish new version - @standardnotes/analytics@2.27.9 - @standardnotes/api-gateway@1.76.1 - @standardnotes/auth-server@1.150.8 - @standardnotes/domain-events-infra@1.14.6 - @standardnotes/event-store@1.12.9 - @standardnotes/files-server@1.26.1 - @standardnotes/home-server@1.16.25 - @standardnotes/revisions-server@1.39.2 - @standardnotes/scheduler-server@1.21.9 - @standardnotes/syncing-server@1.111.1 - @standardnotes/websockets-server@1.11.9	2023-10-05 05:36:39 +00:00
Karol Sójko	c4b6f17ebc	fix(domain-events-infra): setting user metadata on workers	2023-10-05 07:16:18 +02:00
standardci	71ce938cb1	chore(release): publish new version - @standardnotes/api-gateway@1.76.0 - @standardnotes/files-server@1.26.0 - @standardnotes/home-server@1.16.24 - @standardnotes/syncing-server@1.111.0	2023-10-04 18:03:38 +00:00
Karol Sójko	dc76113915	feat(api-gateaway): configure aws-xray-sdk	2023-10-04 19:44:25 +02:00
Karol Sójko	6583ff6cd9	feat: add xray to syncing server and files	2023-10-04 19:39:16 +02:00
standardci	69ea947857	chore(release): publish new version - @standardnotes/analytics@2.27.8 - @standardnotes/api-gateway@1.75.13 - @standardnotes/auth-server@1.150.7 - @standardnotes/domain-core@1.34.2 - @standardnotes/domain-events-infra@1.14.5 - @standardnotes/event-store@1.12.8 - @standardnotes/files-server@1.25.6 - @standardnotes/home-server@1.16.23 - @standardnotes/revisions-server@1.39.1 - @standardnotes/scheduler-server@1.21.8 - @standardnotes/settings@1.21.42 - @standardnotes/syncing-server@1.110.8 - @standardnotes/websockets-server@1.11.8	2023-10-04 16:36:09 +00:00
Karol Sójko	eab78b3a95	fix: identifying services in workers	2023-10-04 18:13:41 +02:00
standardci	3097f7f063	chore(release): publish new version - @standardnotes/home-server@1.16.22 - @standardnotes/revisions-server@1.39.0	2023-10-04 15:42:53 +00:00
Karol Sójko	126989df82	feat(revisions): add aws-xray-sdk	2023-10-04 17:22:40 +02:00
Karol Sójko	a25eb178c5	chore: fix env var replacement	2023-10-04 16:43:48 +02:00
standardci	18dae26b8e	chore(release): publish new version - @standardnotes/analytics@2.27.7 - @standardnotes/api-gateway@1.75.12 - @standardnotes/auth-server@1.150.6 - @standardnotes/domain-events-infra@1.14.4 - @standardnotes/event-store@1.12.7 - @standardnotes/files-server@1.25.5 - @standardnotes/home-server@1.16.21 - @standardnotes/revisions-server@1.38.10 - @standardnotes/scheduler-server@1.21.7 - @standardnotes/syncing-server@1.110.7 - @standardnotes/websockets-server@1.11.7	2023-10-04 14:30:55 +00:00
Karol Sójko	5bc8157d4d	chore: disable vault tests temporarily	2023-10-04 16:09:27 +02:00
Karol Sójko	f29826e917	chore: add filling in the package version	2023-10-04 16:09:15 +02:00
Karol Sójko	ba7cbb989b	fix(domain-events-infra): subsegment name	2023-10-04 15:51:33 +02:00
Karol Sójko	d4579ce21e	fix(auth): disable users from registering to MongoDB	2023-10-04 15:51:32 +02:00
standardci	ed14d2dfb7	chore(release): publish new version - @standardnotes/analytics@2.27.6 - @standardnotes/api-gateway@1.75.11 - @standardnotes/auth-server@1.150.5 - @standardnotes/domain-events-infra@1.14.3 - @standardnotes/event-store@1.12.6 - @standardnotes/files-server@1.25.4 - @standardnotes/home-server@1.16.20 - @standardnotes/revisions-server@1.38.9 - @standardnotes/scheduler-server@1.21.6 - @standardnotes/syncing-server@1.110.6 - @standardnotes/websockets-server@1.11.6	2023-10-04 13:17:42 +00:00
Karol Sójko	64f1fe59c2	fix(domain-events-infra): remove redundant flush	2023-10-04 14:49:49 +02:00
Karol Sójko	207ef9f3e5	fix(domain-events-infra): handling segments	2023-10-04 14:47:45 +02:00