Skip to content

Commit 484ca20

Browse files
authored
Add os_version and app_build_version to Sessions (#11205)
1 parent 0c58855 commit 484ca20

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

FirebaseSessions/ProtoSupport/Protos/sessions.options

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ firebase.appquality.sessions.ApplicationInfo.device_model type:FT_POINTER
3030
firebase.appquality.sessions.ApplicationInfo.development_platform_name type:FT_POINTER
3131
firebase.appquality.sessions.ApplicationInfo.development_platform_version type:FT_POINTER
3232
firebase.appquality.sessions.ApplicationInfo.session_sdk_version type:FT_POINTER
33+
firebase.appquality.sessions.ApplicationInfo.os_version type:FT_POINTER
3334
firebase.appquality.sessions.AndroidApplicationInfo.package_name type:FT_POINTER
3435
firebase.appquality.sessions.AndroidApplicationInfo.version_name type:FT_POINTER
3536
firebase.appquality.sessions.AppleApplicationInfo.bundle_short_version type:FT_POINTER
37+
firebase.appquality.sessions.AppleApplicationInfo.app_build_version type:FT_POINTER
3638
firebase.appquality.sessions.AppleApplicationInfo.mcc_mnc type:FT_POINTER

FirebaseSessions/ProtoSupport/Protos/sessions.proto

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ enum DataCollectionState {
165165
}
166166

167167
// App-level information collected from the device.
168-
// Next tag: 9
168+
// Next tag: 10
169169
message ApplicationInfo {
170170
// Commonly known as the GMP App Id
171171
string app_id = 1;
@@ -177,6 +177,8 @@ message ApplicationInfo {
177177
string development_platform_version = 4;
178178
// The version of the Firebase-Sessions SDK in use
179179
string session_sdk_version = 7;
180+
// The operating system version
181+
string os_version = 9;
180182
// The destination environment to send the logs to
181183
LogEnvironment log_environment = 8;
182184

@@ -213,10 +215,12 @@ message AndroidApplicationInfo {
213215
// - os_full_version
214216
// - model
215217
// - country
216-
// Next tag: 6
218+
// Next tag: 7
217219
message AppleApplicationInfo {
218220
// The application's display version, eg. 1.2.3
219221
string bundle_short_version = 1;
222+
// The application's build version. Eg. 123
223+
string app_build_version = 6;
220224
// Describes the network connectivity of the device
221225
NetworkConnectionInfo network_connection_info = 3;
222226
// Collects the OS running. Eg. iOS, iPadOs, tvOS, etc.

FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const pb_field_t firebase_appquality_sessions_DataCollectionStatus_fields[4] = {
5656
PB_LAST_FIELD
5757
};
5858

59-
const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9] = {
59+
const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[10] = {
6060
PB_FIELD( 1, BYTES , SINGULAR, POINTER , FIRST, firebase_appquality_sessions_ApplicationInfo, app_id, app_id, 0),
6161
PB_FIELD( 2, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, device_model, app_id, 0),
6262
PB_FIELD( 3, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, development_platform_name, device_model, 0),
@@ -65,6 +65,7 @@ const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9] = {
6565
PB_ANONYMOUS_ONEOF_FIELD(platform_info, 6, MESSAGE , ONEOF, STATIC , UNION, firebase_appquality_sessions_ApplicationInfo, apple_app_info, development_platform_version, &firebase_appquality_sessions_AppleApplicationInfo_fields),
6666
PB_FIELD( 7, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, session_sdk_version, apple_app_info, 0),
6767
PB_FIELD( 8, UENUM , SINGULAR, STATIC , OTHER, firebase_appquality_sessions_ApplicationInfo, log_environment, session_sdk_version, 0),
68+
PB_FIELD( 9, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, os_version, log_environment, 0),
6869
PB_LAST_FIELD
6970
};
7071

@@ -74,11 +75,12 @@ const pb_field_t firebase_appquality_sessions_AndroidApplicationInfo_fields[3] =
7475
PB_LAST_FIELD
7576
};
7677

77-
const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[5] = {
78+
const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[6] = {
7879
PB_FIELD( 1, BYTES , SINGULAR, POINTER , FIRST, firebase_appquality_sessions_AppleApplicationInfo, bundle_short_version, bundle_short_version, 0),
7980
PB_FIELD( 3, MESSAGE , SINGULAR, STATIC , OTHER, firebase_appquality_sessions_AppleApplicationInfo, network_connection_info, bundle_short_version, &firebase_appquality_sessions_NetworkConnectionInfo_fields),
8081
PB_FIELD( 4, UENUM , SINGULAR, STATIC , OTHER, firebase_appquality_sessions_AppleApplicationInfo, os_name, network_connection_info, 0),
8182
PB_FIELD( 5, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_AppleApplicationInfo, mcc_mnc, os_name, 0),
83+
PB_FIELD( 6, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_AppleApplicationInfo, app_build_version, mcc_mnc, 0),
8284
PB_LAST_FIELD
8385
};
8486

FirebaseSessions/SourcesObjC/Protogen/nanopb/sessions.nanopb.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ typedef struct _firebase_appquality_sessions_AppleApplicationInfo {
150150
firebase_appquality_sessions_NetworkConnectionInfo network_connection_info;
151151
firebase_appquality_sessions_OsName os_name;
152152
pb_bytes_array_t *mcc_mnc;
153+
pb_bytes_array_t *app_build_version;
153154
/* @@protoc_insertion_point(struct:firebase_appquality_sessions_AppleApplicationInfo) */
154155
} firebase_appquality_sessions_AppleApplicationInfo;
155156

@@ -175,6 +176,7 @@ typedef struct _firebase_appquality_sessions_ApplicationInfo {
175176
};
176177
pb_bytes_array_t *session_sdk_version;
177178
firebase_appquality_sessions_LogEnvironment log_environment;
179+
pb_bytes_array_t *os_version;
178180
/* @@protoc_insertion_point(struct:firebase_appquality_sessions_ApplicationInfo) */
179181
} firebase_appquality_sessions_ApplicationInfo;
180182

@@ -192,16 +194,16 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
192194
#define firebase_appquality_sessions_NetworkConnectionInfo_init_default {_firebase_appquality_sessions_NetworkConnectionInfo_NetworkType_MIN, _firebase_appquality_sessions_NetworkConnectionInfo_MobileSubtype_MIN}
193195
#define firebase_appquality_sessions_SessionInfo_init_default {NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_default, NULL, 0}
194196
#define firebase_appquality_sessions_DataCollectionStatus_init_default {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
195-
#define firebase_appquality_sessions_ApplicationInfo_init_default {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_default}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
197+
#define firebase_appquality_sessions_ApplicationInfo_init_default {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_default}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN, NULL}
196198
#define firebase_appquality_sessions_AndroidApplicationInfo_init_default {NULL, NULL}
197-
#define firebase_appquality_sessions_AppleApplicationInfo_init_default {NULL, firebase_appquality_sessions_NetworkConnectionInfo_init_default, _firebase_appquality_sessions_OsName_MIN, NULL}
199+
#define firebase_appquality_sessions_AppleApplicationInfo_init_default {NULL, firebase_appquality_sessions_NetworkConnectionInfo_init_default, _firebase_appquality_sessions_OsName_MIN, NULL, NULL}
198200
#define firebase_appquality_sessions_SessionEvent_init_zero {_firebase_appquality_sessions_EventType_MIN, firebase_appquality_sessions_SessionInfo_init_zero, firebase_appquality_sessions_ApplicationInfo_init_zero}
199201
#define firebase_appquality_sessions_NetworkConnectionInfo_init_zero {_firebase_appquality_sessions_NetworkConnectionInfo_NetworkType_MIN, _firebase_appquality_sessions_NetworkConnectionInfo_MobileSubtype_MIN}
200202
#define firebase_appquality_sessions_SessionInfo_init_zero {NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_zero, NULL, 0}
201203
#define firebase_appquality_sessions_DataCollectionStatus_init_zero {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
202-
#define firebase_appquality_sessions_ApplicationInfo_init_zero {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_zero}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
204+
#define firebase_appquality_sessions_ApplicationInfo_init_zero {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_zero}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN, NULL}
203205
#define firebase_appquality_sessions_AndroidApplicationInfo_init_zero {NULL, NULL}
204-
#define firebase_appquality_sessions_AppleApplicationInfo_init_zero {NULL, firebase_appquality_sessions_NetworkConnectionInfo_init_zero, _firebase_appquality_sessions_OsName_MIN, NULL}
206+
#define firebase_appquality_sessions_AppleApplicationInfo_init_zero {NULL, firebase_appquality_sessions_NetworkConnectionInfo_init_zero, _firebase_appquality_sessions_OsName_MIN, NULL, NULL}
205207

206208
/* Field tags (for use in manual encoding/decoding) */
207209
#define firebase_appquality_sessions_AndroidApplicationInfo_package_name_tag 1
@@ -212,6 +214,7 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
212214
#define firebase_appquality_sessions_NetworkConnectionInfo_network_type_tag 1
213215
#define firebase_appquality_sessions_NetworkConnectionInfo_mobile_subtype_tag 2
214216
#define firebase_appquality_sessions_AppleApplicationInfo_bundle_short_version_tag 1
217+
#define firebase_appquality_sessions_AppleApplicationInfo_app_build_version_tag 6
215218
#define firebase_appquality_sessions_AppleApplicationInfo_network_connection_info_tag 3
216219
#define firebase_appquality_sessions_AppleApplicationInfo_os_name_tag 4
217220
#define firebase_appquality_sessions_AppleApplicationInfo_mcc_mnc_tag 5
@@ -228,6 +231,7 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
228231
#define firebase_appquality_sessions_ApplicationInfo_development_platform_name_tag 3
229232
#define firebase_appquality_sessions_ApplicationInfo_development_platform_version_tag 4
230233
#define firebase_appquality_sessions_ApplicationInfo_session_sdk_version_tag 7
234+
#define firebase_appquality_sessions_ApplicationInfo_os_version_tag 9
231235
#define firebase_appquality_sessions_ApplicationInfo_log_environment_tag 8
232236
#define firebase_appquality_sessions_SessionEvent_event_type_tag 1
233237
#define firebase_appquality_sessions_SessionEvent_session_data_tag 2
@@ -238,9 +242,9 @@ extern const pb_field_t firebase_appquality_sessions_SessionEvent_fields[4];
238242
extern const pb_field_t firebase_appquality_sessions_NetworkConnectionInfo_fields[3];
239243
extern const pb_field_t firebase_appquality_sessions_SessionInfo_fields[7];
240244
extern const pb_field_t firebase_appquality_sessions_DataCollectionStatus_fields[4];
241-
extern const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9];
245+
extern const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[10];
242246
extern const pb_field_t firebase_appquality_sessions_AndroidApplicationInfo_fields[3];
243-
extern const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[5];
247+
extern const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[6];
244248

245249
/* Maximum encoded size of messages (where known) */
246250
/* firebase_appquality_sessions_SessionEvent_size depends on runtime parameters */

0 commit comments

Comments
 (0)