Fix/notification sentry observability

src/app/crypto/engineCrypto/EngineCrypto.ts

@@ -129,7 +129,7 @@
 
   const entries = Object.entries(value as Record<string, unknown>)
     .filter(([, item]) => item !== undefined)
     .sort(([a], [b]) => (a < b ? -1 : 1));
   return `{${entries.map(([key, item]) => `${JSON.stringify(key)}:${canonicalJson(item)}`).join(',')}}`;
 };
 
@@ -366,6 +366,7 @@
     this.#identity = identity;
     this.#backupDownloader = new PerSessionBackupDownloader({
       mx,
+      getBackupVersion: () => this.getActiveSessionBackupVersion().catch(() => null),
       importSession: (roomId, session) => this.#importBackedUpSession(roomId, session),
       now: () => Date.now(),
     });

src/app/crypto/engineCrypto/perSessionBackupDownload.test.ts

@@ -18,9 +18,11 @@ const rateLimited = (retryAfterMs: number) =>
 
 describe('PerSessionBackupDownloader', () => {
   let clock = 0;
+  let backupVersion: string | null = '7';
 
   beforeEach(() => {
     clock = 0;
+    backupVersion = '7';
   });
 
   const make = (
@@ -31,6 +33,7 @@ describe('PerSessionBackupDownloader', () => {
   ) => {
     const downloader = new PerSessionBackupDownloader({
       mx: { http: { authedRequest } } as unknown as MatrixClient,
+      getBackupVersion: async () => backupVersion,
       importSession,
       now: () => clock,
     });
@@ -48,9 +51,24 @@ describe('PerSessionBackupDownloader', () => {
 
     expect(authedRequest).toHaveBeenCalledTimes(1);
     expect(authedRequest.mock.calls[0]?.[1]).toBe('/room_keys/keys/!r%3Ae.org/S1');
+    expect(authedRequest.mock.calls[0]?.[2]).toEqual({ version: '7' });
     expect(importSession).toHaveBeenCalledTimes(1);
   });
 
+  it('does not query the backup when no active version is known', async () => {
+    backupVersion = null;
+    const authedRequest = vi.fn<(...args: never[]) => Promise<unknown>>(async () => ({
+      session_data: {},
+    }));
+    const { downloader, importSession } = make(authedRequest);
+
+    downloader.request({ roomId: '!r:e.org', sessionId: 'S1' });
+    await settle();
+
+    expect(authedRequest).not.toHaveBeenCalled();
+    expect(importSession).not.toHaveBeenCalled();
+  });
+
   it('does not hammer the backup for a session it is already fetching', async () => {
     const authedRequest = vi.fn<(...args: never[]) => Promise<unknown>>(async () => ({
       session_data: {},

src/app/crypto/engineCrypto/perSessionBackupDownload.ts

@@ -9,6 +9,7 @@ export type SessionRef = { roomId: string; sessionId: string };
 
 export type BackupDownloadHost = {
   mx: MatrixClient;
+  getBackupVersion: () => Promise<string | null>;
   importSession: (roomId: string, session: KeyBackupSession) => Promise<boolean>;
   now: () => number;
 };
@@ -91,11 +92,17 @@ export class PerSessionBackupDownloader {
       $sessionId: ref.sessionId,
     });
 
+    const version = await this.#host.getBackupVersion();
+    if (!version) {
+      this.#missingUntil.set(key, this.#host.now() + BACKOFF_TIME_MS);
+      return;
+    }
+
     try {
       const session = await this.#host.mx.http.authedRequest<KeyBackupSession>(
         Method.Get,
         path,
-        {},
+        { version },
         undefined,
         { prefix: ClientPrefix.V3 }
       );

src/app/crypto/pushDecrypt.ts

@@ -59,11 +59,10 @@ export const decryptPushEventNatively = async (
       sender: decrypted.sender ?? event.sender,
     };
   } catch (error) {
-    // Expected while the to-device key is still in flight, so not a warning.
-    pushDecryptLog.info(
+    pushDecryptLog.warn(
       'notification',
       'Native push decryption unavailable, falling back to the js-sdk path',
-      error
+      { reason: error instanceof Error ? error.message : String(error) }
     );
     return null;
   }

src/app/pages/client/BackgroundNotifications.tsx

@@ -592,13 +592,7 @@ export function BackgroundNotifications() {
         .catch((err) => {
           if (disposed) return;
           log.error('failed to start background client for', session.userId, err);
-          debugLog.error('notification', 'Failed to start background client', {
-            userId: session.userId,
-            error: err,
-          });
-          Sentry.captureException(err, {
-            tags: { component: 'BackgroundNotifications' },
-          });
+          debugLog.error('notification', 'Failed to start background client', err);
 
           // Remove the stuck/failed client from current so future runs (or the
           // retry below) can attempt a fresh start.

src/instrument.ts

@@ -99,6 +99,7 @@ if (dsn && sentryEnabled) {
     beforeSendLog(log) {
       // Drop debug-level logs in production to reduce noise and quota usage
       if (log.level === 'debug' && environment === 'production') return null;
+      if (typeof log.message === 'string' && log.message.startsWith('[sable:')) return null;
       // Redact Matrix IDs and tokens from the log message string
       if (typeof log.message === 'string') {
         log.message = scrubMatrixIds(log.message);