chore(release): publish new version

- @standardnotes/analytics@2.28.8 - @standardnotes/api-gateway@1.78.5 - @standardnotes/auth-server@1.155.0 - @standardnotes/domain-events-infra@1.16.4 - @standardnotes/event-store@1.12.18 - @standardnotes/files-server@1.28.4 - @standardnotes/home-server@1.16.43 - @standardnotes/revisions-server@1.43.0 - @standardnotes/scheduler-server@1.22.8 - @standardnotes/syncing-server@1.115.0 - @standardnotes/websockets-server@1.14.4
fix(syncing-server): add option to define otel ratio
2026-01-22 02:04:30 -05:00 · 2023-10-10 06:32:17 +00:00 · 2023-10-10 08:16:00 +02:00 · 2023-10-10 08:16:00 +02:00 · 2023-10-09 18:10:27 +00:00 · 2023-10-09 19:50:02 +02:00
34 changed files with 343 additions and 24 deletions
--- a/packages/analytics/CHANGELOG.md
+++ b/packages/analytics/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.28.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.7...@standardnotes/analytics@2.28.8) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.28.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.6...@standardnotes/analytics@2.28.7) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.28.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.5...@standardnotes/analytics@2.28.6) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.28.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.4...@standardnotes/analytics@2.28.5) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.28.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.28.3...@standardnotes/analytics@2.28.4) (2023-10-09)

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

+## [1.78.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.78.4...@standardnotes/api-gateway@1.78.5) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.78.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.78.3...@standardnotes/api-gateway@1.78.4) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.78.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.78.2...@standardnotes/api-gateway@1.78.3) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.78.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.78.1...@standardnotes/api-gateway@1.78.2) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.78.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.78.0...@standardnotes/api-gateway@1.78.1) (2023-10-09)

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

+# [1.155.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.154.3...@standardnotes/auth-server@1.155.0) (2023-10-10)
+
+### Features
+
+* add more logs to transition ([783fd9e](https://github.com/standardnotes/server/commit/783fd9e2c6350a7f0f1e8d009d01a3328564aca0))
+
+## [1.154.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.154.2...@standardnotes/auth-server@1.154.3) (2023-10-09)
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/server/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.154.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.154.1...@standardnotes/auth-server@1.154.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/server/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.154.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.154.0...@standardnotes/auth-server@1.154.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/server/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.154.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.153.0...@standardnotes/auth-server@1.154.0) (2023-10-09)

 ### Features
--- a/packages/auth/bin/transition.ts
+++ b/packages/auth/bin/transition.ts
@@ -17,6 +17,7 @@ import { RoleName, TransitionStatus } from '@standardnotes/domain-core'
 const inputArgs = process.argv.slice(2)
 const startDateString = inputArgs[0]
 const endDateString = inputArgs[1]
+const forceRunParam = inputArgs[2]

 const requestTransition = async (
  transitionStatusRepository: TransitionStatusRepositoryInterface,
@@ -38,6 +39,7 @@ const requestTransition = async (
  )

  let usersTriggered = 0
+  const forceRun = forceRunParam === 'true'
  for (const user of users) {
    const itemsTransitionStatus = await transitionStatusRepository.getStatus(user.uuid, 'items')
    const revisionsTransitionStatus = await transitionStatusRepository.getStatus(user.uuid, 'revisions')
@@ -55,7 +57,11 @@ const requestTransition = async (

    let wasTransitionRequested = false

-    if (itemsTransitionStatus === null || itemsTransitionStatus.value === TransitionStatus.STATUSES.Failed) {
+    if (
+      itemsTransitionStatus === null ||
+      itemsTransitionStatus.value === TransitionStatus.STATUSES.Failed ||
+      (itemsTransitionStatus.value === TransitionStatus.STATUSES.InProgress && forceRun)
+    ) {
      wasTransitionRequested = true
      await transitionStatusRepository.remove(user.uuid, 'items')

@@ -68,7 +74,11 @@ const requestTransition = async (
      )
    }

-    if (revisionsTransitionStatus === null || revisionsTransitionStatus.value === TransitionStatus.STATUSES.Failed) {
+    if (
+      revisionsTransitionStatus === null ||
+      revisionsTransitionStatus.value === TransitionStatus.STATUSES.Failed ||
+      (revisionsTransitionStatus.value === TransitionStatus.STATUSES.InProgress && forceRun)
+    ) {
      wasTransitionRequested = true
      await transitionStatusRepository.remove(user.uuid, 'revisions')

--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/auth-server",
-  "version": "1.154.0",
+  "version": "1.155.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/auth/src/Bootstrap/Container.ts
+++ b/packages/auth/src/Bootstrap/Container.ts
@@ -1246,7 +1246,11 @@ export class ContainerConfigLoader {
        .toConstantValue(
          isConfiguredForHomeServerOrSelfHosting
            ? new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger))
-            : new SQSOpenTelemetryEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)),
+            : new SQSOpenTelemetryEventMessageHandler(
+                ServiceIdentifier.NAMES.AuthWorker,
+                eventHandlers,
+                container.get(TYPES.Auth_Logger),
+              ),
        )

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

+## [1.16.4](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.16.3...@standardnotes/domain-events-infra@1.16.4) (2023-10-10)
+
+### Bug Fixes
+
+* **syncing-server:** add option to define otel ratio ([c021bb3](https://github.com/standardnotes/server/commit/c021bb3d7ca90179292e7c75f5a84bf2b941ce86))
+
+## [1.16.3](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.16.2...@standardnotes/domain-events-infra@1.16.3) (2023-10-09)
+
+### Bug Fixes
+
+* **domain-events-infra:** add parent context on internal span ([099c6e1](https://github.com/standardnotes/server/commit/099c6e10c69b6b81006f59bcdb35325b545ab39c))
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/server/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.16.2](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.16.1...@standardnotes/domain-events-infra@1.16.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/server/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.16.1](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.16.0...@standardnotes/domain-events-infra@1.16.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/server/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.16.0](https://github.com/standardnotes/server/compare/@standardnotes/domain-events-infra@1.15.0...@standardnotes/domain-events-infra@1.16.0) (2023-10-09)

 ### Features
--- 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.16.0",
+  "version": "1.16.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/domain-events-infra/src/Infra/OpenTelemetry/OpenTelemetrySDK.ts
+++ b/packages/domain-events-infra/src/Infra/OpenTelemetry/OpenTelemetrySDK.ts
@@ -17,7 +17,10 @@ import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'
 export class OpenTelemetrySDK implements OpenTelemetrySDKInterface {
  private declare sdk: OpenTelemetrySDKNode.NodeSDK

-  constructor(private serviceName: string) {
+  constructor(
+    private serviceName: string,
+    private spanRatio?: number,
+  ) {
    this.build()
  }

@@ -41,8 +44,10 @@ export class OpenTelemetrySDK implements OpenTelemetrySDKInterface {
      },
    })

+    const ratio = this.spanRatio ?? 0.01
+
    this.sdk = new OpenTelemetrySDKNode.NodeSDK({
-      sampler: new OpenTelemetrySDKNode.tracing.TraceIdRatioBasedSampler(0.01),
+      sampler: new OpenTelemetrySDKNode.tracing.TraceIdRatioBasedSampler(ratio),
      textMapPropagator: new AWSXRayPropagator(),
      instrumentations: [
        new HttpInstrumentation({
--- a/packages/domain-events-infra/src/Infra/SQS/SQSOpenTelemetryEventMessageHandler.ts
+++ b/packages/domain-events-infra/src/Infra/SQS/SQSOpenTelemetryEventMessageHandler.ts
@@ -9,8 +9,10 @@ import {

 export class SQSOpenTelemetryEventMessageHandler implements DomainEventMessageHandlerInterface {
  private currentSpan: OpenTelemetryApi.Span | undefined
+  private internalSpan: OpenTelemetryApi.Span | undefined

  constructor(
+    private serviceName: string,
    private handlers: Map<string, DomainEventHandlerInterface>,
    private logger: Logger,
  ) {}
@@ -35,18 +37,29 @@ export class SQSOpenTelemetryEventMessageHandler implements DomainEventMessageHa

    const tracer = OpenTelemetryApi.trace.getTracer('sqs-handler')

-    this.currentSpan = tracer.startSpan(domainEvent.type)
+    this.currentSpan = tracer.startSpan(this.serviceName, { kind: OpenTelemetryApi.SpanKind.CONSUMER })
+    const ctx = OpenTelemetryApi.trace.setSpan(OpenTelemetryApi.context.active(), this.currentSpan)
+
+    this.internalSpan = tracer.startSpan(domainEvent.type, { kind: OpenTelemetryApi.SpanKind.INTERNAL }, ctx)

    await handler.handle(domainEvent)

+    this.internalSpan.end()
+
    this.currentSpan.end()

+    this.internalSpan = undefined
    this.currentSpan = undefined
  }

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

+## [1.12.18](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.17...@standardnotes/event-store@1.12.18) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.17](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.16...@standardnotes/event-store@1.12.17) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.16](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.15...@standardnotes/event-store@1.12.16) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
+## [1.12.15](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.14...@standardnotes/event-store@1.12.15) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/event-store
+
 ## [1.12.14](https://github.com/standardnotes/server/compare/@standardnotes/event-store@1.12.13...@standardnotes/event-store@1.12.14) (2023-10-09)

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

+## [1.28.4](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.28.3...@standardnotes/files-server@1.28.4) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/files-server
+
+## [1.28.3](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.28.2...@standardnotes/files-server@1.28.3) (2023-10-09)
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/files/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.28.2](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.28.1...@standardnotes/files-server@1.28.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/files/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.28.1](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.28.0...@standardnotes/files-server@1.28.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/files/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.28.0](https://github.com/standardnotes/files/compare/@standardnotes/files-server@1.27.0...@standardnotes/files-server@1.28.0) (2023-10-09)

 ### Features
--- a/packages/files/package.json
+++ b/packages/files/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/files-server",
-  "version": "1.28.0",
+  "version": "1.28.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/files/src/Bootstrap/Container.ts
+++ b/packages/files/src/Bootstrap/Container.ts
@@ -316,7 +316,11 @@ export class ContainerConfigLoader {
        .toConstantValue(
          isConfiguredForHomeServerOrSelfHosting
            ? new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger))
-            : new SQSOpenTelemetryEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger)),
+            : new SQSOpenTelemetryEventMessageHandler(
+                ServiceIdentifier.NAMES.FilesWorker,
+                eventHandlers,
+                container.get(TYPES.Files_Logger),
+              ),
        )
      container
        .bind<DomainEventSubscriberFactoryInterface>(TYPES.Files_DomainEventSubscriberFactory)
--- a/packages/home-server/CHANGELOG.md
+++ b/packages/home-server/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.16.43](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.42...@standardnotes/home-server@1.16.43) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.42](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.41...@standardnotes/home-server@1.16.42) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.41](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.40...@standardnotes/home-server@1.16.41) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
+## [1.16.40](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.39...@standardnotes/home-server@1.16.40) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/home-server
+
 ## [1.16.39](https://github.com/standardnotes/server/compare/@standardnotes/home-server@1.16.38...@standardnotes/home-server@1.16.39) (2023-10-09)

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

+# [1.43.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.42.3...@standardnotes/revisions-server@1.43.0) (2023-10-10)
+
+### Features
+
+* add more logs to transition ([783fd9e](https://github.com/standardnotes/server/commit/783fd9e2c6350a7f0f1e8d009d01a3328564aca0))
+
+## [1.42.3](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.42.2...@standardnotes/revisions-server@1.42.3) (2023-10-09)
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/server/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.42.2](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.42.1...@standardnotes/revisions-server@1.42.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/server/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.42.1](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.42.0...@standardnotes/revisions-server@1.42.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/server/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.42.0](https://github.com/standardnotes/server/compare/@standardnotes/revisions-server@1.41.0...@standardnotes/revisions-server@1.42.0) (2023-10-09)

 ### Features
--- a/packages/revisions/package.json
+++ b/packages/revisions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/revisions-server",
-  "version": "1.42.0",
+  "version": "1.43.0",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/revisions/src/Bootstrap/Container.ts
+++ b/packages/revisions/src/Bootstrap/Container.ts
@@ -533,7 +533,11 @@ export class ContainerConfigLoader {
        .toConstantValue(
          isConfiguredForHomeServerOrSelfHosting
            ? new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger))
-            : new SQSOpenTelemetryEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger)),
+            : new SQSOpenTelemetryEventMessageHandler(
+                ServiceIdentifier.NAMES.RevisionsWorker,
+                eventHandlers,
+                container.get(TYPES.Revisions_Logger),
+              ),
        )

      container
--- a/packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts
+++ b/packages/revisions/src/Domain/UseCase/Transition/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser/TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser.ts
@@ -112,7 +112,11 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
      const totalRevisionsCountForUser = await (
        this.secondRevisionsRepository as RevisionRepositoryInterface
      ).countByUserUuid(userUuid)
+      this.logger.info(`[${userUuid.value}] Total revisions count for user: ${totalRevisionsCountForUser}`)
      const totalPages = Math.ceil(totalRevisionsCountForUser / this.pageSize)
+      this.logger.info(`[${userUuid.value}] Total pages: ${totalPages}`)
+      let insertedRevisionsCount = 0
+      let skippedRevisionsCount = 0
      for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
        const isPageInEvery10Percent = currentPage % Math.ceil(totalPages / 10) === 0
        if (isPageInEvery10Percent) {
@@ -121,6 +125,9 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
              (currentPage / totalPages) * 100,
            )}% completed`,
          )
+          this.logger.info(
+            `[${userUuid.value}] Inserted ${insertedRevisionsCount} revisions so far. Skipped ${skippedRevisionsCount} revisions so far.`,
+          )
          await this.updateTransitionStatus(userUuid, TransitionStatus.STATUSES.InProgress, timestamp)
        }

@@ -151,10 +158,13 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
                    userUuid.value
                  }] Revision ${revision.id.toString()} is older in secondary than revision in primary database`,
                )
+                skippedRevisionsCount++

                continue
              }
              if (revisionInPrimary.isIdenticalTo(revision)) {
+                skippedRevisionsCount++
+
                continue
              }

@@ -174,6 +184,8 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
            const didSave = await this.primaryRevisionsRepository.insert(revision)
            if (!didSave) {
              this.logger.error(`Failed to save revision ${revision.id.toString()} to primary database`)
+            } else {
+              insertedRevisionsCount++
            }
          } catch (error) {
            this.logger.error(
@@ -183,6 +195,10 @@ export class TransitionRevisionsFromPrimaryToSecondaryDatabaseForUser implements
        }
      }

+      this.logger.info(
+        `[${userUuid.value}] Inserted ${insertedRevisionsCount} revisions. Skipped ${skippedRevisionsCount} revisions.`,
+      )
+
      return Result.ok()
    } catch (error) {
      return Result.fail(`Errored when migrating revisions for user ${userUuid.value}: ${(error as Error).message}`)
--- a/packages/scheduler/CHANGELOG.md
+++ b/packages/scheduler/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.22.8](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.22.7...@standardnotes/scheduler-server@1.22.8) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.22.7](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.22.6...@standardnotes/scheduler-server@1.22.7) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.22.6](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.22.5...@standardnotes/scheduler-server@1.22.6) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
+## [1.22.5](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.22.4...@standardnotes/scheduler-server@1.22.5) (2023-10-09)
+
+**Note:** Version bump only for package @standardnotes/scheduler-server
+
 ## [1.22.4](https://github.com/standardnotes/server/compare/@standardnotes/scheduler-server@1.22.3...@standardnotes/scheduler-server@1.22.4) (2023-10-09)

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

+# [1.115.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.114.3...@standardnotes/syncing-server@1.115.0) (2023-10-10)
+
+### Bug Fixes
+
+* **syncing-server:** add option to define otel ratio ([c021bb3](https://github.com/standardnotes/syncing-server-js/commit/c021bb3d7ca90179292e7c75f5a84bf2b941ce86))
+
+### Features
+
+* add more logs to transition ([783fd9e](https://github.com/standardnotes/syncing-server-js/commit/783fd9e2c6350a7f0f1e8d009d01a3328564aca0))
+
+## [1.114.3](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.114.2...@standardnotes/syncing-server@1.114.3) (2023-10-09)
+
+### Bug Fixes
+
+* **syncing-server:** add opentelemetry starting info in logs ([3ab2956](https://github.com/standardnotes/syncing-server-js/commit/3ab29569dbe23e9d546136c336b39ee1accb513f))
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/syncing-server-js/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.114.2](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.114.1...@standardnotes/syncing-server@1.114.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/syncing-server-js/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.114.1](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.114.0...@standardnotes/syncing-server@1.114.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/syncing-server-js/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.114.0](https://github.com/standardnotes/syncing-server-js/compare/@standardnotes/syncing-server@1.113.0...@standardnotes/syncing-server@1.114.0) (2023-10-09)

 ### Features
--- a/packages/syncing-server/bin/server.ts
+++ b/packages/syncing-server/bin/server.ts
@@ -75,6 +75,7 @@ void container.load().then((container) => {
  const serverInstance = server.build()

  if (!container.get<boolean>(TYPES.Sync_IS_CONFIGURED_FOR_HOME_SERVER_OR_SELF_HOSTING)) {
+    logger.info('Starting OpenTelemetry SDK...')
    const openTelemetrySDK = container.get<OpenTelemetrySDKInterface>(TYPES.Sync_OpenTelemetrySDK)
    openTelemetrySDK.start()
  }
--- a/packages/syncing-server/bin/worker.ts
+++ b/packages/syncing-server/bin/worker.ts
@@ -15,9 +15,8 @@ void container.load().then((container) => {

  const logger: Logger = container.get(TYPES.Sync_Logger)

-  logger.info('Starting worker...')
-
  if (!container.get<boolean>(TYPES.Sync_IS_CONFIGURED_FOR_HOME_SERVER_OR_SELF_HOSTING)) {
+    logger.info('Starting OpenTelemetry SDK...')
    const openTelemetrySDK = container.get<OpenTelemetrySDKInterface>(TYPES.Sync_OpenTelemetrySDK)
    openTelemetrySDK.start()
  }
@@ -25,5 +24,8 @@ void container.load().then((container) => {
  const subscriberFactory: DomainEventSubscriberFactoryInterface = container.get(
    TYPES.Sync_DomainEventSubscriberFactory,
  )
+
+  logger.info('Starting worker...')
+
  subscriberFactory.create().start()
 })
--- a/packages/syncing-server/package.json
+++ b/packages/syncing-server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/syncing-server",
-  "version": "1.114.0",
+  "version": "1.115.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
@@ -237,6 +237,7 @@ export class ContainerConfigLoader {
    const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting
    const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true'
    const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory'
+    const openTelemetryRatio = env.get('OTEL_SPAN_RATIO', true) ? +env.get('OTEL_SPAN_RATIO', true) : 0.01

    container
      .bind<boolean>(TYPES.Sync_IS_CONFIGURED_FOR_HOME_SERVER_OR_SELF_HOSTING)
@@ -250,6 +251,7 @@ export class ContainerConfigLoader {
            this.mode === 'server'
              ? ServiceIdentifier.NAMES.SyncingServer
              : ServiceIdentifier.NAMES.SyncingServerWorker,
+            openTelemetryRatio,
          ),
        )
    }
@@ -1178,7 +1180,11 @@ export class ContainerConfigLoader {
        .toConstantValue(
          isConfiguredForHomeServerOrSelfHosting
            ? new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger))
-            : new SQSOpenTelemetryEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger)),
+            : new SQSOpenTelemetryEventMessageHandler(
+                ServiceIdentifier.NAMES.SyncingServerWorker,
+                eventHandlers,
+                container.get(TYPES.Sync_Logger),
+              ),
        )
    }

--- a/packages/syncing-server/src/Domain/UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Transition/TransitionItemsFromPrimaryToSecondaryDatabaseForUser/TransitionItemsFromPrimaryToSecondaryDatabaseForUser.ts
@@ -114,13 +114,20 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
      const totalItemsCountForUser = await (this.secondaryItemRepository as ItemRepositoryInterface).countAll({
        userUuid: userUuid.value,
      })
+      this.logger.info(`[${userUuid.value}] Total items count for user: ${totalItemsCountForUser}`)
      const totalPages = Math.ceil(totalItemsCountForUser / this.pageSize)
+      this.logger.info(`[${userUuid.value}] Total pages: ${totalPages}`)
+      let insertedItemsCount = 0
+      let skippedItemsCount = 0
      for (let currentPage = initialPage; currentPage <= totalPages; currentPage++) {
        const isPageInEvery10Percent = currentPage % Math.ceil(totalPages / 10) === 0
        if (isPageInEvery10Percent) {
          this.logger.info(
            `[${userUuid.value}] Migrating items for user: ${Math.round((currentPage / totalPages) * 100)}% completed`,
          )
+          this.logger.info(
+            `[${userUuid.value}] Inserted items count: ${insertedItemsCount}. Skipped items count: ${skippedItemsCount}`,
+          )
          await this.updateTransitionStatus(userUuid, TransitionStatus.STATUSES.InProgress, timestamp)
        }

@@ -148,10 +155,13 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
                this.logger.info(
                  `[${userUuid.value}] Item ${item.uuid.value} is older in secondary than item in primary database`,
                )
+                skippedItemsCount++

                continue
              }
              if (itemInPrimary.isIdenticalTo(item)) {
+                skippedItemsCount++
+
                continue
              }

@@ -165,6 +175,8 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
            }

            await this.primaryItemRepository.save(item)
+
+            insertedItemsCount++
          } catch (error) {
            this.logger.error(
              `Errored when saving item ${item.uuid.value} to primary database: ${(error as Error).message}`,
@@ -173,6 +185,10 @@ export class TransitionItemsFromPrimaryToSecondaryDatabaseForUser implements Use
        }
      }

+      this.logger.info(
+        `[${userUuid.value}] Inserted items count: ${insertedItemsCount}. Skipped items count: ${skippedItemsCount}`,
+      )
+
      return Result.ok()
    } catch (error) {
      return Result.fail((error as Error).message)
--- a/packages/websockets/CHANGELOG.md
+++ b/packages/websockets/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.14.4](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.14.3...@standardnotes/websockets-server@1.14.4) (2023-10-10)
+
+**Note:** Version bump only for package @standardnotes/websockets-server
+
+## [1.14.3](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.14.2...@standardnotes/websockets-server@1.14.3) (2023-10-09)
+
+### Reverts
+
+* Revert "Revert "fix: setting parent span on workers"" ([76ae6f5](https://github.com/standardnotes/server/commit/76ae6f5a882a82ab5f635452e3bc7b2b16709531))
+
+## [1.14.2](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.14.1...@standardnotes/websockets-server@1.14.2) (2023-10-09)
+
+### Reverts
+
+* Revert "fix: setting parent span on workers" ([3fc07a5](https://github.com/standardnotes/server/commit/3fc07a5b60c26b583efd88e8a80d4c4321e71efb))
+
+## [1.14.1](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.14.0...@standardnotes/websockets-server@1.14.1) (2023-10-09)
+
+### Bug Fixes
+
+* setting parent span on workers ([1c54d18](https://github.com/standardnotes/server/commit/1c54d18c3ca75353701ba921492a5ecfaa2e3572))
+
 # [1.14.0](https://github.com/standardnotes/server/compare/@standardnotes/websockets-server@1.13.0...@standardnotes/websockets-server@1.14.0) (2023-10-09)

 ### Features
--- a/packages/websockets/package.json
+++ b/packages/websockets/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@standardnotes/websockets-server",
-  "version": "1.14.0",
+  "version": "1.14.4",
  "engines": {
    "node": ">=18.0.0 <21.0.0"
  },
--- a/packages/websockets/src/Bootstrap/Container.ts
+++ b/packages/websockets/src/Bootstrap/Container.ts
@@ -164,7 +164,13 @@ export class ContainerConfigLoader {

    container
      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-      .toConstantValue(new SQSOpenTelemetryEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
+      .toConstantValue(
+        new SQSOpenTelemetryEventMessageHandler(
+          ServiceIdentifier.NAMES.WebsocketsWorker,
+          eventHandlers,
+          container.get(TYPES.Logger),
+        ),
+      )
    container
      .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
      .toConstantValue(
Author	SHA1	Message	Date
standardci	4afe32650f	chore(release): publish new version - @standardnotes/analytics@2.28.8 - @standardnotes/api-gateway@1.78.5 - @standardnotes/auth-server@1.155.0 - @standardnotes/domain-events-infra@1.16.4 - @standardnotes/event-store@1.12.18 - @standardnotes/files-server@1.28.4 - @standardnotes/home-server@1.16.43 - @standardnotes/revisions-server@1.43.0 - @standardnotes/scheduler-server@1.22.8 - @standardnotes/syncing-server@1.115.0 - @standardnotes/websockets-server@1.14.4	2023-10-10 06:32:17 +00:00
Karol Sójko	c021bb3d7c	fix(syncing-server): add option to define otel ratio	2023-10-10 08:16:00 +02:00
Karol Sójko	783fd9e2c6	feat: add more logs to transition	2023-10-10 08:16:00 +02:00
standardci	d789c67649	chore(release): publish new version - @standardnotes/analytics@2.28.7 - @standardnotes/api-gateway@1.78.4 - @standardnotes/auth-server@1.154.3 - @standardnotes/domain-events-infra@1.16.3 - @standardnotes/event-store@1.12.17 - @standardnotes/files-server@1.28.3 - @standardnotes/home-server@1.16.42 - @standardnotes/revisions-server@1.42.3 - @standardnotes/scheduler-server@1.22.7 - @standardnotes/syncing-server@1.114.3 - @standardnotes/websockets-server@1.14.3	2023-10-09 18:10:27 +00:00
Karol Sójko	3ab29569db	fix(syncing-server): add opentelemetry starting info in logs	2023-10-09 19:50:02 +02:00
Karol Sójko	099c6e10c6	fix(domain-events-infra): add parent context on internal span	2023-10-09 19:38:35 +02:00
Karol Sójko	76ae6f5a88	Revert "Revert "fix: setting parent span on workers"" This reverts commit `3fc07a5b60`.	2023-10-09 19:13:43 +02:00
standardci	9bd2b0c953	chore(release): publish new version - @standardnotes/analytics@2.28.6 - @standardnotes/api-gateway@1.78.3 - @standardnotes/auth-server@1.154.2 - @standardnotes/domain-events-infra@1.16.2 - @standardnotes/event-store@1.12.16 - @standardnotes/files-server@1.28.2 - @standardnotes/home-server@1.16.41 - @standardnotes/revisions-server@1.42.2 - @standardnotes/scheduler-server@1.22.6 - @standardnotes/syncing-server@1.114.2 - @standardnotes/websockets-server@1.14.2	2023-10-09 14:04:36 +00:00
Karol Sójko	3fc07a5b60	Revert "fix: setting parent span on workers" This reverts commit `1c54d18c3c`.	2023-10-09 15:46:10 +02:00
standardci	94e18ab36b	chore(release): publish new version - @standardnotes/analytics@2.28.5 - @standardnotes/api-gateway@1.78.2 - @standardnotes/auth-server@1.154.1 - @standardnotes/domain-events-infra@1.16.1 - @standardnotes/event-store@1.12.15 - @standardnotes/files-server@1.28.1 - @standardnotes/home-server@1.16.40 - @standardnotes/revisions-server@1.42.1 - @standardnotes/scheduler-server@1.22.5 - @standardnotes/syncing-server@1.114.1 - @standardnotes/websockets-server@1.14.1	2023-10-09 13:30:07 +00:00
Karol Sójko	1c54d18c3c	fix: setting parent span on workers	2023-10-09 15:13:07 +02:00