@webex/internal-plugin-metrics 3.12.0-next.55 → 3.12.0-next.57

package/src/call-diagnostic/call-diagnostic-metrics.ts

@@ -94,6 +94,7 @@ type GetIdentifiersOptions = {
   preLoginId?: string;
   globalMeetingId?: string;
   webexConferenceIdStr?: string;
+  locusCluster?: string;
 };
 
 /**
@@ -420,6 +421,7 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       globalMeetingId,
       preLoginId,
       sessionCorrelationId,
+      locusCluster,
     } = options;
     const identifiers: Event['event']['identifiers'] = {
       correlationId: 'unknown', // concerned with setting this to unknown. This will fail diagnostic events parsing because it's not a uuid pattern
@@ -486,6 +488,10 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       identifiers.webexSiteName = meeting.meetingInfo?.siteName;
     }
 
+    if (meeting?.meetingInfo?.locusClusterUrl) {
+      identifiers.locusCluster = meeting.meetingInfo.locusClusterUrl;
+    }
+
     if (mediaConnections) {
       identifiers.mediaAgentAlias = mediaConnections?.[0]?.mediaAgentAlias;
       identifiers.mediaAgentGroupId = mediaConnections?.[0]?.mediaAgentGroupId;
@@ -499,6 +505,10 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       identifiers.globalMeetingId = globalMeetingId;
     }
 
+    if (!identifiers?.locusCluster && locusCluster) {
+      identifiers.locusCluster = locusCluster;
+    }
+
     if (identifiers.correlationId === undefined) {
       throw new Error('Identifiers initialization failed.');
     }
@@ -1063,6 +1073,7 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       globalMeetingId,
       webexConferenceIdStr,
       sessionCorrelationId,
+      locusCluster,
     } = options;
 
     // @ts-ignore
@@ -1096,6 +1107,7 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       webexConferenceIdStr,
       globalMeetingId,
       sessionCorrelationId,
+      locusCluster,
     });
 
     // create common event object structure
@@ -1136,9 +1148,11 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       commonEventObject.meetingJoinedTime = meetingJoinedTime;
     }
 
-    if (options.meetingJoinPhase) {
+    const meetingJoinPhase =
+      options.meetingJoinPhase ?? meeting.callStateForMetrics?.meetingJoinPhase;
+    if (meetingJoinPhase) {
       // @ts-ignore
-      commonEventObject.meetingJoinPhase = options.meetingJoinPhase;
+      commonEventObject.meetingJoinPhase = meetingJoinPhase;
     }
 
     return commonEventObject;
@@ -1219,8 +1233,14 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
     options?: SubmitClientEventOptions;
     errors?: ClientEventPayloadError;
   }) {
-    const {correlationId, globalMeetingId, webexConferenceIdStr, preLoginId, sessionCorrelationId} =
-      options;
+    const {
+      correlationId,
+      globalMeetingId,
+      webexConferenceIdStr,
+      preLoginId,
+      sessionCorrelationId,
+      locusCluster,
+    } = options;
 
     // grab identifiers
     const identifiers = this.getIdentifiers({
@@ -1229,6 +1249,7 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       preLoginId,
       globalMeetingId,
       webexConferenceIdStr,
+      locusCluster,
     });
 
     // create client event object
@@ -1253,9 +1274,8 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
       clientEventObject.joinFlowVersion = options.joinFlowVersion;
     }
 
-    if (options.meetingJoinPhase) {
-      clientEventObject.meetingJoinPhase = options.meetingJoinPhase;
-    }
+    // No meeting exists yet for pre-meeting events, so the join phase is pre-join by construction
+    clientEventObject.meetingJoinPhase = options.meetingJoinPhase ?? 'pre-join';
 
     if (options.userNameInput) {
       clientEventObject.userNameInput = options.userNameInput;