Expected UTDs: report a different Posthog code

.eslintrc.js

@@ -108,7 +108,6 @@ module.exports = {
                             "!matrix-js-sdk/src/extensible_events_v1/PollEndEvent",
                             "!matrix-js-sdk/src/extensible_events_v1/InvalidEventError",
                             "!matrix-js-sdk/src/crypto",
-                            "!matrix-js-sdk/src/crypto/algorithms",
                             "!matrix-js-sdk/src/crypto/aes",
                             "!matrix-js-sdk/src/crypto/olmlib",
                             "!matrix-js-sdk/src/crypto/crypto",

package.json

@@ -67,7 +67,7 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@matrix-org/analytics-events": "^0.12.0",
+        "@matrix-org/analytics-events": "^0.19.0",
         "@matrix-org/emojibase-bindings": "^1.1.2",
         "@matrix-org/matrix-wysiwyg": "2.17.0",
         "@matrix-org/olm": "3.2.15",

src/DecryptionFailureTracker.ts

@@ -14,9 +14,9 @@
 limitations under the License.
 */
 
-import { DecryptionError } from "matrix-js-sdk/src/crypto/algorithms";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { Error as ErrorEvent } from "@matrix-org/analytics-events/types/typescript/Error";
+import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api";
 
 import { PosthogAnalytics } from "./PosthogAnalytics";
 
@@ -25,17 +25,15 @@
 
     public constructor(
         public readonly failedEventId: string,
-        public readonly errorCode: string,
+        public readonly errorCode: DecryptionFailureCode,
     ) {
         this.ts = Date.now();
     }
 }
 
-type ErrorCode = "OlmKeysNotSentError" | "OlmIndexError" | "UnknownError" | "OlmUnspecifiedError";
-
+type ErrorCode = ErrorEvent["name"];
 type TrackingFn = (count: number, trackedErrCode: ErrorCode, rawError: string) => void;
-
-export type ErrCodeMapFn = (errcode: string) => ErrorCode;
+export type ErrCodeMapFn = (errcode: DecryptionFailureCode) => ErrorCode;
 
 export class DecryptionFailureTracker {
     private static internalInstance = new DecryptionFailureTracker(
@@ -52,12 +50,12 @@
         (errorCode) => {
             // Map JS-SDK error codes to tracker codes for aggregation
             switch (errorCode) {
-                case "MEGOLM_UNKNOWN_INBOUND_SESSION_ID":
+                case DecryptionFailureCode.MEGOLM_UNKNOWN_INBOUND_SESSION_ID:
                     return "OlmKeysNotSentError";
-                case "OLM_UNKNOWN_MESSAGE_INDEX":
+                case DecryptionFailureCode.OLM_UNKNOWN_MESSAGE_INDEX:
                     return "OlmIndexError";
-                case undefined:
-                    return "OlmUnspecifiedError";
+                case DecryptionFailureCode.HISTORICAL_MESSAGE:
+                    return "HistoricalMessage";
                 default:
                     return "UnknownError";
             }
@@ -76,11 +74,11 @@
     // accumulated in `failureCounts`.
     public visibleFailures: Map<string, DecryptionFailure> = new Map();
 
-    // A histogram of the number of failures that will be tracked at the next tracking
-    // interval, split by failure error code.
-    public failureCounts: Record<string, number> = {
-        // [errorCode]: 42
-    };
+    /**
+     * A histogram of the number of failures that will be tracked at the next tracking
+     * interval, split by failure error code.
+     */
+    private failureCounts: Map<DecryptionFailureCode, number> = new Map();
 
     // Event IDs of failures that were tracked previously
     public trackedEvents: Set<string> = new Set();
@@ -108,10 +106,10 @@
      *
      * @param {function} fn The tracking function, which will be called when failures
      * are tracked. The function should have a signature `(count, trackedErrorCode) => {...}`,
-     * where `count` is the number of failures and `errorCode` matches the `.code` of
-     * provided DecryptionError errors (by default, unless `errorCodeMapFn` is specified.
-     * @param {function?} errorCodeMapFn The function used to map error codes to the
-     * trackedErrorCode. If not provided, the `.code` of errors will be used.
+     * where `count` is the number of failures and `errorCode` matches the output of `errorCodeMapFn`.
+     *
+     * @param {function} errorCodeMapFn The function used to map decryption failure reason  codes to the
+     * `trackedErrorCode`.
      */
     private constructor(
         private readonly fn: TrackingFn,
@@ -138,13 +136,15 @@
     //     localStorage.setItem('mx-decryption-failure-event-ids', JSON.stringify([...this.trackedEvents]));
     // }
 
-    public eventDecrypted(e: MatrixEvent, err: DecryptionError): void {
-        // for now we only track megolm decrytion failures
+    public eventDecrypted(e: MatrixEvent): void {
+        // for now we only track megolm decryption failures
         if (e.getWireContent().algorithm != "m.megolm.v1.aes-sha2") {
             return;
         }
-        if (err) {
-            this.addDecryptionFailure(new DecryptionFailure(e.getId()!, err.code));
+
+        const errCode = e.decryptionFailureReason;
+        if (errCode !== null) {
+            this.addDecryptionFailure(new DecryptionFailure(e.getId()!, errCode));
         } else {
             // Could be an event in the failures, remove it
             this.removeDecryptionFailuresForEvent(e);
@@ -205,7 +205,7 @@
         this.failures = new Map();
         this.visibleEvents = new Set();
         this.visibleFailures = new Map();
-        this.failureCounts = {};
+        this.failureCounts = new Map();
     }
 
     /**
@@ -236,7 +236,7 @@
     private aggregateFailures(failures: Set<DecryptionFailure>): void {
         for (const failure of failures) {
             const errorCode = failure.errorCode;
-            this.failureCounts[errorCode] = (this.failureCounts[errorCode] || 0) + 1;
+            this.failureCounts.set(errorCode, (this.failureCounts.get(errorCode) ?? 0) + 1);
         }
     }
 
@@ -245,12 +245,12 @@
      * function with the number of failures that should be tracked.
      */
     public trackFailures(): void {
-        for (const errorCode of Object.keys(this.failureCounts)) {
-            if (this.failureCounts[errorCode] > 0) {
+        for (const [errorCode, count] of this.failureCounts.entries()) {
+            if (count > 0) {
                 const trackedErrorCode = this.errorCodeMapFn(errorCode);
 
-                this.fn(this.failureCounts[errorCode], trackedErrorCode, errorCode);
-                this.failureCounts[errorCode] = 0;
+                this.fn(count, trackedErrorCode, errorCode);
+                this.failureCounts.set(errorCode, 0);
             }
         }
     }

src/components/structures/MatrixChat.tsx

@@ -32,7 +32,6 @@ import { defer, IDeferred, QueryDict } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 import { throttle } from "lodash";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
-import { DecryptionError } from "matrix-js-sdk/src/crypto/algorithms";
 import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
 import { TooltipProvider } from "@vector-im/compound-web";
 
@@ -1595,7 +1594,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         // When logging out, stop tracking failures and destroy state
         cli.on(HttpApiEvent.SessionLoggedOut, () => dft.stop());
-        cli.on(MatrixEventEvent.Decrypted, (e, err) => dft.eventDecrypted(e, err as DecryptionError));
+        cli.on(MatrixEventEvent.Decrypted, (e) => dft.eventDecrypted(e));
 
         cli.on(ClientEvent.Room, (room) => {
             if (cli.isCryptoEnabled()) {