chore(release): publish new version

- @standardnotes/analytics@2.28.0 - @standardnotes/api-gateway@1.77.1 - @standardnotes/auth-server@1.151.1 - @standardnotes/domain-core@1.35.0 - @standardnotes/domain-events-infra@1.14.8 - @standardnotes/event-store@1.12.11 - @standardnotes/files-server@1.26.3 - @standardnotes/home-server@1.16.29 - @standardnotes/revisions-server@1.39.5 - @standardnotes/scheduler-server@1.22.0 - @standardnotes/settings@1.21.43 - @standardnotes/syncing-server@1.111.3 - @standardnotes/websockets-server@1.12.0
chore: upgrade sqs-consumer
2026-04-26 12:01:24 -04:00 · 2023-10-06 05:44:00 +00:00 · 2023-10-06 07:26:59 +02:00 · 2023-10-06 07:23:06 +02:00 · 2023-10-06 06:50:14 +02:00 · 2023-10-05 18:06:17 +02:00
101 changed files with 1169 additions and 79 deletions
@@ -5740,6 +5740,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"],\
          ["dayjs", "npm:1.11.7"],\
          ["dotenv", "npm:16.1.3"],\
          ["eslint", "npm:8.41.0"],\
@@ -5972,7 +5973,7 @@ const RAW_RUNTIME_STATE =
          ["newrelic", "npm:11.0.0"],\
          ["prettier", "npm:3.0.3"],\
          ["reflect-metadata", "npm:0.1.13"],\
-          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1"],\
+          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0"],\
          ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.0"],\
          ["typescript", "patch:typescript@npm%3A5.0.4#optional!builtin<compat/typescript>::version=5.0.4&hash=b5f058"],\
          ["winston", "npm:3.9.0"]\
@@ -6186,6 +6187,7 @@ const RAW_RUNTIME_STATE =
          ["@types/express", "npm:4.17.17"],\
          ["@types/ioredis", "npm:5.0.0"],\
          ["@types/jest", "npm:29.5.2"],\
+          ["@types/mysql", "npm:2.15.22"],\
          ["@types/newrelic", "npm:9.14.0"],\
          ["@types/node", "npm:20.5.7"],\
          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\
@@ -6201,6 +6203,7 @@ const RAW_RUNTIME_STATE =
          ["ioredis", "npm:5.3.2"],\
          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.5.0"],\
          ["mongodb", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:6.0.0"],\
+          ["mysql", "npm:2.18.1"],\
          ["mysql2", "npm:3.3.3"],\
          ["newrelic", "npm:11.0.0"],\
          ["prettier", "npm:3.0.3"],\
@@ -6233,6 +6236,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"],\
          ["dayjs", "npm:1.11.7"],\
          ["dotenv", "npm:16.1.3"],\
          ["eslint", "npm:8.41.0"],\
@@ -6470,6 +6474,7 @@ const RAW_RUNTIME_STATE =
          ["@types/newrelic", "npm:9.14.0"],\
          ["@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"],\
@@ -8336,6 +8341,13 @@ const RAW_RUNTIME_STATE =
      }]\
    ]],\
    ["bignumber.js", [\
+      ["npm:9.0.0", {\
+        "packageLocation": "./.yarn/cache/bignumber.js-npm-9.0.0-ce190bcd7c-7406d0d11d.zip/node_modules/bignumber.js/",\
+        "packageDependencies": [\
+          ["bignumber.js", "npm:9.0.0"]\
+        ],\
+        "linkType": "HARD"\
+      }],\
      ["npm:9.1.1", {\
        "packageLocation": "./.yarn/cache/bignumber.js-npm-9.1.1-5929e8d8dc-1f771bfa88.zip/node_modules/bignumber.js/",\
        "packageDependencies": [\
@@ -13718,6 +13730,19 @@ const RAW_RUNTIME_STATE =
        "linkType": "HARD"\
      }]\
    ]],\
+    ["mysql", [\
+      ["npm:2.18.1", {\
+        "packageLocation": "./.yarn/cache/mysql-npm-2.18.1-8fdb56201f-87d80e3747.zip/node_modules/mysql/",\
+        "packageDependencies": [\
+          ["mysql", "npm:2.18.1"],\
+          ["bignumber.js", "npm:9.0.0"],\
+          ["readable-stream", "npm:2.3.7"],\
+          ["safe-buffer", "npm:5.1.2"],\
+          ["sqlstring", "npm:2.3.1"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
    ["mysql2", [\
      ["npm:3.3.3", {\
        "packageLocation": "./.yarn/cache/mysql2-npm-3.3.3-d2fe8cf512-4bf7ace8f1.zip/node_modules/mysql2/",\
@@ -15255,6 +15280,20 @@ const RAW_RUNTIME_STATE =
      }]\
    ]],\
    ["readable-stream", [\
+      ["npm:2.3.7", {\
+        "packageLocation": "./.yarn/cache/readable-stream-npm-2.3.7-77b22a9818-d04c677c17.zip/node_modules/readable-stream/",\
+        "packageDependencies": [\
+          ["readable-stream", "npm:2.3.7"],\
+          ["core-util-is", "npm:1.0.3"],\
+          ["inherits", "npm:2.0.4"],\
+          ["isarray", "npm:1.0.0"],\
+          ["process-nextick-args", "npm:2.0.1"],\
+          ["safe-buffer", "npm:5.1.2"],\
+          ["string_decoder", "npm:1.1.1"],\
+          ["util-deprecate", "npm:1.0.2"]\
+        ],\
+        "linkType": "HARD"\
+      }],\
      ["npm:2.3.8", {\
        "packageLocation": "./.yarn/cache/readable-stream-npm-2.3.8-67a94c2cb1-8500dd3a90.zip/node_modules/readable-stream/",\
        "packageDependencies": [\
@@ -16022,6 +16061,13 @@ const RAW_RUNTIME_STATE =
      }]\
    ]],\
    ["sqlstring", [\
+      ["npm:2.3.1", {\
+        "packageLocation": "./.yarn/cache/sqlstring-npm-2.3.1-2d4ffafe98-bc09237002.zip/node_modules/sqlstring/",\
+        "packageDependencies": [\
+          ["sqlstring", "npm:2.3.1"]\
+        ],\
+        "linkType": "HARD"\
+      }],\
      ["npm:2.3.3", {\
        "packageLocation": "./.yarn/cache/sqlstring-npm-2.3.3-2db6939570-4e5a25af2d.zip/node_modules/sqlstring/",\
        "packageDependencies": [\
@@ -16031,17 +16077,17 @@ const RAW_RUNTIME_STATE =
      }]\
    ]],\
    ["sqs-consumer", [\
-      ["npm:6.2.1", {\
-        "packageLocation": "./.yarn/cache/sqs-consumer-npm-6.2.1-857abd3d30-a903daa836.zip/node_modules/sqs-consumer/",\
+      ["npm:7.3.0", {\
+        "packageLocation": "./.yarn/cache/sqs-consumer-npm-7.3.0-a47c08ef71-367ea2a6f3.zip/node_modules/sqs-consumer/",\
        "packageDependencies": [\
-          ["sqs-consumer", "npm:6.2.1"]\
+          ["sqs-consumer", "npm:7.3.0"]\
        ],\
        "linkType": "SOFT"\
      }],\
-      ["virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1", {\
-        "packageLocation": "./.yarn/__virtual__/sqs-consumer-virtual-603a7c5831/0/cache/sqs-consumer-npm-6.2.1-857abd3d30-a903daa836.zip/node_modules/sqs-consumer/",\
+      ["virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0", {\
+        "packageLocation": "./.yarn/__virtual__/sqs-consumer-virtual-bf07118bf0/0/cache/sqs-consumer-npm-7.3.0-a47c08ef71-367ea2a6f3.zip/node_modules/sqs-consumer/",\
        "packageDependencies": [\
-          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:6.2.1"],\
+          ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:7.3.0"],\
          ["@aws-sdk/client-sqs", "npm:3.342.0"],\
          ["@types/aws-sdk__client-sqs", null],\
          ["debug", "virtual:ac3d8e680759ce54399273724d44e041d6c9b73454d191d411a8c44bb27e22f02aaf6ed9d3ad0ac1c298eac4833cff369c9c7b84c573016112c4f84be2cd8543#npm:4.3.4"]\
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.28.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.10...@standardnotes/analytics@2.28.0) (2023-10-06)
+
+### Features
+
+* add xray to analytics scheduler and websockets ([f0531d6](https://github.com/standardnotes/server/commit/f0531d68cb77036222f2a34602819f11e6a2697d))
+
+## [2.27.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.27.9...@standardnotes/analytics@2.27.10) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [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
@@ -1,6 +1,7 @@
 import 'reflect-metadata'

 import { Logger } from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'
 import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
 import * as utc from 'dayjs/plugin/utc'
@@ -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.Logger)

  logger.info('Starting worker...')
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.27.8",
+  "version": "2.28.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -46,6 +46,7 @@
    "@standardnotes/domain-events": "workspace:*",
    "@standardnotes/domain-events-infra": "workspace:*",
    "@standardnotes/time": "workspace:*",
+    "aws-xray-sdk": "^3.5.2",
    "dayjs": "^1.11.6",
    "dotenv": "^16.0.1",
    "inversify": "^6.0.1",
@@ -6,7 +6,7 @@ import {
  DomainEventMessageHandlerInterface,
  DomainEventSubscriberFactoryInterface,
 } from '@standardnotes/domain-events'
-import { MapperInterface } from '@standardnotes/domain-core'
+import { MapperInterface, ServiceIdentifier } from '@standardnotes/domain-core'
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Mixpanel = require('mixpanel')

@@ -18,7 +18,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface'
@@ -57,6 +57,7 @@ import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns'
 import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs'
 import { SessionCreatedEventHandler } from '../Domain/Handler/SessionCreatedEventHandler'
 import { SessionRefreshedEventHandler } from '../Domain/Handler/SessionRefreshedEventHandler'
+import { captureAWSv3Client } from 'aws-xray-sdk'

 export class ContainerConfigLoader {
  async load(): Promise<Container> {
@@ -107,7 +108,7 @@ export class ContainerConfigLoader {
        secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
      }
    }
-    container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
+    container.bind<SNSClient>(TYPES.SNS).toConstantValue(captureAWSv3Client(new SNSClient(snsConfig)))

    if (env.get('SQS_QUEUE_URL', true)) {
      const sqsConfig: SQSClientConfig = {
@@ -122,7 +123,7 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
        }
      }
-      container.bind<SQSClient>(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig))
+      container.bind<SQSClient>(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig)))
    }

    // env vars
@@ -246,7 +247,11 @@ export class ContainerConfigLoader {
      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
      .toConstantValue(
        env.get('NEW_RELIC_ENABLED', true) === 'true'
-          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          ? new SQSXRayEventMessageHandler(
+              ServiceIdentifier.NAMES.AnalyticsWorker,
+              eventHandlers,
+              container.get(TYPES.Logger),
+            )
          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
      )
    container
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.77.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.77.0...@standardnotes/api-gateway@1.77.1) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.77.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.2...@standardnotes/api-gateway@1.77.0) (2023-10-05)
+
+### Features
+
+* setting xray segment user on api-gateway level ([3ee4941](https://github.com/standardnotes/api-gateway/commit/3ee49416f8e19207540141d98baa7f68880929bd))
+
+## [1.76.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.76.1...@standardnotes/api-gateway@1.76.2) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/api-gateway",
-  "version": "1.76.0",
+  "version": "1.77.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -35,6 +35,8 @@ export class ContainerConfigLoader {
    const container = new Container()

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

    const winstonFormatters = [winston.format.splat(), winston.format.json()]
@@ -90,6 +92,9 @@ export class ContainerConfigLoader {
      .bind(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL)
      .toConstantValue(+env.get('CROSS_SERVICE_TOKEN_CACHE_TTL', true))
    container.bind(TYPES.ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER).toConstantValue(isConfiguredForHomeServer)
+    container
+      .bind<boolean>(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION)
+      .toConstantValue(isConfiguredForAWSProduction)

    // Middleware
    container
@@ -15,6 +15,7 @@ export const TYPES = {
  ApiGateway_VERSION: Symbol.for('ApiGateway_VERSION'),
  ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL: Symbol.for('ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL'),
  ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER: Symbol.for('ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER'),
+  ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION: Symbol.for('ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION'),
  // Middleware
  ApiGateway_RequiredCrossServiceTokenMiddleware: Symbol.for('ApiGateway_RequiredCrossServiceTokenMiddleware'),
  ApiGateway_OptionalCrossServiceTokenMiddleware: Symbol.for('ApiGateway_OptionalCrossServiceTokenMiddleware'),
@@ -8,6 +8,7 @@ import { Logger } from 'winston'

 import { CrossServiceTokenCacheInterface } from '../Service/Cache/CrossServiceTokenCacheInterface'
 import { ServiceProxyInterface } from '../Service/Http/ServiceProxyInterface'
+import { Segment, getSegment } from 'aws-xray-sdk'

 export abstract class AuthMiddleware extends BaseMiddleware {
  constructor(
@@ -16,6 +17,7 @@ export abstract class AuthMiddleware extends BaseMiddleware {
    private crossServiceTokenCacheTTL: number,
    private crossServiceTokenCache: CrossServiceTokenCacheInterface,
    private timer: TimerInterface,
+    private isConfiguredForAWSProduction: boolean,
    protected logger: Logger,
  ) {
    super()
@@ -73,6 +75,13 @@ export abstract class AuthMiddleware extends BaseMiddleware {
      response.locals.roles = decodedToken.roles
      response.locals.sharedVaultOwnerContext = decodedToken.shared_vault_owner_context
      response.locals.belongsToSharedVaults = decodedToken.belongs_to_shared_vaults ?? []
+
+      if (this.isConfiguredForAWSProduction) {
+        const segment = getSegment()
+        if (segment instanceof Segment) {
+          segment.setUser(decodedToken.user.uuid)
+        }
+      }
    } catch (error) {
      const errorMessage = (error as AxiosError).isAxiosError
        ? JSON.stringify((error as AxiosError).response?.data)
@@ -16,9 +16,18 @@ export class OptionalCrossServiceTokenMiddleware extends AuthMiddleware {
    @inject(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL) crossServiceTokenCacheTTL: number,
    @inject(TYPES.ApiGateway_CrossServiceTokenCache) crossServiceTokenCache: CrossServiceTokenCacheInterface,
    @inject(TYPES.ApiGateway_Timer) timer: TimerInterface,
+    @inject(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION) isConfiguredForAWSProduction: boolean,
    @inject(TYPES.ApiGateway_Logger) logger: Logger,
  ) {
-    super(serviceProxy, jwtSecret, crossServiceTokenCacheTTL, crossServiceTokenCache, timer, logger)
+    super(
+      serviceProxy,
+      jwtSecret,
+      crossServiceTokenCacheTTL,
+      crossServiceTokenCache,
+      timer,
+      isConfiguredForAWSProduction,
+      logger,
+    )
  }

  protected override handleSessionValidationResponse(
@@ -16,9 +16,18 @@ export class RequiredCrossServiceTokenMiddleware extends AuthMiddleware {
    @inject(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL) crossServiceTokenCacheTTL: number,
    @inject(TYPES.ApiGateway_CrossServiceTokenCache) crossServiceTokenCache: CrossServiceTokenCacheInterface,
    @inject(TYPES.ApiGateway_Timer) timer: TimerInterface,
+    @inject(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION) isConfiguredForAWSProduction: boolean,
    @inject(TYPES.ApiGateway_Logger) logger: Logger,
  ) {
-    super(serviceProxy, jwtSecret, crossServiceTokenCacheTTL, crossServiceTokenCache, timer, logger)
+    super(
+      serviceProxy,
+      jwtSecret,
+      crossServiceTokenCacheTTL,
+      crossServiceTokenCache,
+      timer,
+      isConfiguredForAWSProduction,
+      logger,
+    )
  }

  protected override handleSessionValidationResponse(
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.151.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.151.0...@standardnotes/auth-server@1.151.1) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.151.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.9...@standardnotes/auth-server@1.151.0) (2023-10-05)
+
+### Features
+
+* setting xray segment user on api-gateway level ([3ee4941](https://github.com/standardnotes/server/commit/3ee49416f8e19207540141d98baa7f68880929bd))
+
+## [1.150.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.150.8...@standardnotes/auth-server@1.150.9) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.150.7",
+  "version": "1.151.1",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -747,7 +747,6 @@ export class ContainerConfigLoader {
      .toConstantValue(
        new RequiredCrossServiceTokenMiddleware(
          container.get<TokenDecoderInterface<CrossServiceTokenData>>(TYPES.Auth_CrossServiceTokenDecoder),
-          isConfiguredForAWSProduction && this.mode === 'server',
          container.get<winston.Logger>(TYPES.Auth_Logger),
        ),
      )
@@ -756,7 +755,6 @@ export class ContainerConfigLoader {
      .toConstantValue(
        new OptionalCrossServiceTokenMiddleware(
          container.get<TokenDecoderInterface<CrossServiceTokenData>>(TYPES.Auth_CrossServiceTokenDecoder),
-          isConfiguredForAWSProduction && this.mode === 'server',
          container.get<winston.Logger>(TYPES.Auth_Logger),
        ),
      )
@@ -2,12 +2,10 @@ import { CrossServiceTokenData, TokenDecoderInterface } from '@standardnotes/sec
 import { NextFunction, Request, Response } from 'express'
 import { BaseMiddleware } from 'inversify-express-utils'
 import { Logger } from 'winston'
-import { Segment, getSegment } from 'aws-xray-sdk'

 export abstract class ApiGatewayAuthMiddleware extends BaseMiddleware {
  constructor(
    private tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>,
-    private isConfiguredForAWSProduction: boolean,
    private logger: Logger,
  ) {
    super()
@@ -41,13 +39,6 @@ export abstract class ApiGatewayAuthMiddleware extends BaseMiddleware {
      response.locals.session = token.session
      response.locals.readOnlyAccess = token.session?.readonly_access ?? false

-      if (this.isConfiguredForAWSProduction) {
-        const segment = getSegment()
-        if (segment instanceof Segment) {
-          segment.setUser(token.user.uuid)
-        }
-      }
-
      return next()
    } catch (error) {
      return next(error)
@@ -5,12 +5,8 @@ import { Logger } from 'winston'
 import { ApiGatewayAuthMiddleware } from './ApiGatewayAuthMiddleware'

 export class OptionalCrossServiceTokenMiddleware extends ApiGatewayAuthMiddleware {
-  constructor(
-    tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>,
-    isConfiguredForAWSProduction: boolean,
-    logger: Logger,
-  ) {
-    super(tokenDecoder, isConfiguredForAWSProduction, logger)
+  constructor(tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>, logger: Logger) {
+    super(tokenDecoder, logger)
  }

  protected override handleMissingToken(request: Request, _response: Response, next: NextFunction): boolean {
@@ -5,12 +5,8 @@ import { Logger } from 'winston'
 import { ApiGatewayAuthMiddleware } from './ApiGatewayAuthMiddleware'

 export class RequiredCrossServiceTokenMiddleware extends ApiGatewayAuthMiddleware {
-  constructor(
-    tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>,
-    isConfiguredForAWSProduction: boolean,
-    logger: Logger,
-  ) {
-    super(tokenDecoder, isConfiguredForAWSProduction, logger)
+  constructor(tokenDecoder: TokenDecoderInterface<CrossServiceTokenData>, logger: Logger) {
+    super(tokenDecoder, logger)
  }

  protected override handleMissingToken(request: Request, response: Response, _next: NextFunction): boolean {
@@ -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.35.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-core@1.34.2...@standardnotes/domain-core@1.35.0) (2023-10-06)
+
+### Features
+
+* add xray to analytics scheduler and websockets ([f0531d6](https://github.com/standardnotes/server/commit/f0531d68cb77036222f2a34602819f11e6a2697d))
+
 ## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-core",
-  "version": "1.34.2",
+  "version": "1.35.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -4,6 +4,7 @@ import { ServiceIdentifierProps } from './ServiceIdentifierProps'

 export class ServiceIdentifier extends ValueObject<ServiceIdentifierProps> {
  static readonly NAMES = {
+    AnalyticsWorker: 'AnalyticsWorker',
    ApiGateway: 'ApiGateway',
    Auth: 'Auth',
    AuthWorker: 'AuthWorker',
@@ -13,6 +14,11 @@ export class ServiceIdentifier extends ValueObject<ServiceIdentifierProps> {
    RevisionsWorker: 'RevisionsWorker',
    Files: 'Files',
    FilesWorker: 'FilesWorker',
+    SchedulerWorker: 'SchedulerWorker',
+    Email: 'Email',
+    EmailWorker: 'EmailWorker',
+    Websockets: 'Websockets',
+    WebsocketsWorker: 'WebsocketsWorker',
  }

  get value(): string {
@@ -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.14.8](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.7...@standardnotes/domain-events-infra@1.14.8) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/domain-events-infra
+
+## [1.14.7](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.14.6...@standardnotes/domain-events-infra@1.14.7) (2023-10-05)
+
+### Reverts
+
+* Revert "fix(domain-events-infra): setting user metadata on workers" ([cd37c95](https://github.com/standardnotes/server/commit/cd37c951bbec0f1bf6443792db961efd27380eac))
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/domain-events-infra",
-  "version": "1.14.5",
+  "version": "1.14.8",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -30,7 +30,7 @@
    "aws-xray-sdk": "^3.5.2",
    "ioredis": "^5.2.4",
    "reflect-metadata": "^0.1.13",
-    "sqs-consumer": "^6.2.1",
+    "sqs-consumer": "^7.3.0",
    "winston": "^3.8.1"
  },
  "devDependencies": {
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.12.11](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.10...@standardnotes/event-store@1.12.11) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.10](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.9...@standardnotes/event-store@1.12.10) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [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,6 +1,6 @@
 {
  "name": "@standardnotes/event-store",
-  "version": "1.12.8",
+  "version": "1.12.11",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.26.3](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.26.2...@standardnotes/files-server@1.26.3) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.26.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.26.1...@standardnotes/files-server@1.26.2) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.26.0",
+  "version": "1.26.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -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.16.29](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.28...@standardnotes/home-server@1.16.29) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.28](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.27...@standardnotes/home-server@1.16.28) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.27](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.26...@standardnotes/home-server@1.16.27) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.26](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.25...@standardnotes/home-server@1.16.26) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [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,6 +1,6 @@
 {
  "name": "@standardnotes/home-server",
-  "version": "1.16.24",
+  "version": "1.16.29",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.39.5](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.39.4...@standardnotes/revisions-server@1.39.5) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [1.39.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.39.3...@standardnotes/revisions-server@1.39.4) (2023-10-05)
+
+### Bug Fixes
+
+* **revisions:** capture mysql to xray ([9f76e38](https://github.com/standardnotes/server/commit/9f76e389e21de4cf9629cd40849704ffb0e51fe9))
+
+## [1.39.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.39.2...@standardnotes/revisions-server@1.39.3) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/revisions-server
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.39.1",
+  "version": "1.39.5",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -44,6 +44,7 @@
    "inversify-express-utils": "^6.4.3",
    "ioredis": "^5.3.2",
    "mongodb": "^6.0.0",
+    "mysql": "^2.18.1",
    "mysql2": "^3.0.1",
    "reflect-metadata": "0.1.13",
    "sqlite3": "^5.1.6",
@@ -56,6 +57,7 @@
    "@types/express": "^4.17.14",
    "@types/ioredis": "^5.0.0",
    "@types/jest": "^29.5.1",
+    "@types/mysql": "^2",
    "@types/node": "^20.5.7",
    "@typescript-eslint/eslint-plugin": "^6.5.0",
    "@typescript-eslint/parser": "^6.5.0",
@@ -1,3 +1,5 @@
+import * as mysqlDriver from 'mysql'
+import { captureMySQL } from 'aws-xray-sdk'
 import { DataSource, EntityTarget, LoggerOptions, MongoRepository, ObjectLiteral, Repository } from 'typeorm'
 import { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions'

@@ -117,9 +119,15 @@ export class AppDataSource {
        restoreNodeTimeout: 5,
      }

+      let driver = undefined
+      if (!isConfiguredForHomeServerOrSelfHosting) {
+        driver = captureMySQL(mysqlDriver)
+      }
+
      const mySQLDataSourceOptions: MysqlConnectionOptions = {
        ...commonDataSourceOptions,
        type: 'mysql',
+        driver,
        charset: 'utf8mb4',
        supportBigNumbers: true,
        bigNumberStrings: false,
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.22.0](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.10...@standardnotes/scheduler-server@1.22.0) (2023-10-06)
+
+### Features
+
+* add xray to analytics scheduler and websockets ([f0531d6](https://github.com/standardnotes/server/commit/f0531d68cb77036222f2a34602819f11e6a2697d))
+
+## [1.21.10](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.21.9...@standardnotes/scheduler-server@1.21.10) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [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,6 +1,7 @@
 import 'reflect-metadata'

 import { Logger } from 'winston'
+import * as AWSXRay from 'aws-xray-sdk'
 import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
 import * as utc from 'dayjs/plugin/utc'
@@ -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.Logger)

  logger.info('Starting worker...')
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.21.8",
+  "version": "1.22.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -30,6 +30,7 @@
    "@standardnotes/domain-events-infra": "workspace:*",
    "@standardnotes/predicates": "workspace:*",
    "@standardnotes/time": "workspace:*",
+    "aws-xray-sdk": "^3.5.2",
    "dayjs": "^1.11.6",
    "dotenv": "^16.0.1",
    "inversify": "^6.0.1",
@@ -17,7 +17,7 @@ import {
  SNSDomainEventPublisher,
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PredicateRepositoryInterface } from '../Domain/Predicate/PredicateRepositoryInterface'
@@ -35,6 +35,8 @@ import { VerifyPredicates } from '../Domain/UseCase/VerifyPredicates/VerifyPredi
 import { UserRegisteredEventHandler } from '../Domain/Handler/UserRegisteredEventHandler'
 import { SubscriptionCancelledEventHandler } from '../Domain/Handler/SubscriptionCancelledEventHandler'
 import { ExitDiscountAppliedEventHandler } from '../Domain/Handler/ExitDiscountAppliedEventHandler'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+import { captureAWSv3Client } from 'aws-xray-sdk'

 export class ContainerConfigLoader {
  async load(): Promise<Container> {
@@ -86,7 +88,7 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
        }
      }
-      container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
+      container.bind<SNSClient>(TYPES.SNS).toConstantValue(captureAWSv3Client(new SNSClient(snsConfig)))
    }

    if (env.get('SQS_QUEUE_URL', true)) {
@@ -102,7 +104,7 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
        }
      }
-      container.bind<SQSClient>(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig))
+      container.bind<SQSClient>(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig)))
    }

    // env vars
@@ -156,7 +158,11 @@ export class ContainerConfigLoader {
      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
      .toConstantValue(
        env.get('NEW_RELIC_ENABLED', true) === 'true'
-          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          ? new SQSXRayEventMessageHandler(
+              ServiceIdentifier.NAMES.SchedulerWorker,
+              eventHandlers,
+              container.get(TYPES.Logger),
+            )
          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
      )
    container
@@ -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.43](https://github.com/standardnotes/server/compare/@standardnotes/settings@1.21.42...@standardnotes/settings@1.21.43) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/settings
+
 ## [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,6 +1,6 @@
 {
  "name": "@standardnotes/settings",
-  "version": "1.21.42",
+  "version": "1.21.43",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.111.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.111.2...@standardnotes/syncing-server@1.111.3) (2023-10-06)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [1.111.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.111.1...@standardnotes/syncing-server@1.111.2) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/syncing-server
+
+## [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
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.111.0",
+  "version": "1.111.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [1.12.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.10...@standardnotes/websockets-server@1.12.0) (2023-10-06)
+
+### Features
+
+* add xray to analytics scheduler and websockets ([f0531d6](https://github.com/standardnotes/server/commit/f0531d68cb77036222f2a34602819f11e6a2697d))
+
+## [1.11.10](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.11.9...@standardnotes/websockets-server@1.11.10) (2023-10-05)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [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
@@ -4,6 +4,7 @@ import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController'

 import * as cors from 'cors'
+import * as AWSXRay from 'aws-xray-sdk'
 import { urlencoded, json, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'

@@ -11,15 +12,20 @@ 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()

+  AWSXRay.config([AWSXRay.plugins.ECSPlugin])
+
  const server = new InversifyExpressServer(container)

  server.setConfig((app) => {
+    app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Websockets))
+
    app.use((_request: Request, response: Response, next: NextFunction) => {
      response.setHeader('X-Websockets-Version', container.get(TYPES.VERSION))
      next()
@@ -46,6 +52,8 @@ void container.load().then((container) => {

  const serverInstance = server.build()

+  serverInstance.use(AWSXRay.express.closeSegment())
+
  serverInstance.listen(env.get('PORT'))

  logger.info(`Server started on port ${process.env.PORT}`)
@@ -1,6 +1,7 @@
 import 'reflect-metadata'

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

 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
 import TYPES from '../src/Bootstrap/Types'
@@ -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.Logger)

  logger.info('Starting worker...')
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.11.8",
+  "version": "1.12.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
@@ -31,6 +31,7 @@
    "@standardnotes/domain-events-infra": "workspace:^",
    "@standardnotes/responses": "^1.13.27",
    "@standardnotes/security": "workspace:^",
+    "aws-xray-sdk": "^3.5.2",
    "axios": "^1.1.3",
    "cors": "2.8.5",
    "dotenv": "^16.0.1",
@@ -21,7 +21,7 @@ import { WebSocketsClientMessenger } from '../Infra/WebSockets/WebSocketsClientM
 import {
  SQSDomainEventSubscriberFactory,
  SQSEventMessageHandler,
-  SQSNewRelicEventMessageHandler,
+  SQSXRayEventMessageHandler,
 } from '@standardnotes/domain-events-infra'
 import { ApiGatewayAuthMiddleware } from '../Controller/ApiGatewayAuthMiddleware'

@@ -38,6 +38,8 @@ import { WebSocketsController } from '../Controller/WebSocketsController'
 import { WebSocketServerInterface } from '@standardnotes/api'
 import { ClientMessengerInterface } from '../Client/ClientMessengerInterface'
 import { WebSocketMessageRequestedEventHandler } from '../Domain/Handler/WebSocketMessageRequestedEventHandler'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+import { captureAWSv3Client } from 'aws-xray-sdk'

 export class ContainerConfigLoader {
  async load(): Promise<Container> {
@@ -86,16 +88,18 @@ export class ContainerConfigLoader {
          secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true),
        }
      }
-      container.bind<SQSClient>(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig))
+      container.bind<SQSClient>(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig)))
    }

    container.bind(TYPES.WEBSOCKETS_API_URL).toConstantValue(env.get('WEBSOCKETS_API_URL', true))

    container.bind<ApiGatewayManagementApiClient>(TYPES.WebSockets_ApiGatewayManagementApiClient).toConstantValue(
-      new ApiGatewayManagementApiClient({
-        endpoint: container.get(TYPES.WEBSOCKETS_API_URL),
-        region: env.get('API_GATEWAY_AWS_REGION', true) ?? 'us-east-1',
-      }),
+      captureAWSv3Client(
+        new ApiGatewayManagementApiClient({
+          endpoint: container.get(TYPES.WEBSOCKETS_API_URL),
+          region: env.get('API_GATEWAY_AWS_REGION', true) ?? 'us-east-1',
+        }),
+      ),
    )

    // Controller
@@ -154,7 +158,11 @@ export class ContainerConfigLoader {
      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
      .toConstantValue(
        env.get('NEW_RELIC_ENABLED', true) === 'true'
-          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          ? new SQSXRayEventMessageHandler(
+              ServiceIdentifier.NAMES.WebsocketsWorker,
+              eventHandlers,
+              container.get(TYPES.Logger),
+            )
          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
      )
    container
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
standardci	321353f26c	chore(release): publish new version - @standardnotes/analytics@2.28.0 - @standardnotes/api-gateway@1.77.1 - @standardnotes/auth-server@1.151.1 - @standardnotes/domain-core@1.35.0 - @standardnotes/domain-events-infra@1.14.8 - @standardnotes/event-store@1.12.11 - @standardnotes/files-server@1.26.3 - @standardnotes/home-server@1.16.29 - @standardnotes/revisions-server@1.39.5 - @standardnotes/scheduler-server@1.22.0 - @standardnotes/settings@1.21.43 - @standardnotes/syncing-server@1.111.3 - @standardnotes/websockets-server@1.12.0	2023-10-06 05:44:00 +00:00
Karol Sójko	db4607d4aa	chore: upgrade sqs-consumer	2023-10-06 07:26:59 +02:00
Karol Sójko	f0531d68cb	feat: add xray to analytics scheduler and websockets	2023-10-06 07:23:06 +02:00
Karol Sójko	8a00d159a6	Revert "fix: naming of segments for sqs handlers" This reverts commit `d244cc0d5f`.	2023-10-06 06:50:14 +02:00
Karol Sójko	d244cc0d5f	fix: naming of segments for sqs handlers	2023-10-05 18:06:17 +02:00
standardci	6a2aa4b148	chore(release): publish new version - @standardnotes/api-gateway@1.77.0 - @standardnotes/auth-server@1.151.0 - @standardnotes/home-server@1.16.28	2023-10-05 14:42:25 +00:00
Karol Sójko	3ee49416f8	feat: setting xray segment user on api-gateway level	2023-10-05 16:25:09 +02:00
standardci	ae1e86e19f	chore(release): publish new version - @standardnotes/home-server@1.16.27 - @standardnotes/revisions-server@1.39.4	2023-10-05 13:20:33 +00:00
Karol Sójko	9f76e389e2	fix(revisions): capture mysql to xray	2023-10-05 13:22:39 +02:00
standardci	6e2240e60c	chore(release): publish new version - @standardnotes/analytics@2.27.10 - @standardnotes/api-gateway@1.76.2 - @standardnotes/auth-server@1.150.9 - @standardnotes/domain-events-infra@1.14.7 - @standardnotes/event-store@1.12.10 - @standardnotes/files-server@1.26.2 - @standardnotes/home-server@1.16.26 - @standardnotes/revisions-server@1.39.3 - @standardnotes/scheduler-server@1.21.10 - @standardnotes/syncing-server@1.111.2 - @standardnotes/websockets-server@1.11.10	2023-10-05 07:17:33 +00:00
Karol Sójko	cd37c951bb	Revert "fix(domain-events-infra): setting user metadata on workers" This reverts commit `c4b6f17ebc`.	2023-10-05 09:00:47 +02:00
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