Skip to content

Commit f84ab54

Browse files
mikehaney24mikehaney24
authored
Remove fields that are currently unused. (#3528)
None of these fields were collecting information, but they shouldn't be in the proto until they're used.
1 parent 5a2e88d commit f84ab54

File tree

3 files changed

+10
-67
lines changed

3 files changed

+10
-67
lines changed

‎Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.c

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,40 +26,28 @@
2626

2727

2828

29-
const pb_field_t logs_proto_mobilesdk_ios_ICoreConfiguration_fields[34] = {
29+
const pb_field_t logs_proto_mobilesdk_ios_ICoreConfiguration_fields[22] = {
3030
PB_FIELD( 1, UENUM , OPTIONAL, STATIC , FIRST, logs_proto_mobilesdk_ios_ICoreConfiguration, configuration_type, configuration_type, 0),
31-
PB_FIELD( 2, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, version_name, configuration_type, 0),
32-
PB_FIELD( 3, INT64 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, build_number, version_name, 0),
33-
PB_FIELD( 4, UENUM , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, build_type, build_number, 0),
34-
PB_FIELD( 5, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, plist_version, build_type, 0),
35-
PB_FIELD( 6, UENUM , REPEATED, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, sdk_service_enabled, plist_version, 0),
36-
PB_FIELD( 7, UENUM , REPEATED, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, sdk_service_installed, sdk_service_enabled, 0),
31+
PB_FIELD( 7, UENUM , REPEATED, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, sdk_service_installed, configuration_type, 0),
3732
PB_FIELD( 9, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, device_model, sdk_service_installed, 0),
3833
PB_FIELD( 10, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, app_id, device_model, 0),
39-
PB_FIELD( 11, INT64 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, project_number, app_id, 0),
40-
PB_FIELD( 12, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, bundle_id, project_number, 0),
41-
PB_FIELD( 13, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, client_id, bundle_id, 0),
42-
PB_FIELD( 14, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, install, client_id, 0),
43-
PB_FIELD( 16, UENUM , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, pod_name, install, 0),
34+
PB_FIELD( 12, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, bundle_id, app_id, 0),
35+
PB_FIELD( 16, UENUM , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, pod_name, bundle_id, 0),
4436
PB_FIELD( 18, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, icore_version, pod_name, 0),
4537
PB_FIELD( 19, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, sdk_version, icore_version, 0),
4638
PB_FIELD( 20, UENUM , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, sdk_name, sdk_version, 0),
4739
PB_FIELD( 21, INT32 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, app_count, sdk_name, 0),
4840
PB_FIELD( 22, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, os_version, app_count, 0),
49-
PB_FIELD( 23, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, itunes_id, os_version, 0),
50-
PB_FIELD( 24, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, min_supported_ios_version, itunes_id, 0),
41+
PB_FIELD( 24, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, min_supported_ios_version, os_version, 0),
5142
PB_FIELD( 25, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, use_default_app, min_supported_ios_version, 0),
5243
PB_FIELD( 26, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, deployed_in_app_store, use_default_app, 0),
5344
PB_FIELD( 27, INT32 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, dynamic_framework_count, deployed_in_app_store, 0),
5445
PB_FIELD( 28, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, apple_framework_version, dynamic_framework_count, 0),
5546
PB_FIELD( 29, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, using_zip_file, apple_framework_version, 0),
5647
PB_FIELD( 30, UENUM , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, deployment_type, using_zip_file, 0),
5748
PB_FIELD( 31, BYTES , OPTIONAL, POINTER , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, platform_info, deployment_type, 0),
58-
PB_FIELD( 32, INT64 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, app_extensions, platform_info, 0),
59-
PB_FIELD( 33, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, swizzling_enabled, app_extensions, 0),
60-
PB_FIELD( 34, INT32 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, log_error_count, swizzling_enabled, 0),
61-
PB_FIELD( 35, INT32 , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, log_warning_count, log_error_count, 0),
62-
PB_FIELD( 36, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, using_gdt, log_warning_count, 0),
49+
PB_FIELD( 33, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, swizzling_enabled, platform_info, 0),
50+
PB_FIELD( 36, BOOL , OPTIONAL, STATIC , OTHER, logs_proto_mobilesdk_ios_ICoreConfiguration, using_gdt, swizzling_enabled, 0),
6351
PB_LAST_FIELD
6452
};
6553

‎Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.h

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,11 @@ typedef enum _logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType {
111111
typedef struct _logs_proto_mobilesdk_ios_ICoreConfiguration {
112112
bool has_configuration_type;
113113
logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType configuration_type;
114-
pb_bytes_array_t *version_name;
115-
bool has_build_number;
116-
int64_t build_number;
117-
bool has_build_type;
118-
logs_proto_mobilesdk_ios_ICoreConfiguration_BuildType build_type;
119-
pb_bytes_array_t *plist_version;
120-
pb_size_t sdk_service_enabled_count;
121-
logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType *sdk_service_enabled;
122114
pb_size_t sdk_service_installed_count;
123115
logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType *sdk_service_installed;
124116
pb_bytes_array_t *device_model;
125117
pb_bytes_array_t *app_id;
126-
bool has_project_number;
127-
int64_t project_number;
128118
pb_bytes_array_t *bundle_id;
129-
pb_bytes_array_t *client_id;
130-
pb_bytes_array_t *install;
131119
bool has_pod_name;
132120
logs_proto_mobilesdk_ios_ICoreConfiguration_PodName pod_name;
133121
pb_bytes_array_t *icore_version;
@@ -137,7 +125,6 @@ typedef struct _logs_proto_mobilesdk_ios_ICoreConfiguration {
137125
bool has_app_count;
138126
int32_t app_count;
139127
pb_bytes_array_t *os_version;
140-
pb_bytes_array_t *itunes_id;
141128
pb_bytes_array_t *min_supported_ios_version;
142129
bool has_use_default_app;
143130
bool use_default_app;
@@ -151,14 +138,8 @@ typedef struct _logs_proto_mobilesdk_ios_ICoreConfiguration {
151138
bool has_deployment_type;
152139
logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType deployment_type;
153140
pb_bytes_array_t *platform_info;
154-
bool has_app_extensions;
155-
int64_t app_extensions;
156141
bool has_swizzling_enabled;
157142
bool swizzling_enabled;
158-
bool has_log_error_count;
159-
int32_t log_error_count;
160-
bool has_log_warning_count;
161-
int32_t log_warning_count;
162143
bool has_using_gdt;
163144
bool using_gdt;
164145
/* @@protoc_insertion_point(struct:logs_proto_mobilesdk_ios_ICoreConfiguration) */
@@ -167,30 +148,21 @@ typedef struct _logs_proto_mobilesdk_ios_ICoreConfiguration {
167148
/* Default values for struct fields */
168149

169150
/* Initializer values for message structs */
170-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_init_default {false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType_MIN, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_BuildType_MIN, NULL, 0, NULL, 0, NULL, NULL, NULL, false, 0, NULL, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_PodName_MIN, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_MIN, false, 0, NULL, NULL, NULL, false, 0, false, 0, false, 0, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType_MIN, NULL, false, 0, false, 0, false, 0, false, 0, false, 0}
171-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_init_zero {false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType_MIN, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_BuildType_MIN, NULL, 0, NULL, 0, NULL, NULL, NULL, false, 0, NULL, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_PodName_MIN, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_MIN, false, 0, NULL, NULL, NULL, false, 0, false, 0, false, 0, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType_MIN, NULL, false, 0, false, 0, false, 0, false, 0, false, 0}
151+
#define logs_proto_mobilesdk_ios_ICoreConfiguration_init_default {false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType_MIN, 0, NULL, NULL, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_PodName_MIN, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_MIN, false, 0, NULL, NULL, false, 0, false, 0, false, 0, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType_MIN, NULL, false, 0, false, 0}
152+
#define logs_proto_mobilesdk_ios_ICoreConfiguration_init_zero {false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType_MIN, 0, NULL, NULL, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_PodName_MIN, NULL, NULL, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_MIN, false, 0, NULL, NULL, false, 0, false, 0, false, 0, NULL, false, 0, false, _logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType_MIN, NULL, false, 0, false, 0}
172153

173154
/* Field tags (for use in manual encoding/decoding) */
174155
#define logs_proto_mobilesdk_ios_ICoreConfiguration_pod_name_tag 16
175156
#define logs_proto_mobilesdk_ios_ICoreConfiguration_configuration_type_tag 1
176-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_version_name_tag 2
177157
#define logs_proto_mobilesdk_ios_ICoreConfiguration_icore_version_tag 18
178158
#define logs_proto_mobilesdk_ios_ICoreConfiguration_sdk_version_tag 19
179-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_build_number_tag 3
180-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_build_type_tag 4
181-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_plist_version_tag 5
182-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_sdk_service_enabled_tag 6
183159
#define logs_proto_mobilesdk_ios_ICoreConfiguration_sdk_service_installed_tag 7
184160
#define logs_proto_mobilesdk_ios_ICoreConfiguration_sdk_name_tag 20
185161
#define logs_proto_mobilesdk_ios_ICoreConfiguration_device_model_tag 9
186162
#define logs_proto_mobilesdk_ios_ICoreConfiguration_os_version_tag 22
187163
#define logs_proto_mobilesdk_ios_ICoreConfiguration_app_id_tag 10
188-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_project_number_tag 11
189164
#define logs_proto_mobilesdk_ios_ICoreConfiguration_bundle_id_tag 12
190-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_client_id_tag 13
191-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_itunes_id_tag 23
192165
#define logs_proto_mobilesdk_ios_ICoreConfiguration_min_supported_ios_version_tag 24
193-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_install_tag 14
194166
#define logs_proto_mobilesdk_ios_ICoreConfiguration_use_default_app_tag 25
195167
#define logs_proto_mobilesdk_ios_ICoreConfiguration_app_count_tag 21
196168
#define logs_proto_mobilesdk_ios_ICoreConfiguration_deployed_in_app_store_tag 26
@@ -199,14 +171,11 @@ typedef struct _logs_proto_mobilesdk_ios_ICoreConfiguration {
199171
#define logs_proto_mobilesdk_ios_ICoreConfiguration_using_zip_file_tag 29
200172
#define logs_proto_mobilesdk_ios_ICoreConfiguration_deployment_type_tag 30
201173
#define logs_proto_mobilesdk_ios_ICoreConfiguration_platform_info_tag 31
202-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_app_extensions_tag 32
203174
#define logs_proto_mobilesdk_ios_ICoreConfiguration_swizzling_enabled_tag 33
204-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_log_error_count_tag 34
205-
#define logs_proto_mobilesdk_ios_ICoreConfiguration_log_warning_count_tag 35
206175
#define logs_proto_mobilesdk_ios_ICoreConfiguration_using_gdt_tag 36
207176

208177
/* Struct field encoding specification for nanopb */
209-
extern const pb_field_t logs_proto_mobilesdk_ios_ICoreConfiguration_fields[34];
178+
extern const pb_field_t logs_proto_mobilesdk_ios_ICoreConfiguration_fields[22];
210179

211180
/* Maximum encoded size of messages (where known) */
212181
/* logs_proto_mobilesdk_ios_ICoreConfiguration_size depends on runtime parameters */

‎Firebase/CoreDiagnostics/ProtoSupport/Protos/firebasecore.proto

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,28 +65,17 @@ message ICoreConfiguration {
6565
optional .logs.proto.mobilesdk.ios.ICoreConfiguration.PodName pod_name = 16;
6666
optional .logs.proto.mobilesdk.ios.ICoreConfiguration.ConfigurationType
6767
configuration_type = 1;
68-
optional string version_name = 2;
6968
optional string icore_version = 18;
7069
optional string sdk_version = 19;
71-
optional int64 build_number = 3;
72-
optional .logs.proto.mobilesdk.ios.ICoreConfiguration.BuildType build_type =
73-
4;
74-
optional string plist_version = 5;
75-
repeated .logs.proto.mobilesdk.ios.ICoreConfiguration.ServiceType
76-
sdk_service_enabled = 6;
7770
repeated .logs.proto.mobilesdk.ios.ICoreConfiguration.ServiceType
7871
sdk_service_installed = 7;
7972
optional .logs.proto.mobilesdk.ios.ICoreConfiguration.ServiceType sdk_name =
8073
20;
8174
optional string device_model = 9;
8275
optional string os_version = 22;
8376
optional string app_id = 10;
84-
optional int64 project_number = 11;
8577
optional string bundle_id = 12;
86-
optional string client_id = 13;
87-
optional string itunes_id = 23;
8878
optional string min_supported_ios_version = 24;
89-
optional string install = 14;
9079
optional bool use_default_app = 25;
9180
optional int32 app_count = 21;
9281
optional bool deployed_in_app_store = 26;
@@ -95,9 +84,6 @@ message ICoreConfiguration {
9584
optional bool using_zip_file = 29;
9685
optional DeploymentType deployment_type = 30;
9786
optional string platform_info = 31;
98-
optional int64 app_extensions = 32;
9987
optional bool swizzling_enabled = 33;
100-
optional int32 log_error_count = 34;
101-
optional int32 log_warning_count = 35;
10288
optional bool using_gdt = 36;
10389
}

0 commit comments

Comments
 (0)