Remove previous_session_id in favor of first_session_id and session_index (#10762)

samedson · web-flow · commit 9bb1fb449028 · 2023-02-01T13:01:57.000-05:00
* Remove previous_session_id in favor of first_session_id and session_index

* CHOP
diff --git a/FirebaseSessions/ProtoSupport/Protos/sessions.options b/FirebaseSessions/ProtoSupport/Protos/sessions.options
@@ -23,7 +23,7 @@
 #
 
 firebase.appquality.sessions.SessionInfo.session_id type:FT_POINTER
-firebase.appquality.sessions.SessionInfo.previous_session_id type:FT_POINTER
+firebase.appquality.sessions.SessionInfo.first_session_id type:FT_POINTER
 firebase.appquality.sessions.SessionInfo.firebase_installation_id type:FT_POINTER
 firebase.appquality.sessions.ApplicationInfo.app_id type:FT_POINTER
 firebase.appquality.sessions.ApplicationInfo.device_model type:FT_POINTER
diff --git a/FirebaseSessions/ProtoSupport/Protos/sessions.proto b/FirebaseSessions/ProtoSupport/Protos/sessions.proto
@@ -115,13 +115,16 @@ message NetworkConnectionInfo {
 }
 
 // Contains session-specific information relating to the event being uploaded.
-// Next tag: 7
+// Next tag: 9
 message SessionInfo {
   // A globally unique identifier for the session.
   string session_id = 1;
-  // The unique identifier for the session that preceded this one on the device.
-  // This will be the empty string if there was no previous session.
-  string previous_session_id = 2;
+  // Will point to the first Session for the run of the app.
+  // For the first session, this will be the same as session_id.
+  string first_session_id = 7;
+  // What order this Session came in this run of the app. For the first Session
+  // this will be 0.
+  int32 session_index = 8;
   // Identifies a unique device+app installation: go/firebase-installations
   string firebase_installation_id = 3;
   // The device-reported timestamp at which the event occurred.
diff --git a/FirebaseSessions/Sources/Development/DevEventConsoleLogger.swift b/FirebaseSessions/Sources/Development/DevEventConsoleLogger.swift
@@ -38,7 +38,8 @@ class DevEventConsoleLogger: EventGDTLoggerProtocol {
       event_type: \(proto.event_type)
       session_data
         session_id: \(proto.session_data.session_id.description)
-        previous_session_id: \(proto.session_data.previous_session_id.description)
+        first_session_id: \(proto.session_data.first_session_id.description)
+        session_index: \(proto.session_data.session_index)
         event_timestamp_us: \(proto.session_data.event_timestamp_us)
         firebase_installation_id: \(proto.session_data.firebase_installation_id.description)
         data_collection_status
diff --git a/FirebaseSessions/Sources/SessionStartEvent.swift b/FirebaseSessions/Sources/SessionStartEvent.swift
@@ -43,7 +43,6 @@ class SessionStartEvent: NSObject, GDTCOREventDataObject {
 
     proto.event_type = firebase_appquality_sessions_EventType_SESSION_START
     proto.session_data.session_id = makeProtoString(sessionInfo.sessionId)
-    proto.session_data.previous_session_id = makeProtoStringOrNil(sessionInfo.previousSessionId)
     proto.session_data.event_timestamp_us = time.timestampUS
 
     proto.application_info.app_id = makeProtoString(appInfo.appID)
diff --git a/FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.c b/FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.c
@@ -39,12 +39,13 @@ const pb_field_t firebase_appquality_sessions_NetworkConnectionInfo_fields[3] =
     PB_LAST_FIELD
 };
 
-const pb_field_t firebase_appquality_sessions_SessionInfo_fields[6] = {
+const pb_field_t firebase_appquality_sessions_SessionInfo_fields[7] = {
     PB_FIELD(  1, BYTES   , SINGULAR, POINTER , FIRST, firebase_appquality_sessions_SessionInfo, session_id, session_id, 0),
-    PB_FIELD(  2, BYTES   , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_SessionInfo, previous_session_id, session_id, 0),
-    PB_FIELD(  3, BYTES   , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_SessionInfo, firebase_installation_id, previous_session_id, 0),
+    PB_FIELD(  3, BYTES   , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_SessionInfo, firebase_installation_id, session_id, 0),
     PB_FIELD(  4, INT64   , SINGULAR, STATIC  , OTHER, firebase_appquality_sessions_SessionInfo, event_timestamp_us, firebase_installation_id, 0),
     PB_FIELD(  6, MESSAGE , SINGULAR, STATIC  , OTHER, firebase_appquality_sessions_SessionInfo, data_collection_status, event_timestamp_us, &firebase_appquality_sessions_DataCollectionStatus_fields),
+    PB_FIELD(  7, BYTES   , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_SessionInfo, first_session_id, data_collection_status, 0),
+    PB_FIELD(  8, INT32   , SINGULAR, STATIC  , OTHER, firebase_appquality_sessions_SessionInfo, session_index, first_session_id, 0),
     PB_LAST_FIELD
 };
 
diff --git a/FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.h b/FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.h
@@ -155,10 +155,11 @@ typedef struct _firebase_appquality_sessions_AppleApplicationInfo {
 
 typedef struct _firebase_appquality_sessions_SessionInfo {
     pb_bytes_array_t *session_id;
-    pb_bytes_array_t *previous_session_id;
     pb_bytes_array_t *firebase_installation_id;
     int64_t event_timestamp_us;
     firebase_appquality_sessions_DataCollectionStatus data_collection_status;
+    pb_bytes_array_t *first_session_id;
+    int32_t session_index;
 /* @@protoc_insertion_point(struct:firebase_appquality_sessions_SessionInfo) */
 } firebase_appquality_sessions_SessionInfo;
 
@@ -189,14 +190,14 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
 /* Initializer values for message structs */
 #define firebase_appquality_sessions_SessionEvent_init_default {_firebase_appquality_sessions_EventType_MIN, firebase_appquality_sessions_SessionInfo_init_default, firebase_appquality_sessions_ApplicationInfo_init_default}
 #define firebase_appquality_sessions_NetworkConnectionInfo_init_default {_firebase_appquality_sessions_NetworkConnectionInfo_NetworkType_MIN, _firebase_appquality_sessions_NetworkConnectionInfo_MobileSubtype_MIN}
-#define firebase_appquality_sessions_SessionInfo_init_default {NULL, NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_default}
+#define firebase_appquality_sessions_SessionInfo_init_default {NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_default, NULL, 0}
 #define firebase_appquality_sessions_DataCollectionStatus_init_default {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
 #define firebase_appquality_sessions_ApplicationInfo_init_default {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_default}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
 #define firebase_appquality_sessions_AndroidApplicationInfo_init_default {NULL, NULL}
 #define firebase_appquality_sessions_AppleApplicationInfo_init_default {NULL, firebase_appquality_sessions_NetworkConnectionInfo_init_default, _firebase_appquality_sessions_OsName_MIN, NULL}
 #define firebase_appquality_sessions_SessionEvent_init_zero {_firebase_appquality_sessions_EventType_MIN, firebase_appquality_sessions_SessionInfo_init_zero, firebase_appquality_sessions_ApplicationInfo_init_zero}
 #define firebase_appquality_sessions_NetworkConnectionInfo_init_zero {_firebase_appquality_sessions_NetworkConnectionInfo_NetworkType_MIN, _firebase_appquality_sessions_NetworkConnectionInfo_MobileSubtype_MIN}
-#define firebase_appquality_sessions_SessionInfo_init_zero {NULL, NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_zero}
+#define firebase_appquality_sessions_SessionInfo_init_zero {NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_zero, NULL, 0}
 #define firebase_appquality_sessions_DataCollectionStatus_init_zero {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
 #define firebase_appquality_sessions_ApplicationInfo_init_zero {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_zero}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
 #define firebase_appquality_sessions_AndroidApplicationInfo_init_zero {NULL, NULL}
@@ -215,7 +216,8 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
 #define firebase_appquality_sessions_AppleApplicationInfo_os_name_tag 4
 #define firebase_appquality_sessions_AppleApplicationInfo_mcc_mnc_tag 5
 #define firebase_appquality_sessions_SessionInfo_session_id_tag 1
-#define firebase_appquality_sessions_SessionInfo_previous_session_id_tag 2
+#define firebase_appquality_sessions_SessionInfo_first_session_id_tag 7
+#define firebase_appquality_sessions_SessionInfo_session_index_tag 8
 #define firebase_appquality_sessions_SessionInfo_firebase_installation_id_tag 3
 #define firebase_appquality_sessions_SessionInfo_event_timestamp_us_tag 4
 #define firebase_appquality_sessions_SessionInfo_data_collection_status_tag 6
@@ -234,7 +236,7 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
 /* Struct field encoding specification for nanopb */
 extern const pb_field_t firebase_appquality_sessions_SessionEvent_fields[4];
 extern const pb_field_t firebase_appquality_sessions_NetworkConnectionInfo_fields[3];
-extern const pb_field_t firebase_appquality_sessions_SessionInfo_fields[6];
+extern const pb_field_t firebase_appquality_sessions_SessionInfo_fields[7];
 extern const pb_field_t firebase_appquality_sessions_DataCollectionStatus_fields[4];
 extern const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9];
 extern const pb_field_t firebase_appquality_sessions_AndroidApplicationInfo_fields[3];
diff --git a/FirebaseSessions/Tests/Unit/SessionStartEventTests.swift b/FirebaseSessions/Tests/Unit/SessionStartEventTests.swift
@@ -66,11 +66,6 @@ class SessionStartEventTests: XCTestCase {
         expected: "test_session_id",
         fieldName: "session_id"
       )
-      assertEqualProtoString(
-        proto.session_data.previous_session_id,
-        expected: "test_previous_session_id",
-        fieldName: "previous_session_id"
-      )
 
       XCTAssertEqual(proto.session_data.event_timestamp_us, 123)
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#`
`24`	`24`
`25`	`25`	`firebase.appquality.sessions.SessionInfo.session_id type:FT_POINTER`
`26`		`-firebase.appquality.sessions.SessionInfo.previous_session_id type:FT_POINTER`
	`26`	`+firebase.appquality.sessions.SessionInfo.first_session_id type:FT_POINTER`
`27`	`27`	`firebase.appquality.sessions.SessionInfo.firebase_installation_id type:FT_POINTER`
`28`	`28`	`firebase.appquality.sessions.ApplicationInfo.app_id type:FT_POINTER`
`29`	`29`	`firebase.appquality.sessions.ApplicationInfo.device_model type:FT_POINTER`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,6 @@ class SessionStartEventTests: XCTestCase {`
`66`	`66`	`expected: "test_session_id",`
`67`	`67`	`fieldName: "session_id"`
`68`	`68`	`)`
`69`		`- assertEqualProtoString(`
`70`		`- proto.session_data.previous_session_id,`
`71`		`- expected: "test_previous_session_id",`
`72`		`- fieldName: "previous_session_id"`
`73`		`- )`
`74`	`69`
`75`	`70`	`XCTAssertEqual(proto.session_data.event_timestamp_us, 123)`
`76`	`71`	`}`