musora-content-services 2.111.4 → 2.111.5

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.111.5](https://github.com/railroadmedia/musora-content-services/compare/v2.111.4...v2.111.5) (2026-01-07)
+
 ### [2.111.4](https://github.com/railroadmedia/musora-content-services/compare/v2.111.3...v2.111.4) (2026-01-07)
 
 ### [2.111.3](https://github.com/railroadmedia/musora-content-services/compare/v2.111.2...v2.111.3) (2026-01-06)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.111.4",
+  "version": "2.111.5",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/services/sync/context/providers/session.ts

@@ -5,4 +5,10 @@ export default abstract class BaseSessionProvider extends BaseContextProvider {
   getSessionId(): string | null {
     return null
   }
+  toJSON() {
+    return {
+      'session.id': this.getSessionId() || undefined,
+      'session.client': this.getClientId(),
+    }
+  }
 }

package/src/services/sync/manager.ts

@@ -124,7 +124,7 @@ export default class SyncManager {
 
     // can fail synchronously immediately (e.g., schema/migration validation errors)
     // or asynchronously (e.g., indexedDB errors synchronously OR asynchronously (!))
-    const database = this.telemetry.trace({ name: 'db:init' }, this.initDatabase)
+    const database = this.telemetry.trace({ name: 'db:init', attributes: { ...this.context.session.toJSON() } }, this.initDatabase)
 
     Object.entries(this.storeConfigsRegistry).forEach(([table, storeConfig]) => {
       this.storesRegistry[table] = this.createStore(storeConfig, database)

package/src/services/sync/repositories/base.ts

@@ -77,56 +77,56 @@ export default class SyncRepository<TModel extends BaseModel> {
 
   protected async insertOne(builder: (record: TModel) => void) {
     return this.store.telemetry.trace(
-      { name: `insertOne:${this.store.model.table}`, op: 'insert' },
+      { name: `insertOne:${this.store.model.table}`, op: 'insert', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.insertOne(builder, span), span)
     )
   }
 
   protected async updateOneId(id: RecordId, builder: (record: TModel) => void) {
     return this.store.telemetry.trace(
-      { name: `updateOne:${this.store.model.table}`, op: 'update' },
+      { name: `updateOne:${this.store.model.table}`, op: 'update', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.updateOneId(id, builder, span), span)
     )
   }
 
   protected async upsertOne(id: RecordId, builder: (record: TModel) => void, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
-      { name: `upsertOne:${this.store.model.table}`, op: 'upsert' },
+      { name: `upsertOne:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.upsertOne(id, builder, span, {skipPush}), span)
     )
   }
 
   protected async upsertOneTentative(id: RecordId, builder: (record: TModel) => void) {
     return this.store.telemetry.trace(
-      { name: `upsertOneTentative:${this.store.model.table}`, op: 'upsert' },
+      { name: `upsertOneTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.upsertOneTentative(id, builder, span), span)
     )
   }
 
   protected async upsertSome(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
-      { name: `upsertSome:${this.store.model.table}`, op: 'upsert' },
+      { name: `upsertSome:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.upsertSome(builders, span, {skipPush}), span)
     )
   }
 
   protected async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
-      { name: `upsertSomeTentative:${this.store.model.table}`, op: 'upsert' },
+      { name: `upsertSomeTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWrite(() => this.store.upsertSomeTentative(builders, span, {skipPush}), span)
     )
   }
 
   protected async deleteOne(id: RecordId, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
-      { name: `delete:${this.store.model.table}`, op: 'delete' },
+      { name: `delete:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWriteIds(() => this.store.deleteOne(id, span, {skipPush}), span)
     )
   }
 
   protected async deleteSome(ids: RecordId[]) {
     return this.store.telemetry.trace(
-      { name: `deleteSome:${this.store.model.table}`, op: 'delete' },
+      { name: `deleteSome:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
       (span) => this._respondToWriteIds(() => this.store.deleteSome(ids, span), span)
     )
   }

package/src/services/sync/retry.ts

@@ -43,7 +43,12 @@ export default class SyncRetry {
 
       attempt++
 
-      const spanOptions = { ...spanOpts, name: `${spanOpts.name}:attempt:${attempt}/${this.MAX_ATTEMPTS}`, op: `${spanOpts.op}:attempt` }
+      const spanOptions = {
+        ...spanOpts,
+        name: `${spanOpts.name}:attempt:${attempt}/${this.MAX_ATTEMPTS}`,
+        op: `${spanOpts.op}:attempt`,
+        attributes: { ...spanOpts.attributes, attempt, ...this.context.session.toJSON() }
+      }
       const result = await this.telemetry.trace(spanOptions, span => {
         if (!this.context.connectivity.getValue()) {
           this.telemetry.debug('[Retry] No connectivity - skipping')

package/src/services/sync/store/index.ts

@@ -100,7 +100,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
   async requestSync(reason: string) {
     inBoundary(ctx => {
       this.telemetry.trace(
-        { name: `sync:${this.model.table}`, op: 'sync', attributes: ctx },
+        { name: `sync:${this.model.table}`, op: 'sync', attributes: { ...ctx, ...this.context.session.toJSON() } },
         async span => {
           let pushError: any = null
 
@@ -125,7 +125,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
   async requestPush(reason: string) {
     inBoundary(ctx => {
       this.telemetry.trace(
-        { name: `sync:${this.model.table}`, op: 'push', attributes: ctx },
+        { name: `sync:${this.model.table}`, op: 'push', attributes: { ...ctx, ...this.context.session.toJSON() } },
         async span => {
           await this.pushUnsyncedWithRetry(span)
         }
@@ -509,7 +509,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
       {
         name: `pull:${this.model.table}:run`,
         op: 'pull:run',
-        attributes: { table: this.model.table },
+        attributes: { table: this.model.table, ...this.context.session.toJSON() },
         parentSpan: span,
       },
       async (pullSpan) => {
@@ -519,7 +519,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
           {
             name: `pull:${this.model.table}:run:fetch`,
             op: 'pull:run:fetch',
-            attributes: { lastFetchToken: lastFetchToken ?? undefined },
+            attributes: { lastFetchToken: lastFetchToken ?? undefined, ...this.context.session.toJSON() },
             parentSpan: pullSpan,
           },
           () => this.puller(this.context.session, lastFetchToken, this.runScope.signal)
@@ -542,7 +542,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
       {
         name: `push:${this.model.table}`,
         op: 'push:run',
-        attributes: { table: this.model.table },
+        attributes: { table: this.model.table, ...this.context.session.toJSON() },
         parentSpan,
       },
       async (pushSpan) => {
@@ -552,6 +552,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
           {
             name: `push:${this.model.table}:run:fetch`,
             op: 'push:run:fetch',
+            attributes: { ...this.context.session.toJSON() },
             parentSpan: pushSpan,
           },
           () => this.pusher(this.context.session, payload, this.runScope.signal)
@@ -706,7 +707,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     work: (writer: WriterInterface) => Promise<T>
   ): Promise<T> {
     return this.telemetry.trace(
-      { name: `write:${this.model.table}`, op: 'write', parentSpan },
+      { name: `write:${this.model.table}`, op: 'write', parentSpan, attributes: { ...this.context.session.toJSON() } },
       (writeSpan) => {
         return this.db.write(writer =>
           this.telemetry.trace(
@@ -714,6 +715,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
               name: `write:generate:${this.model.table}`,
               op: 'write:generate',
               parentSpan: writeSpan,
+              attributes: { ...this.context.session.toJSON() },
             },
             () => work(writer)
           )

package/src/services/sync/telemetry/sampling.ts

@@ -36,9 +36,7 @@ export const syncSentryBeforeSendTransaction: ReturnsUndefined<NonNullable<Sentr
   return undefined
 }
 
-// sentry doesn't bother to expose your chosen environment in tracesSampler
-// so we have to make consumers pass in our greedy option
-export const createSyncSentryTracesSampler = () => {
+export const createSyncSentryTracesSampler = (sampleRate = 0.1) => {
   const sampler: ReturnsUndefined<NonNullable<SentryBrowserOptions['tracesSampler']>> = (context) => {
     if (!context.name.startsWith(SYNC_TELEMETRY_TRACE_PREFIX)) {
       return undefined
@@ -51,7 +49,7 @@ export const createSyncSentryTracesSampler = () => {
     }
 
     if (attributes?.userId) {
-      return userBucketedSampler(attributes.userId as string | number, 0.1)
+      return userBucketedSampler(attributes.userId as string | number, sampleRate)
     }
 
     return undefined