chore(deps): bump actions/setup-node from 3 to 4

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2026-03-26 03:01:13 -04:00 · 2023-11-06 06:55:37 +00:00
61 changed files with 251 additions and 209 deletions
--- a/.github/ci.env
+++ b/.github/ci.env
@@ -26,5 +26,3 @@ MYSQL_ROOT_PASSWORD=changeme123
 AUTH_JWT_SECRET=f95259c5e441f5a4646d76422cfb3df4c4488842901aa50b6c51b8be2e0040e9
 AUTH_SERVER_ENCRYPTION_SERVER_KEY=1087415dfde3093797f9a7ca93a49e7d7aa1861735eb0d32aae9c303b8c3d060
 VALET_TOKEN_SECRET=4b886819ebe1e908077c6cae96311b48a8416bd60cc91c03060e15bdf6b30d1f
-
-SYNCING_SERVER_CONTENT_SIZE_TRANSFER_LIMIT=1000000
--- a/.github/workflows/common-docker-image.yml
+++ b/.github/workflows/common-docker-image.yml
@@ -42,7 +42,7 @@ jobs:
        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
--- a/.github/workflows/e2e-home-server.yml
+++ b/.github/workflows/e2e-home-server.yml
@@ -46,7 +46,7 @@ jobs:
    - uses: actions/checkout@v4

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -70,7 +70,6 @@ jobs:
        echo "ACCESS_TOKEN_AGE=4" >> packages/home-server/.env
        echo "REFRESH_TOKEN_AGE=10" >> packages/home-server/.env
        echo "REVISIONS_FREQUENCY=2" >> packages/home-server/.env
-        echo "CONTENT_SIZE_TRANSFER_LIMIT=1000000" >> packages/home-server/.env
        echo "DB_HOST=localhost" >> packages/home-server/.env
        echo "DB_PORT=3306" >> packages/home-server/.env
        echo "DB_DATABASE=standardnotes" >> packages/home-server/.env
--- a/.github/workflows/e2e-self-hosted.yml
+++ b/.github/workflows/e2e-self-hosted.yml
@@ -29,7 +29,7 @@ jobs:
    - uses: actions/checkout@v4

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -20,7 +20,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -48,7 +48,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -80,7 +80,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -48,7 +48,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -80,7 +80,7 @@ jobs:
        key: ${{ runner.os }}-build-${{ github.sha }}

    - name: Set up Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
      with:
        registry-url: 'https://registry.npmjs.org'
        node-version-file: '.nvmrc'
@@ -151,7 +151,7 @@ jobs:
          git_commit_gpgsign: true

      - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          registry-url: 'https://registry.npmjs.org'
          node-version-file: '.nvmrc'
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [2.32.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.4...@standardnotes/analytics@2.32.5) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [2.32.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.32.3...@standardnotes/analytics@2.32.4) (2023-10-26)

 **Note:** Version bump only for package @standardnotes/analytics
--- a/packages/analytics/bin/report.ts
+++ b/packages/analytics/bin/report.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { EmailLevel, ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AnalyticsScheduledTask })
+sdk.start()
+
 import { Logger } from 'winston'

 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
@@ -16,7 +22,6 @@ import { CalculateMonthlyRecurringRevenue } from '../src/Domain/UseCase/Calculat
 import { getBody, getSubject } from '../src/Domain/Email/DailyAnalyticsReport'
 import { TimerInterface } from '@standardnotes/time'
 import { StatisticMeasureName } from '../src/Domain/Statistics/StatisticMeasureName'
-import { EmailLevel } from '@standardnotes/domain-core'

 const requestReport = async (
  analyticsStore: AnalyticsStoreInterface,
@@ -270,6 +275,9 @@ void container.load().then((container) => {

  logger.info(`Sending report to following admins: ${adminEmails}`)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.AnalyticsScheduledTask, 'report')
+
  Promise.resolve(
    requestReport(
      analyticsStore,
@@ -285,11 +293,15 @@ void container.load().then((container) => {
    .then(() => {
      logger.info('Usage report generation complete')

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not finish usage report generation: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/analytics/bin/worker.ts
+++ b/packages/analytics/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AnalyticsWorker })
+sdk.start()
+
 import { Logger } from 'winston'
 import { DomainEventSubscriberInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/analytics",
-  "version": "2.32.5",
+  "version": "2.32.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/analytics/src/Bootstrap/Container.ts
+++ b/packages/analytics/src/Bootstrap/Container.ts
@@ -7,7 +7,7 @@ import {
  DomainEventPublisherInterface,
  DomainEventSubscriberInterface,
 } 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')

@@ -16,9 +16,9 @@ import TYPES from './Types'
 import { AppDataSource } from './DataSource'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SNSOpenTelemetryDomainEventPublisher,
  SQSEventMessageHandler,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface'
@@ -139,7 +139,9 @@ export class ContainerConfigLoader {

    container
      .bind<DomainEventPublisherInterface>(TYPES.DomainEventPublisher)
-      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
+      .toConstantValue(
+        new SNSOpenTelemetryDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)),
+      )
    if (env.get('MIXPANEL_TOKEN', true)) {
      container.bind<Mixpanel>(TYPES.MixpanelClient).toConstantValue(Mixpanel.init(env.get('MIXPANEL_TOKEN', true)))
    }
@@ -240,7 +242,8 @@ export class ContainerConfigLoader {
    container
      .bind<DomainEventSubscriberInterface>(TYPES.DomainEventSubscriber)
      .toConstantValue(
-        new SQSDomainEventSubscriber(
+        new SQSOpenTelemetryDomainEventSubscriber(
+          ServiceIdentifier.NAMES.AnalyticsWorker,
          container.get<SQSClient>(TYPES.SQS),
          container.get<string>(TYPES.SQS_QUEUE_URL),
          container.get<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler),
--- a/packages/api-gateway/CHANGELOG.md
+++ b/packages/api-gateway/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.81.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.8...@standardnotes/api-gateway@1.81.9) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/api-gateway/issues/903)) ([751f3b2](https://github.com/standardnotes/api-gateway/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.81.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.81.7...@standardnotes/api-gateway@1.81.8) (2023-11-03)

 ### Bug Fixes
--- a/packages/api-gateway/bin/server.ts
+++ b/packages/api-gateway/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.ApiGateway })
+sdk.start()
+
 import '../src/Controller/LegacyController'
 import '../src/Controller/HealthCheckController'

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

-## [1.165.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.165.2...@standardnotes/auth-server@1.165.3) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.165.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.165.1...@standardnotes/auth-server@1.165.2) (2023-11-03)

 ### Bug Fixes
--- a/packages/auth/bin/backup.ts
+++ b/packages/auth/bin/backup.ts
@@ -1,6 +1,10 @@
 import 'reflect-metadata'

-import { SettingName } from '@standardnotes/domain-core'
+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier, SettingName } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask })
+sdk.start()

 import { Stream } from 'stream'

@@ -102,17 +106,24 @@ void container.load().then((container) => {
  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.Auth_DomainEventPublisher)
  const getUserKeyParamsUseCase: GetUserKeyParams = container.get(TYPES.Auth_GetUserKeyParams)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.AuthScheduledTask, 'backup')
+
  Promise.resolve(
    requestBackups(settingRepository, roleService, domainEventFactory, domainEventPublisher, getUserKeyParamsUseCase),
  )
    .then(() => {
      logger.info(`${backupFrequency} ${backupProvider} backup requesting complete`)

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not finish ${backupFrequency} ${backupProvider} backup requesting: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/auth/bin/cleanup.ts
+++ b/packages/auth/bin/cleanup.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask })
+sdk.start()
+
 import { Logger } from 'winston'

 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
@@ -30,15 +36,22 @@ void container.load().then((container) => {
  const cleanupSessionTraces: CleanupSessionTraces = container.get(TYPES.Auth_CleanupSessionTraces)
  const cleanupExpiredSessions: CleanupExpiredSessions = container.get(TYPES.Auth_CleanupExpiredSessions)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.AuthScheduledTask, 'cleanup')
+
  Promise.resolve(cleanup(cleanupSessionTraces, cleanupExpiredSessions))
    .then(() => {
      logger.info('Expired sessions and session traces cleaned.')

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not clean sessions and session traces: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/auth/bin/server.ts
+++ b/packages/auth/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.Auth })
+sdk.start()
+
 import '../src/Infra/InversifyExpressUtils/AnnotatedAuthController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedAuthenticatorsController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedSessionsController'
--- a/packages/auth/bin/stats.ts
+++ b/packages/auth/bin/stats.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask })
+sdk.start()
+
 import { Logger } from 'winston'
 import { TimerInterface } from '@standardnotes/time'

@@ -20,6 +26,9 @@ void container.load().then((container) => {
  const persistStats: PersistStatistics = container.get(TYPES.Auth_PersistStatistics)
  const timer: TimerInterface = container.get(TYPES.Auth_Timer)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.AuthScheduledTask, 'stats')
+
  Promise.resolve(
    persistStats.execute({
      sessionsInADay: timer.getUTCDateNDaysAgo(1),
@@ -28,11 +37,15 @@ void container.load().then((container) => {
    .then(() => {
      logger.info('Stats persisted.')

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not persist stats: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/auth/bin/user_email_backup.ts
+++ b/packages/auth/bin/user_email_backup.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { Email, ServiceIdentifier, SettingName } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthScheduledTask })
+sdk.start()
+
 import { Logger } from 'winston'
 import * as dayjs from 'dayjs'
 import * as utc from 'dayjs/plugin/utc'
@@ -15,7 +21,6 @@ import { RoleServiceInterface } from '../src/Domain/Role/RoleServiceInterface'
 import { PermissionName } from '@standardnotes/features'
 import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
 import { GetUserKeyParams } from '../src/Domain/UseCase/GetUserKeyParams/GetUserKeyParams'
-import { Email, SettingName } from '@standardnotes/domain-core'

 const inputArgs = process.argv.slice(2)
 const backupEmail = inputArgs[0]
@@ -89,6 +94,9 @@ void container.load().then((container) => {
  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.Auth_DomainEventPublisher)
  const getUserKeyParamsUseCase: GetUserKeyParams = container.get(TYPES.Auth_GetUserKeyParams)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.AuthScheduledTask, 'user_email_backup')
+
  Promise.resolve(
    requestBackups(
      userRepository,
@@ -102,11 +110,15 @@ void container.load().then((container) => {
    .then(() => {
      logger.info(`Email backup requesting complete for ${backupEmail}`)

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not finish email backup requesting for ${backupEmail}: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/auth/bin/worker.ts
+++ b/packages/auth/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.AuthWorker })
+sdk.start()
+
 import { Logger } from 'winston'

 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.165.3",
+  "version": "1.165.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/auth/src/Bootstrap/Container.ts
+++ b/packages/auth/src/Bootstrap/Container.ts
@@ -79,9 +79,9 @@ import { ExtensionKeyGrantedEventHandler } from '../Domain/Handler/ExtensionKeyG
 import {
  DirectCallDomainEventPublisher,
  DirectCallEventMessageHandler,
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SNSOpenTelemetryDomainEventPublisher,
  SQSEventMessageHandler,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { GetUserSubscription } from '../Domain/UseCase/GetUserSubscription/GetUserSubscription'
 import { ChangeCredentials } from '../Domain/UseCase/ChangeCredentials/ChangeCredentials'
@@ -170,6 +170,7 @@ import {
  ControllerContainer,
  ControllerContainerInterface,
  MapperInterface,
+  ServiceIdentifier,
  SharedVaultUser,
 } from '@standardnotes/domain-core'
 import { SessionTracePersistenceMapper } from '../Mapping/SessionTracePersistenceMapper'
@@ -378,7 +379,10 @@ export class ContainerConfigLoader {
      .toConstantValue(
        isConfiguredForHomeServer
          ? directCallDomainEventPublisher
-          : new SNSDomainEventPublisher(container.get(TYPES.Auth_SNS), container.get(TYPES.Auth_SNS_TOPIC_ARN)),
+          : new SNSOpenTelemetryDomainEventPublisher(
+              container.get(TYPES.Auth_SNS),
+              container.get(TYPES.Auth_SNS_TOPIC_ARN),
+            ),
      )

    // Mapping
@@ -1510,7 +1514,8 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventSubscriberInterface>(TYPES.Auth_DomainEventSubscriber)
        .toConstantValue(
-          new SQSDomainEventSubscriber(
+          new SQSOpenTelemetryDomainEventSubscriber(
+            ServiceIdentifier.NAMES.AuthWorker,
            container.get<SQSClient>(TYPES.Auth_SQS),
            container.get<string>(TYPES.Auth_SQS_QUEUE_URL),
            container.get<DomainEventMessageHandlerInterface>(TYPES.Auth_DomainEventMessageHandler),
--- a/packages/domain-events-infra/CHANGELOG.md
+++ b/packages/domain-events-infra/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.20.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.20.2...@standardnotes/domain-events-infra@1.20.3) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.20.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.20.1...@standardnotes/domain-events-infra@1.20.2) (2023-10-19)

 **Note:** Version bump only for package @standardnotes/domain-events-infra
--- 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.20.3",
+  "version": "1.20.2",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriber.ts
+++ b/packages/domain-events-infra/src/Infra/SQS/SQSDomainEventSubscriber.ts
@@ -1,36 +0,0 @@
-import { Consumer } from 'sqs-consumer'
-import { Message, SQSClient } from '@aws-sdk/client-sqs'
-import { DomainEventSubscriberInterface, DomainEventMessageHandlerInterface } from '@standardnotes/domain-events'
-import { Logger } from 'winston'
-
-export class SQSDomainEventSubscriber implements DomainEventSubscriberInterface {
-  constructor(
-    private sqs: SQSClient,
-    private queueUrl: string,
-    private domainEventMessageHandler: DomainEventMessageHandlerInterface,
-    private logger: Logger,
-  ) {}
-
-  start(): void {
-    const sqsConsumer = Consumer.create({
-      attributeNames: ['All'],
-      messageAttributeNames: ['All'],
-      queueUrl: this.queueUrl,
-      sqs: this.sqs,
-      handleMessage: this.handleMessage.bind(this),
-    })
-
-    sqsConsumer.on('error', this.handleError.bind(this))
-    sqsConsumer.on('processing_error', this.handleError.bind(this))
-
-    sqsConsumer.start()
-  }
-
-  async handleMessage(message: Message): Promise<void> {
-    await this.domainEventMessageHandler.handleMessage(<string>message.Body)
-  }
-
-  handleError(error: Error): void {
-    this.logger.error('Error occured while handling SQS message: %O', error)
-  }
-}
--- a/packages/domain-events-infra/src/Infra/index.ts
+++ b/packages/domain-events-infra/src/Infra/index.ts
@@ -15,7 +15,6 @@ export * from './SNS/SNSDomainEventPublisher'
 export * from './SNS/SNSOpenTelemetryDomainEventPublisher'

 export * from './SQS/SQSBounceNotificiationHandler'
-export * from './SQS/SQSDomainEventSubscriber'
 export * from './SQS/SQSDomainEventSubscriberFactory'
 export * from './SQS/SQSEventMessageHandler'
 export * from './SQS/SQSOpenTelemetryDomainEventSubscriber'
--- a/packages/event-store/CHANGELOG.md
+++ b/packages/event-store/CHANGELOG.md
@@ -3,10 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.13.18](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.13.17...@standardnotes/event-store@1.13.18) (2023-11-07)
-
-**Note:** Version bump only for package @standardnotes/event-store
-
 ## [1.13.17](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.13.16...@standardnotes/event-store@1.13.17) (2023-10-26)

 **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.13.18",
+  "version": "1.13.17",
  "description": "Event Store Service",
  "private": true,
  "main": "dist/src/index.js",
--- a/packages/files/CHANGELOG.md
+++ b/packages/files/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.32.4](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.32.3...@standardnotes/files-server@1.32.4) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/files/issues/903)) ([751f3b2](https://github.com/standardnotes/files/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.32.3](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.32.2...@standardnotes/files-server@1.32.3) (2023-10-31)

 ### Bug Fixes
--- a/packages/files/bin/server.ts
+++ b/packages/files/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.Files })
+sdk.start()
+
 import * as busboy from 'connect-busboy'

 import '../src/Infra/InversifyExpress/AnnotatedFallbackController'
--- a/packages/files/bin/worker.ts
+++ b/packages/files/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.FilesWorker })
+sdk.start()
+
 import { Logger } from 'winston'

 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.32.4",
+  "version": "1.32.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/files/src/Bootstrap/Container.ts
+++ b/packages/files/src/Bootstrap/Container.ts
@@ -16,9 +16,9 @@ import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
  DirectCallDomainEventPublisher,
  DirectCallEventMessageHandler,
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SNSOpenTelemetryDomainEventPublisher,
  SQSEventMessageHandler,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { StreamDownloadFile } from '../Domain/UseCase/StreamDownloadFile/StreamDownloadFile'
 import { FileDownloaderInterface } from '../Domain/Services/FileDownloaderInterface'
@@ -52,6 +52,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?: {
@@ -174,7 +175,10 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventPublisherInterface>(TYPES.Files_DomainEventPublisher)
        .toConstantValue(
-          new SNSDomainEventPublisher(container.get(TYPES.Files_SNS), container.get(TYPES.Files_SNS_TOPIC_ARN)),
+          new SNSOpenTelemetryDomainEventPublisher(
+            container.get(TYPES.Files_SNS),
+            container.get(TYPES.Files_SNS_TOPIC_ARN),
+          ),
        )
    }

@@ -297,7 +301,8 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventSubscriberInterface>(TYPES.Files_DomainEventSubscriber)
        .toConstantValue(
-          new SQSDomainEventSubscriber(
+          new SQSOpenTelemetryDomainEventSubscriber(
+            ServiceIdentifier.NAMES.FilesWorker,
            container.get<SQSClient>(TYPES.Files_SQS),
            container.get<string>(TYPES.Files_SQS_QUEUE_URL),
            container.get<DomainEventMessageHandlerInterface>(TYPES.Files_DomainEventMessageHandler),
--- a/packages/home-server/CHANGELOG.md
+++ b/packages/home-server/CHANGELOG.md
@@ -3,14 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.18.22](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.18.21...@standardnotes/home-server@1.18.22) (2023-11-07)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
-## [1.18.21](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.18.20...@standardnotes/home-server@1.18.21) (2023-11-06)
-
-**Note:** Version bump only for package @standardnotes/home-server
-
 ## [1.18.20](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.18.19...@standardnotes/home-server@1.18.20) (2023-11-03)

 **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.18.22",
+  "version": "1.18.20",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/CHANGELOG.md
+++ b/packages/revisions/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.47.4](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.47.3...@standardnotes/revisions-server@1.47.4) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.47.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.47.2...@standardnotes/revisions-server@1.47.3) (2023-10-26)

 **Note:** Version bump only for package @standardnotes/revisions-server
--- a/packages/revisions/bin/server.ts
+++ b/packages/revisions/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.Revisions })
+sdk.start()
+
 import * as cors from 'cors'
 import { urlencoded, json, Request, Response, NextFunction } from 'express'
 import * as winston from 'winston'
--- a/packages/revisions/bin/worker.ts
+++ b/packages/revisions/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.RevisionsWorker })
+sdk.start()
+
 import { Logger } from 'winston'

 import TYPES from '../src/Bootstrap/Types'
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.47.4",
+  "version": "1.47.3",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/src/Bootstrap/Container.ts
+++ b/packages/revisions/src/Bootstrap/Container.ts
@@ -1,4 +1,9 @@
-import { ControllerContainer, ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core'
+import {
+  ControllerContainer,
+  ControllerContainerInterface,
+  MapperInterface,
+  ServiceIdentifier,
+} from '@standardnotes/domain-core'
 import { Container, interfaces } from 'inversify'
 import { Repository } from 'typeorm'
 import * as winston from 'winston'
@@ -29,7 +34,7 @@ import {
  SQSEventMessageHandler,
  DirectCallEventMessageHandler,
  DirectCallDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { DumpRepositoryInterface } from '../Domain/Dump/DumpRepositoryInterface'
 import { AccountDeletionRequestedEventHandler } from '../Domain/Handler/AccountDeletionRequestedEventHandler'
@@ -337,7 +342,8 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventSubscriberInterface>(TYPES.Revisions_DomainEventSubscriber)
        .toConstantValue(
-          new SQSDomainEventSubscriber(
+          new SQSOpenTelemetryDomainEventSubscriber(
+            ServiceIdentifier.NAMES.RevisionsWorker,
            container.get<SQSClient>(TYPES.Revisions_SQS),
            container.get<string>(TYPES.Revisions_SQS_QUEUE_URL),
            container.get<DomainEventMessageHandlerInterface>(TYPES.Revisions_DomainEventMessageHandler),
--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.26.5](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.26.4...@standardnotes/scheduler-server@1.26.5) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.26.4](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.26.3...@standardnotes/scheduler-server@1.26.4) (2023-10-26)

 **Note:** Version bump only for package @standardnotes/scheduler-server
--- a/packages/scheduler/bin/verify.ts
+++ b/packages/scheduler/bin/verify.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK, OpenTelemetryTracer } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.SchedulerScheduledTask })
+sdk.start()
+
 import { Logger } from 'winston'
 import * as dayjs from 'dayjs'
 import * as utc from 'dayjs/plugin/utc'
@@ -29,15 +35,22 @@ void container.load().then((container) => {

  const verifyPredicates: VerifyPredicates = container.get(TYPES.VerifyPredicates)

+  const tracer = new OpenTelemetryTracer()
+  tracer.startSpan(ServiceIdentifier.NAMES.SchedulerScheduledTask, 'verify')
+
  Promise.resolve(verifyJobs(now, verifyPredicates))
    .then(() => {
      logger.info('Verification of overdue jobs complete.')

+      tracer.stopSpan()
+
      process.exit(0)
    })
    .catch((error) => {
      logger.error(`Could not finish verification of overdue jobs: ${error.message}`)

+      tracer.stopSpanWithError(error)
+
      process.exit(1)
    })
 })
--- a/packages/scheduler/bin/worker.ts
+++ b/packages/scheduler/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.SchedulerWorker })
+sdk.start()
+
 import { Logger } from 'winston'
 import { DomainEventSubscriberInterface } from '@standardnotes/domain-events'
 import * as dayjs from 'dayjs'
--- a/packages/scheduler/package.json
+++ b/packages/scheduler/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/scheduler-server",
-  "version": "1.26.5",
+  "version": "1.26.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/scheduler/src/Bootstrap/Container.ts
+++ b/packages/scheduler/src/Bootstrap/Container.ts
@@ -15,9 +15,9 @@ import TYPES from './Types'
 import { AppDataSource } from './DataSource'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SNSOpenTelemetryDomainEventPublisher,
  SQSEventMessageHandler,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { Timer, TimerInterface } from '@standardnotes/time'
 import { PredicateRepositoryInterface } from '../Domain/Predicate/PredicateRepositoryInterface'
@@ -35,6 +35,7 @@ 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'

 export class ContainerConfigLoader {
  async load(): Promise<Container> {
@@ -135,7 +136,9 @@ export class ContainerConfigLoader {

    container
      .bind<DomainEventPublisherInterface>(TYPES.DomainEventPublisher)
-      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
+      .toConstantValue(
+        new SNSOpenTelemetryDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)),
+      )

    const eventHandlers: Map<string, DomainEventHandlerInterface> = new Map([
      ['PREDICATE_VERIFIED', container.get(TYPES.PredicateVerifiedEventHandler)],
@@ -150,7 +153,8 @@ export class ContainerConfigLoader {
    container
      .bind<DomainEventSubscriberInterface>(TYPES.DomainEventSubscriber)
      .toConstantValue(
-        new SQSDomainEventSubscriber(
+        new SQSOpenTelemetryDomainEventSubscriber(
+          ServiceIdentifier.NAMES.SchedulerWorker,
          container.get<SQSClient>(TYPES.SQS),
          container.get<string>(TYPES.SQS_QUEUE_URL),
          container.get<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler),
--- a/packages/syncing-server/CHANGELOG.md
+++ b/packages/syncing-server/CHANGELOG.md
@@ -3,18 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.120.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.120.1...@standardnotes/syncing-server@1.120.2) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/syncing-server-js/issues/903)) ([751f3b2](https://github.com/standardnotes/syncing-server-js/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
-## [1.120.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.120.0...@standardnotes/syncing-server@1.120.1) (2023-11-06)
-
-### Bug Fixes
-
-* **syncing-server:** return cursor token upon transfer limit breached ([#902](https://github.com/standardnotes/syncing-server-js/issues/902)) ([71689c1](https://github.com/standardnotes/syncing-server-js/commit/71689c1497728569fc6a07e21fa7bdba68c1bac0))
-
 # [1.120.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.119.4...@standardnotes/syncing-server@1.120.0) (2023-11-02)

 ### Features
--- a/packages/syncing-server/bin/server.ts
+++ b/packages/syncing-server/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.SyncingServer })
+sdk.start()
+
 import '../src/Infra/InversifyExpressUtils/AnnotatedFallbackController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedItemsController'
--- a/packages/syncing-server/bin/worker.ts
+++ b/packages/syncing-server/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.SyncingServerWorker })
+sdk.start()
+
 import { Logger } from 'winston'

 import TYPES from '../src/Bootstrap/Types'
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.120.2",
+  "version": "1.120.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/syncing-server/src/Bootstrap/Container.ts
+++ b/packages/syncing-server/src/Bootstrap/Container.ts
@@ -11,9 +11,9 @@ import { Item } from '../Domain/Item/Item'
 import {
  DirectCallDomainEventPublisher,
  DirectCallEventMessageHandler,
-  SNSDomainEventPublisher,
-  SQSDomainEventSubscriber,
+  SNSOpenTelemetryDomainEventPublisher,
  SQSEventMessageHandler,
+  SQSOpenTelemetryDomainEventSubscriber,
 } from '@standardnotes/domain-events-infra'
 import { DomainEventFactoryInterface } from '../Domain/Event/DomainEventFactoryInterface'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
@@ -58,6 +58,7 @@ import {
  ControllerContainer,
  ControllerContainerInterface,
  MapperInterface,
+  ServiceIdentifier,
  SharedVaultUser,
 } from '@standardnotes/domain-core'
 import { BaseItemsController } from '../Infra/InversifyExpressUtils/Base/BaseItemsController'
@@ -251,7 +252,7 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventPublisherInterface>(TYPES.Sync_DomainEventPublisher)
        .toDynamicValue((context: interfaces.Context) => {
-          return new SNSDomainEventPublisher(
+          return new SNSOpenTelemetryDomainEventPublisher(
            context.container.get(TYPES.Sync_SNS),
            context.container.get(TYPES.Sync_SNS_TOPIC_ARN),
          )
@@ -1021,7 +1022,8 @@ export class ContainerConfigLoader {
      container
        .bind<DomainEventSubscriberInterface>(TYPES.Sync_DomainEventSubscriber)
        .toConstantValue(
-          new SQSDomainEventSubscriber(
+          new SQSOpenTelemetryDomainEventSubscriber(
+            ServiceIdentifier.NAMES.SyncingServerWorker,
            container.get<SQSClient>(TYPES.Sync_SQS),
            container.get<string>(TYPES.Sync_SQS_QUEUE_URL),
            container.get<DomainEventMessageHandlerInterface>(TYPES.Sync_DomainEventMessageHandler),
--- a/packages/syncing-server/src/Domain/Item/ItemTransferCalculator.spec.ts
+++ b/packages/syncing-server/src/Domain/Item/ItemTransferCalculator.spec.ts
@@ -25,14 +25,11 @@ describe('ItemTransferCalculator', () => {

      const result = await createCalculator().computeItemUuidsToFetch(itemContentSizeDescriptors, 50)

-      expect(result).toEqual({
-        uuids: [
-          '00000000-0000-0000-0000-000000000000',
-          '00000000-0000-0000-0000-000000000001',
-          '00000000-0000-0000-0000-000000000002',
-        ],
-        transferLimitBreachedBeforeEndOfItems: false,
-      })
+      expect(result).toEqual([
+        '00000000-0000-0000-0000-000000000000',
+        '00000000-0000-0000-0000-000000000001',
+        '00000000-0000-0000-0000-000000000002',
+      ])
    })

    it('should compute uuids to fetch based on transfer limit - exact limit fit', async () => {
@@ -44,10 +41,7 @@ describe('ItemTransferCalculator', () => {

      const result = await createCalculator().computeItemUuidsToFetch(itemContentSizeDescriptors, 40)

-      expect(result).toEqual({
-        uuids: ['00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000001'],
-        transferLimitBreachedBeforeEndOfItems: true,
-      })
+      expect(result).toEqual(['00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000001'])
    })

    it('should compute uuids to fetch based on transfer limit - content size not defined on an item', async () => {
@@ -59,14 +53,11 @@ describe('ItemTransferCalculator', () => {

      const result = await createCalculator().computeItemUuidsToFetch(itemContentSizeDescriptors, 50)

-      expect(result).toEqual({
-        uuids: [
-          '00000000-0000-0000-0000-000000000000',
-          '00000000-0000-0000-0000-000000000001',
-          '00000000-0000-0000-0000-000000000002',
-        ],
-        transferLimitBreachedBeforeEndOfItems: false,
-      })
+      expect(result).toEqual([
+        '00000000-0000-0000-0000-000000000000',
+        '00000000-0000-0000-0000-000000000001',
+        '00000000-0000-0000-0000-000000000002',
+      ])
    })

    it('should compute uuids to fetch based on transfer limit - first item over the limit', async () => {
@@ -78,10 +69,7 @@ describe('ItemTransferCalculator', () => {

      const result = await createCalculator().computeItemUuidsToFetch(itemContentSizeDescriptors, 40)

-      expect(result).toEqual({
-        uuids: ['00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000001'],
-        transferLimitBreachedBeforeEndOfItems: true,
-      })
+      expect(result).toEqual(['00000000-0000-0000-0000-000000000000', '00000000-0000-0000-0000-000000000001'])
    })
  })

--- a/packages/syncing-server/src/Domain/Item/ItemTransferCalculator.ts
+++ b/packages/syncing-server/src/Domain/Item/ItemTransferCalculator.ts
@@ -9,17 +9,16 @@ export class ItemTransferCalculator implements ItemTransferCalculatorInterface {
  async computeItemUuidsToFetch(
    itemContentSizeDescriptors: ItemContentSizeDescriptor[],
    bytesTransferLimit: number,
-  ): Promise<{ uuids: Array<string>; transferLimitBreachedBeforeEndOfItems: boolean }> {
+  ): Promise<Array<string>> {
    const itemUuidsToFetch = []
    let totalContentSizeInBytes = 0
-    let transferLimitBreached = false
    for (const itemContentSize of itemContentSizeDescriptors) {
      const contentSize = itemContentSize.props.contentSize ?? 0

      itemUuidsToFetch.push(itemContentSize.props.uuid.value)
      totalContentSizeInBytes += contentSize

-      transferLimitBreached = this.isTransferLimitBreached({
+      const transferLimitBreached = this.isTransferLimitBreached({
        totalContentSizeInBytes,
        bytesTransferLimit,
        itemUuidsToFetch,
@@ -31,11 +30,7 @@ export class ItemTransferCalculator implements ItemTransferCalculatorInterface {
      }
    }

-    return {
-      uuids: itemUuidsToFetch,
-      transferLimitBreachedBeforeEndOfItems:
-        transferLimitBreached && itemUuidsToFetch.length < itemContentSizeDescriptors.length,
-    }
+    return itemUuidsToFetch
  }

  async computeItemUuidBundlesToFetch(
--- a/packages/syncing-server/src/Domain/Item/ItemTransferCalculatorInterface.ts
+++ b/packages/syncing-server/src/Domain/Item/ItemTransferCalculatorInterface.ts
@@ -4,7 +4,7 @@ export interface ItemTransferCalculatorInterface {
  computeItemUuidsToFetch(
    itemContentSizeDescriptors: ItemContentSizeDescriptor[],
    bytesTransferLimit: number,
-  ): Promise<{ uuids: Array<string>; transferLimitBreachedBeforeEndOfItems: boolean }>
+  ): Promise<Array<string>>
  computeItemUuidBundlesToFetch(
    itemContentSizeDescriptors: ItemContentSizeDescriptor[],
    bytesTransferLimit: number,
--- a/packages/syncing-server/src/Domain/UseCase/Syncing/GetItems/GetItems.spec.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItems/GetItems.spec.ts
@@ -49,9 +49,7 @@ describe('GetItems', () => {
      .mockResolvedValue([ItemContentSizeDescriptor.create('00000000-0000-0000-0000-000000000000', 20).getValue()])

    itemTransferCalculator = {} as jest.Mocked<ItemTransferCalculatorInterface>
-    itemTransferCalculator.computeItemUuidsToFetch = jest
-      .fn()
-      .mockResolvedValue({ uuids: ['item-uuid'], transferLimitBreachedBeforeEndOfItems: false })
+    itemTransferCalculator.computeItemUuidsToFetch = jest.fn().mockResolvedValue(['item-uuid'])

    timer = {} as jest.Mocked<TimerInterface>
    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(123)
--- a/packages/syncing-server/src/Domain/UseCase/Syncing/GetItems/GetItems.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Syncing/GetItems/GetItems.ts
@@ -60,22 +60,22 @@ export class GetItems implements UseCaseInterface<GetItemsResult> {
    }

    const itemContentSizeDescriptors = await this.itemRepository.findContentSizeForComputingTransferLimit(itemQuery)
-    const { uuids, transferLimitBreachedBeforeEndOfItems } = await this.itemTransferCalculator.computeItemUuidsToFetch(
+    const itemUuidsToFetch = await this.itemTransferCalculator.computeItemUuidsToFetch(
      itemContentSizeDescriptors,
      this.contentSizeTransferLimit,
    )
    let items: Array<Item> = []
-    if (uuids.length > 0) {
+    if (itemUuidsToFetch.length > 0) {
      items = await this.itemRepository.findAll({
-        uuids,
+        uuids: itemUuidsToFetch,
        sortBy: 'updated_at_timestamp',
        sortOrder: 'ASC',
      })
    }
+    const totalItemsCount = await this.itemRepository.countAll(itemQuery)

    let cursorToken = undefined
-    const thereAreStillMoreItemsToFetch = await this.stillMoreItemsToFetch(itemQuery, upperBoundLimit)
-    if (transferLimitBreachedBeforeEndOfItems || thereAreStillMoreItemsToFetch) {
+    if (totalItemsCount > upperBoundLimit) {
      const lastSyncTime = items[items.length - 1].props.timestamps.updatedAt / Time.MicrosecondsInASecond
      cursorToken = Buffer.from(`${this.SYNC_TOKEN_VERSION}:${lastSyncTime}`, 'utf-8').toString('base64')
    }
@@ -87,12 +87,6 @@ export class GetItems implements UseCaseInterface<GetItemsResult> {
    })
  }

-  private async stillMoreItemsToFetch(itemQuery: ItemQuery, upperBoundLimit: number): Promise<boolean> {
-    const totalItemsCount = await this.itemRepository.countAll(itemQuery)
-
-    return totalItemsCount > upperBoundLimit
-  }
-
  private getLastSyncTime(dto: GetItemsDTO): Result<number | null> {
    let token = dto.syncToken
    if (dto.cursorToken !== undefined && dto.cursorToken !== null) {
--- a/packages/websockets/CHANGELOG.md
+++ b/packages/websockets/CHANGELOG.md
@@ -3,12 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.17.5](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.17.4...@standardnotes/websockets-server@1.17.5) (2023-11-07)
-
-### Bug Fixes
-
-* remove open telemetry from code ([#903](https://github.com/standardnotes/server/issues/903)) ([751f3b2](https://github.com/standardnotes/server/commit/751f3b25476c5be3d663ad8540c43266acd39493))
-
 ## [1.17.4](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.17.3...@standardnotes/websockets-server@1.17.4) (2023-10-26)

 **Note:** Version bump only for package @standardnotes/websockets-server
--- a/packages/websockets/bin/server.ts
+++ b/packages/websockets/bin/server.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.Websockets })
+sdk.start()
+
 import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController'
 import '../src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController'

--- a/packages/websockets/bin/worker.ts
+++ b/packages/websockets/bin/worker.ts
@@ -1,5 +1,11 @@
 import 'reflect-metadata'

+import { OpenTelemetrySDK } from '@standardnotes/domain-events-infra'
+import { ServiceIdentifier } from '@standardnotes/domain-core'
+
+const sdk = new OpenTelemetrySDK({ serviceName: ServiceIdentifier.NAMES.WebsocketsWorker })
+sdk.start()
+
 import { Logger } from 'winston'

 import { ContainerConfigLoader } from '../src/Bootstrap/Container'
--- a/packages/websockets/package.json
+++ b/packages/websockets/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.17.5",
+  "version": "1.17.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/websockets/src/Bootstrap/Container.ts
+++ b/packages/websockets/src/Bootstrap/Container.ts
@@ -18,7 +18,7 @@ import { RedisWebSocketsConnectionRepository } from '../Infra/Redis/RedisWebSock
 import { AddWebSocketsConnection } from '../Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection'
 import { RemoveWebSocketsConnection } from '../Domain/UseCase/RemoveWebSocketsConnection/RemoveWebSocketsConnection'
 import { WebSocketsClientMessenger } from '../Infra/WebSockets/WebSocketsClientMessenger'
-import { SQSDomainEventSubscriber, SQSEventMessageHandler } from '@standardnotes/domain-events-infra'
+import { SQSEventMessageHandler, SQSOpenTelemetryDomainEventSubscriber } from '@standardnotes/domain-events-infra'
 import { ApiGatewayAuthMiddleware } from '../Controller/ApiGatewayAuthMiddleware'

 import {
@@ -34,6 +34,7 @@ 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'

 export class ContainerConfigLoader {
  async load(): Promise<Container> {
@@ -144,7 +145,8 @@ export class ContainerConfigLoader {
    container
      .bind<DomainEventSubscriberInterface>(TYPES.DomainEventSubscriber)
      .toConstantValue(
-        new SQSDomainEventSubscriber(
+        new SQSOpenTelemetryDomainEventSubscriber(
+          ServiceIdentifier.NAMES.WebsocketsWorker,
          container.get<SQSClient>(TYPES.SQS),
          container.get<string>(TYPES.SQS_QUEUE_URL),
          container.get<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler),