feat: add tenant to track and pc (#117)

* add tenant to track and pc * minor fix * small fix * fix null ids * fix 0 date format
jitsi · Sep 28, 2023 · 037a872 · 037a872
1 parent 9dba6b5
commit 037a872
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 42 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rtcstats-server",
-  "version": "2.22.1",
+  "version": "2.23.4",
   "description": "The rtcstats-server represents the server side component of the rtcstats ecosystem, the client side being https://github.com/jitsi/rtcstats which collects and sends WebRTC related statistics.",
   "main": "websocket.js",
   "private": true,

diff --git a/src/database/FeaturesPublisher.js b/src/database/FeaturesPublisher.js
@@ -29,17 +29,31 @@ class FeaturesPublisher {
      * Extracts common dump fields from the given dump info object.
      *
      * @param {Object} dumpInfo - The dump info object to extract fields from.
+     * @param {Object} features - All the current session features.
      * @returns {Object}  An object containing the extracted fields under a common name.
      */
-    _extractCommonDumpFields(dumpInfo) {
+    _extractCommonDumpFields(dumpInfo, features) {
         const {
             clientId: statsSessionId,
-            sessionId: meetingUniqueId
+            sessionId: meetingUniqueId,
+            conferenceUrl: meetingUrl,
+            tenant,
+            jaasClientId
         } = dumpInfo;
 
+        let {
+            conferenceStartTime
+        } = features;
+
+        conferenceStartTime = conferenceStartTime ? getSQLTimestamp(conferenceStartTime) : null;
+
         return {
+            conferenceStartTime,
             statsSessionId,
-            meetingUniqueId
+            meetingUniqueId,
+            meetingUrl,
+            tenant,
+            jaasClientId
         };
     }
 
@@ -49,7 +63,16 @@ class FeaturesPublisher {
      * @param {Object} track - extracted track features.
      * @param {Object} param1 - additional track related metadata.
      */
-    _publishTrackFeatures(track, { direction, statsSessionId, meetingUniqueId, isP2P, pcId, createDate }) {
+    _publishTrackFeatures(track, dumpInfo, features, { direction, isP2P, pcId, createDate }) {
+        const {
+            meetingUniqueId,
+            statsSessionId,
+            conferenceStartTime,
+            jaasClientId,
+            meetingUrl,
+            tenant
+        } = this._extractCommonDumpFields(dumpInfo, features);
+
         const {
             mediaType,
             ssrc,
@@ -78,7 +101,11 @@ class FeaturesPublisher {
             packetsLost,
             packetsLostPct,
             packetsLostVariance,
-            concealedPercentage
+            concealedPercentage,
+            conferenceStartTime,
+            jaasClientId,
+            meetingUrl,
+            tenant
         };
 
         if (startTime) {
@@ -95,17 +122,13 @@ class FeaturesPublisher {
     /**
      * Publish all peer connection track features.
      * @param {Object} dumpInfo - Session metadata.
+     * @param {Object} features - All the current session features.
      * @param {Object} pcRecord - Features associated with this specific peer connection.
      * @param {Number} pcId - Unique pc entry identifier.
      * @param {String} statsSessionId - rtcstats-server session id
      * @param {String} createDate - SQL formatted timestamp string.
      */
-    _publishAllTrackFeatures(dumpInfo, pcRecord, pcId, createDate) {
-        const {
-            statsSessionId,
-            meetingUniqueId
-        } = this._extractCommonDumpFields(dumpInfo);
-
+    _publishAllTrackFeatures(dumpInfo, features, pcRecord, { id: pcId, createDate }) {
         const {
             isP2P,
             tracks: {
@@ -114,23 +137,20 @@ class FeaturesPublisher {
             }
         } = pcRecord;
 
-        receiverTracks.forEach(rtrack => {
-            this._publishTrackFeatures(rtrack, { direction: 'received',
-                statsSessionId,
-                meetingUniqueId,
-                isP2P,
-                pcId,
-                createDate });
-        });
+        const publishTrack = (track, direction) => {
+            this._publishTrackFeatures(
+                track,
+                dumpInfo,
+                features, {
+                    direction,
+                    isP2P,
+                    pcId,
+                    createDate
+                });
+        };
 
-        senderTracks.forEach(strack => {
-            this._publishTrackFeatures(strack, { direction: 'send',
-                statsSessionId,
-                meetingUniqueId,
-                isP2P,
-                pcId,
-                createDate });
-        });
+        receiverTracks.forEach(track => publishTrack(track, 'received'));
+        senderTracks.forEach(track => publishTrack(track, 'send'));
     }
 
     /**
@@ -142,9 +162,13 @@ class FeaturesPublisher {
      */
     _publishPCFeatures(dumpInfo, features, createDate) {
         const {
+            meetingUniqueId,
             statsSessionId,
-            meetingUniqueId
-        } = this._extractCommonDumpFields(dumpInfo);
+            conferenceStartTime,
+            jaasClientId,
+            meetingUrl,
+            tenant
+        } = this._extractCommonDumpFields(dumpInfo, features);
 
         const {
             aggregates: pcRecords = { }
@@ -212,11 +236,18 @@ class FeaturesPublisher {
                 meanUpperBoundFrameHeight: upperBoundAggregates.meanFrameHeight,
                 meanUpperBoundFramesPerSecond: upperBoundAggregates.meanFramesPerSecond,
                 meanLowerBoundFrameHeight: lowerBoundAggregates.meanFrameHeight,
-                meanLowerBoundFramesPerSecond: lowerBoundAggregates.meanFramesPerSecond
+                meanLowerBoundFramesPerSecond: lowerBoundAggregates.meanFramesPerSecond,
+                conferenceStartTime,
+                tenant,
+                jaasClientId,
+                meetingUrl
             };
 
             this._dbConnector.putPCFeaturesRecord(pcFeaturesRecord);
-            this._publishAllTrackFeatures(dumpInfo, pcRecords[pc], id, createDate);
+            this._publishAllTrackFeatures(dumpInfo, features, pcRecords[pc], {
+                id,
+                createDate
+            });
         });
     }
 
@@ -273,20 +304,21 @@ class FeaturesPublisher {
      */
     _publishMeetingFeatures(dumpInfo, features, createDate) {
         const {
+            conferenceStartTime,
+            jaasClientId,
+            meetingUniqueId,
+            meetingUrl,
             statsSessionId,
-            meetingUniqueId
-        } = this._extractCommonDumpFields(dumpInfo);
+            tenant
+        } = this._extractCommonDumpFields(dumpInfo, features);
 
         const {
             userId: displayName,
             conferenceId: meetingName,
-            conferenceUrl: meetingUrl,
             endpointId,
             isBreakoutRoom,
             breakoutRoomId,
-            parentStatsSessionId,
-            tenant,
-            jaasClientId
+            parentStatsSessionId
         } = dumpInfo;
 
         const {
@@ -307,7 +339,6 @@ class FeaturesPublisher {
                 sessionDurationMs,
                 conferenceDurationMs
             } = {},
-            conferenceStartTime: conferenceStartTimestamp,
             sessionStartTime: sessionStartTimestamp,
             sessionEndTime: sessionEndTimestamp,
             dominantSpeakerChanges,
@@ -323,7 +354,6 @@ class FeaturesPublisher {
             } = {}
         } = features;
 
-        const conferenceStartTime = conferenceStartTimestamp ? getSQLTimestamp(conferenceStartTimestamp) : null;
         const sessionStartTime = sessionStartTimestamp ? getSQLTimestamp(sessionStartTimestamp) : null;
         const sessionEndTime = sessionEndTimestamp ? getSQLTimestamp(sessionEndTimestamp) : null;
 

diff --git a/src/queries/redshift-schema.sql b/src/queries/redshift-schema.sql
@@ -74,6 +74,9 @@ CREATE TABLE IF NOT EXISTS rtcstats_pc_metrics (
     meanUpperBoundFramesPerSecond REAL,
     meanLowerBoundFrameHeight REAL,
     meanLowerBoundFramesPerSecond REAL,
+    conferenceStartTime TIMESTAMP,
+    tenant: VARCHAR ( 512 ),
+    jaasClientId: VARCHAR ( 512 ),
     PRIMARY KEY(id),
     FOREIGN KEY (statssessionid) REFERENCES rtcstats(statssessionid)
 )
@@ -99,6 +102,9 @@ CREATE TABLE IF NOT EXISTS rtcstats_track_metrics (
     packetsLostPct REAL,
     packetsLostVariance REAL,
     concealedPercentage REAL,
+    conferenceStartTime TIMESTAMP,
+    tenant: VARCHAR ( 512 ),
+    jaasClientId: VARCHAR ( 512 ),
     PRIMARY KEY(id),
     FOREIGN KEY (pcId) REFERENCES rtcstats_pc_metrics(id)
 )