From fcb923f6dbd0e163101da3d33a09c5db64077207 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Sat, 13 May 2023 14:11:59 -0400
Subject: [PATCH 1/3] Update matrix-js-sdk

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 35425caad..07f3e43c6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "i18next-browser-languagedetector": "^6.1.8",
     "i18next-http-backend": "^1.4.4",
     "lodash": "^4.17.21",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#90e8336797480ff0e512d7c76ba6f420c2c3a2d5",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#aaae55736f5a1295aae249a391489514cab12b64",
     "matrix-widget-api": "^1.3.1",
     "mermaid": "^8.13.8",
     "normalize.css": "^8.0.1",
diff --git a/yarn.lock b/yarn.lock
index a7bce4e76..8306694ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10550,9 +10550,9 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#90e8336797480ff0e512d7c76ba6f420c2c3a2d5":
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#aaae55736f5a1295aae249a391489514cab12b64":
   version "25.1.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/90e8336797480ff0e512d7c76ba6f420c2c3a2d5"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/aaae55736f5a1295aae249a391489514cab12b64"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.8"

From 7d454645d0690dcd737c4d2874e564693cc698f6 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Sat, 13 May 2023 14:27:01 -0400
Subject: [PATCH 2/3] Fix types

---
 test/otel/ObjectFlattener-test.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/test/otel/ObjectFlattener-test.ts b/test/otel/ObjectFlattener-test.ts
index 84fce3479..ac001ebb7 100644
--- a/test/otel/ObjectFlattener-test.ts
+++ b/test/otel/ObjectFlattener-test.ts
@@ -1,3 +1,8 @@
+import { GroupCallStatsReport } from "matrix-js-sdk/src/webrtc/groupCall";
+import {
+  AudioConcealment,
+  ConnectionStatsReport,
+} from "matrix-js-sdk/src/webrtc/stats/statsReport";
 import { ObjectFlattener } from "../../src/otel/ObjectFlattener";
 
 /*
@@ -16,7 +21,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 describe("ObjectFlattener", () => {
-  const statsReport = {
+  const noConcealment: AudioConcealment = {
+    concealedAudio: 0,
+    totalAudioDuration: 0,
+  };
+
+  const statsReport: GroupCallStatsReport<ConnectionStatsReport> = {
     report: {
       bandwidth: { upload: 426, download: 0 },
       bitrate: {
@@ -92,8 +102,14 @@ describe("ObjectFlattener", () => {
           rtt: null,
         },
       ],
+      audioConcealment: new Map([
+        ["REMOTE_AUDIO_TRACK_ID", noConcealment],
+        ["REMOTE_VIDEO_TRACK_ID", noConcealment],
+      ]),
+      totalAudioConcealment: noConcealment,
     },
   };
+
   describe("on flattenObjectRecursive", () => {
     it("should flatter an Map object", () => {
       const flatObject = {};

From 207554f06778af69b9de2e0838ca55d0c70d7be6 Mon Sep 17 00:00:00 2001
From: Robin Townsend <robin@robin.town>
Date: Sun, 14 May 2023 01:32:11 -0400
Subject: [PATCH 3/3] Fix tests

---
 test/otel/ObjectFlattener-test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/otel/ObjectFlattener-test.ts b/test/otel/ObjectFlattener-test.ts
index ac001ebb7..e3709d207 100644
--- a/test/otel/ObjectFlattener-test.ts
+++ b/test/otel/ObjectFlattener-test.ts
@@ -214,6 +214,12 @@ describe("ObjectFlattener", () => {
         "matrix.stats.conn.transport.1.remoteCandidateType": "srfx",
         "matrix.stats.conn.transport.1.networkType": "ethernet",
         "matrix.stats.conn.transport.1.rtt": "null",
+        "matrix.stats.conn.audioConcealment.REMOTE_AUDIO_TRACK_ID.concealedAudio": 0,
+        "matrix.stats.conn.audioConcealment.REMOTE_AUDIO_TRACK_ID.totalAudioDuration": 0,
+        "matrix.stats.conn.audioConcealment.REMOTE_VIDEO_TRACK_ID.concealedAudio": 0,
+        "matrix.stats.conn.audioConcealment.REMOTE_VIDEO_TRACK_ID.totalAudioDuration": 0,
+        "matrix.stats.conn.totalAudioConcealment.concealedAudio": 0,
+        "matrix.stats.conn.totalAudioConcealment.totalAudioDuration": 0,
       });
     });
   });