Skip to content

Commit 0edf633

Browse files
committed
RUM-10485: Add LogEvent.accountInfo property mapping for iOS models
1 parent 7a74cc6 commit 0edf633

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

β€Žfeatures/logs/src/appleMain/kotlin/com/datadog/kmp/log/configuration/internal/IOSLogsConfigurationBuilder.ktβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ internal class IOSLogsConfigurationBuilder : PlatformLogsConfigurationBuilder<DD
4040
logEvent.userInfo().setExtraInfo(eraseKeyType(it))
4141
}
4242

43-
// TODO RUM-10485 LogEvent.account is missing in iOS SDK ObjC API
43+
mapped.account?.additionalProperties?.let {
44+
logEvent.accountInfo()?.setExtraInfo(eraseKeyType(it))
45+
}
4446

4547
logEvent
4648
}

β€Žfeatures/logs/src/appleMain/kotlin/com/datadog/kmp/log/model/internal/LogEventMappingExt.ktβ€Ž

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.datadog.kmp.log.model.internal
88

99
import cocoapods.DatadogLogs.DDLogEvent
10+
import cocoapods.DatadogLogs.DDLogEventAccountInfo
1011
import cocoapods.DatadogLogs.DDLogEventDd
1112
import cocoapods.DatadogLogs.DDLogEventDevice
1213
import cocoapods.DatadogLogs.DDLogEventError
@@ -34,7 +35,7 @@ internal fun DDLogEvent.toCommonModel(): LogEvent = LogEvent(
3435
),
3536
dd = dd().toCommonModel(),
3637
usr = userInfo().toCommonModel(),
37-
// TODO RUM-10485 LogEvent.account is missing in iOS SDK ObjC API
38+
account = accountInfo()?.toCommonModel(),
3839
// TODO RUM-6098 The way network/carrier information is passed varies a lot between Android and iOS, removing it
3940
// from the model for now
4041
error = error()?.toCommonModel(),
@@ -72,6 +73,12 @@ internal fun DDLogEventUserInfo.toCommonModel(): LogEvent.Usr = LogEvent.Usr(
7273
additionalProperties = extraInfo().mapKeys { it.key as String }.toMutableMap()
7374
)
7475

76+
internal fun DDLogEventAccountInfo.toCommonModel(): LogEvent.Account = LogEvent.Account(
77+
id = id(),
78+
name = name(),
79+
additionalProperties = extraInfo().mapKeys { it.key as String }.toMutableMap()
80+
)
81+
7582
internal fun DDLogEventError.toCommonModel(): LogEvent.Error = LogEvent.Error(
7683
kind = kind(),
7784
message = message(),

0 commit comments

Comments
 (0)