Skip to content

Commit 4bec33f

Browse files
authored
Fill in os_version and app_build_version for Sessions (#11222)
1 parent 4ef20cb commit 4bec33f

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

FirebaseSessions/Sources/Development/DevEventConsoleLogger.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class DevEventConsoleLogger: EventGDTLoggerProtocol {
4848
session_sampling_rate: \(proto.session_data.data_collection_status.session_sampling_rate)
4949
application_info
5050
app_id: \(proto.application_info.app_id.description)
51+
session_sdk_version: \(proto.application_info.session_sdk_version.description)
52+
os_version: \(proto.application_info.os_version.description)
5153
device_model: \(proto.application_info.device_model.description)
5254
development_platform_name: \(proto.application_info.development_platform_name.description)
5355
development_platform_version: \(proto.application_info.development_platform_version
@@ -56,6 +58,7 @@ class DevEventConsoleLogger: EventGDTLoggerProtocol {
5658
apple_app_info
5759
bundle_short_version: \(proto.application_info.apple_app_info.bundle_short_version
5860
.description)
61+
app_build_version: \(proto.application_info.apple_app_info.app_build_version.description)
5962
network_connection_info
6063
network_type: \(proto.application_info.apple_app_info.network_connection_info
6164
.network_type.rawValue)

FirebaseSessions/Sources/SessionStartEvent.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class SessionStartEvent: NSObject, GDTCOREventDataObject {
4949

5050
proto.application_info.app_id = makeProtoString(appInfo.appID)
5151
proto.application_info.session_sdk_version = makeProtoString(appInfo.sdkVersion)
52+
proto.application_info.os_version = makeProtoString(appInfo.osDisplayVersion)
5253
proto.application_info.log_environment = convertLogEnvironment(environment: appInfo.environment)
5354
proto.application_info.device_model = makeProtoString(appInfo.deviceModel)
5455
// proto.application_info.development_platform_name;
@@ -58,6 +59,8 @@ class SessionStartEvent: NSObject, GDTCOREventDataObject {
5859
proto.application_info.which_platform_info = FIRSESGetAppleApplicationInfoTag()
5960
proto.application_info.apple_app_info
6061
.bundle_short_version = makeProtoString(appInfo.appDisplayVersion)
62+
proto.application_info.apple_app_info
63+
.app_build_version = makeProtoString(appInfo.appBuildVersion)
6164
proto.application_info.apple_app_info.os_name = convertOSName(osName: appInfo.osName)
6265

6366
// Set network info to base values but don't fill them in with the real

FirebaseSessions/Tests/Unit/SessionStartEventTests.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,21 @@ class SessionStartEventTests: XCTestCase {
104104
expected: MockApplicationInfo.testSDKVersion,
105105
fieldName: "session_sdk_version"
106106
)
107+
assertEqualProtoString(
108+
proto.application_info.os_version,
109+
expected: MockApplicationInfo.testOsDisplayVersion,
110+
fieldName: "os_version"
111+
)
107112
assertEqualProtoString(
108113
proto.application_info.apple_app_info.bundle_short_version,
109114
expected: MockApplicationInfo.testAppDisplayVersion,
110115
fieldName: "bundle_short_version"
111116
)
117+
assertEqualProtoString(
118+
proto.application_info.apple_app_info.app_build_version,
119+
expected: MockApplicationInfo.testAppBuildVersion,
120+
fieldName: "app_build_version"
121+
)
112122
assertEqualProtoString(
113123
proto.application_info.device_model,
114124
expected: MockApplicationInfo.testDeviceModel,

0 commit comments

Comments
 (0)