Skip to content

Commit c66588d

Browse files
authored
Add development environment to the proto message ApplicationInfo. (#10452)
1 parent 74cc976 commit c66588d

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

FirebaseSessions/ProtoSupport/Protos/sessions.proto

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ enum DataCollectionState {
101101
}
102102

103103
// App-level information collected from the device.
104-
// Next tag: 8
104+
// Next tag: 9
105105
message ApplicationInfo {
106106
// Commonly known as the GMP App Id
107107
string app_id = 1;
@@ -113,6 +113,8 @@ message ApplicationInfo {
113113
string development_platform_version = 4;
114114
// The version of the Firebase-Sessions SDK in use
115115
string session_sdk_version = 7;
116+
// The destination environment to send the logs to
117+
LogEnvironment log_environment = 8;
116118

117119
oneof platform_info {
118120
// App info relevant only to Android apps
@@ -175,3 +177,11 @@ enum OsName {
175177
// Indicates no data was provided by the device (old sdk, Android)
176178
UNSPECIFIED = 8;
177179
}
180+
181+
// Enum containing the destination environment the events will be sent to.
182+
enum LogEnvironment {
183+
LOG_ENVIRONMENT_UNKNOWN = 0;
184+
LOG_ENVIRONMENT_AUTOPUSH = 1;
185+
LOG_ENVIRONMENT_STAGING = 2;
186+
LOG_ENVIRONMENT_PROD = 3;
187+
}

FirebaseSessions/Protogen/nanopb/sessions.nanopb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ const pb_field_t firebase_appquality_sessions_DataCollectionStatus_fields[4] = {
4949
PB_LAST_FIELD
5050
};
5151

52-
const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[8] = {
52+
const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9] = {
5353
PB_FIELD( 1, BYTES , SINGULAR, POINTER , FIRST, firebase_appquality_sessions_ApplicationInfo, app_id, app_id, 0),
5454
PB_FIELD( 2, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, device_model, app_id, 0),
5555
PB_FIELD( 3, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, development_platform_name, device_model, 0),
5656
PB_FIELD( 4, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, development_platform_version, development_platform_name, 0),
5757
PB_ANONYMOUS_ONEOF_FIELD(platform_info, 5, MESSAGE , ONEOF, STATIC , OTHER, firebase_appquality_sessions_ApplicationInfo, android_app_info, development_platform_version, &firebase_appquality_sessions_AndroidApplicationInfo_fields),
5858
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),
5959
PB_FIELD( 7, BYTES , SINGULAR, POINTER , OTHER, firebase_appquality_sessions_ApplicationInfo, session_sdk_version, apple_app_info, 0),
60+
PB_FIELD( 8, UENUM , SINGULAR, STATIC , OTHER, firebase_appquality_sessions_ApplicationInfo, log_environment, session_sdk_version, 0),
6061
PB_LAST_FIELD
6162
};
6263

@@ -78,6 +79,7 @@ const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[5] = {
7879

7980

8081

82+
8183
/* Check that field information fits in pb_field_t */
8284
#if !defined(PB_FIELD_32BIT)
8385
/* If you get an error here, it means that you need to define PB_FIELD_32BIT

FirebaseSessions/Protogen/nanopb/sessions.nanopb.h

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ typedef enum _firebase_appquality_sessions_OsName {
6565
#define _firebase_appquality_sessions_OsName_MAX firebase_appquality_sessions_OsName_UNSPECIFIED
6666
#define _firebase_appquality_sessions_OsName_ARRAYSIZE ((firebase_appquality_sessions_OsName)(firebase_appquality_sessions_OsName_UNSPECIFIED+1))
6767

68+
typedef enum _firebase_appquality_sessions_LogEnvironment {
69+
firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_UNKNOWN = 0,
70+
firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_AUTOPUSH = 1,
71+
firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_STAGING = 2,
72+
firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_PROD = 3
73+
} firebase_appquality_sessions_LogEnvironment;
74+
#define _firebase_appquality_sessions_LogEnvironment_MIN firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_UNKNOWN
75+
#define _firebase_appquality_sessions_LogEnvironment_MAX firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_PROD
76+
#define _firebase_appquality_sessions_LogEnvironment_ARRAYSIZE ((firebase_appquality_sessions_LogEnvironment)(firebase_appquality_sessions_LogEnvironment_LOG_ENVIRONMENT_PROD+1))
77+
6878
/* Struct definitions */
6979
typedef struct _firebase_appquality_sessions_AndroidApplicationInfo {
7080
pb_bytes_array_t *package_name;
@@ -98,6 +108,7 @@ typedef struct _firebase_appquality_sessions_ApplicationInfo {
98108
firebase_appquality_sessions_AppleApplicationInfo apple_app_info;
99109
};
100110
pb_bytes_array_t *session_sdk_version;
111+
firebase_appquality_sessions_LogEnvironment log_environment;
101112
/* @@protoc_insertion_point(struct:firebase_appquality_sessions_ApplicationInfo) */
102113
} firebase_appquality_sessions_ApplicationInfo;
103114

@@ -123,13 +134,13 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
123134
#define firebase_appquality_sessions_SessionEvent_init_default {_firebase_appquality_sessions_EventType_MIN, firebase_appquality_sessions_SessionInfo_init_default, firebase_appquality_sessions_ApplicationInfo_init_default}
124135
#define firebase_appquality_sessions_SessionInfo_init_default {NULL, NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_default}
125136
#define firebase_appquality_sessions_DataCollectionStatus_init_default {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
126-
#define firebase_appquality_sessions_ApplicationInfo_init_default {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_default}, NULL}
137+
#define firebase_appquality_sessions_ApplicationInfo_init_default {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_default}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
127138
#define firebase_appquality_sessions_AndroidApplicationInfo_init_default {NULL, NULL}
128139
#define firebase_appquality_sessions_AppleApplicationInfo_init_default {NULL, NetworkConnectionInfo_init_default, _firebase_appquality_sessions_OsName_MIN, NULL}
129140
#define firebase_appquality_sessions_SessionEvent_init_zero {_firebase_appquality_sessions_EventType_MIN, firebase_appquality_sessions_SessionInfo_init_zero, firebase_appquality_sessions_ApplicationInfo_init_zero}
130141
#define firebase_appquality_sessions_SessionInfo_init_zero {NULL, NULL, NULL, 0, firebase_appquality_sessions_DataCollectionStatus_init_zero}
131142
#define firebase_appquality_sessions_DataCollectionStatus_init_zero {_firebase_appquality_sessions_DataCollectionState_MIN, _firebase_appquality_sessions_DataCollectionState_MIN, 0}
132-
#define firebase_appquality_sessions_ApplicationInfo_init_zero {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_zero}, NULL}
143+
#define firebase_appquality_sessions_ApplicationInfo_init_zero {NULL, NULL, NULL, NULL, 0, {firebase_appquality_sessions_AndroidApplicationInfo_init_zero}, NULL, _firebase_appquality_sessions_LogEnvironment_MIN}
133144
#define firebase_appquality_sessions_AndroidApplicationInfo_init_zero {NULL, NULL}
134145
#define firebase_appquality_sessions_AppleApplicationInfo_init_zero {NULL, NetworkConnectionInfo_init_zero, _firebase_appquality_sessions_OsName_MIN, NULL}
135146

@@ -150,6 +161,7 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
150161
#define firebase_appquality_sessions_ApplicationInfo_development_platform_name_tag 3
151162
#define firebase_appquality_sessions_ApplicationInfo_development_platform_version_tag 4
152163
#define firebase_appquality_sessions_ApplicationInfo_session_sdk_version_tag 7
164+
#define firebase_appquality_sessions_ApplicationInfo_log_environment_tag 8
153165
#define firebase_appquality_sessions_SessionInfo_session_id_tag 1
154166
#define firebase_appquality_sessions_SessionInfo_previous_session_id_tag 2
155167
#define firebase_appquality_sessions_SessionInfo_firebase_installation_id_tag 3
@@ -163,7 +175,7 @@ typedef struct _firebase_appquality_sessions_SessionEvent {
163175
extern const pb_field_t firebase_appquality_sessions_SessionEvent_fields[4];
164176
extern const pb_field_t firebase_appquality_sessions_SessionInfo_fields[6];
165177
extern const pb_field_t firebase_appquality_sessions_DataCollectionStatus_fields[4];
166-
extern const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[8];
178+
extern const pb_field_t firebase_appquality_sessions_ApplicationInfo_fields[9];
167179
extern const pb_field_t firebase_appquality_sessions_AndroidApplicationInfo_fields[3];
168180
extern const pb_field_t firebase_appquality_sessions_AppleApplicationInfo_fields[5];
169181

0 commit comments

Comments
 (0)