Skip to content

Commit

Permalink
Merge branch 'dev' into SUITEDEV-35599-MultiID-for-predict
Browse files Browse the repository at this point in the history
  • Loading branch information
@megamegax
megamegax committed Feb 3, 2025
2 parents 6fc647f + 9902579 commit bfd5cbe
Show file tree
Hide file tree
Showing 2 changed files with 154 additions and 7 deletions.
145 changes: 139 additions & 6 deletions core/src/androidTest/java/com/emarsys/core/util/log/LoggerTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import org.mockito.kotlin.verifyNoInteractions
import org.mockito.kotlin.whenever
import java.util.concurrent.CountDownLatch

class LoggerTest {
class LoggerTest {

companion object {
const val TIMESTAMP = 400L
Expand Down Expand Up @@ -99,6 +99,15 @@ class LoggerTest {

@Test
fun testPersistLog_addsLog_toShardRepository() {
loggerInstance.handleLog(
LogLevel.INFO, logEntryMock(
"log_request", mapOf(
"key1" to "value",
"key2" to 3,
"key3" to true
)
), null
)
loggerInstance.persistLog(
LogLevel.ERROR, logEntryMock(
"log_request", mapOf(
Expand All @@ -114,20 +123,137 @@ class LoggerTest {
runBlocking {
verify(mockShardRepository, timeout(100)).add(capture<ShardModel>(captor))
}

captor.value shouldBe ShardModel(
val expected = ShardModel(
UUID,
"log_request",
mapOf(
"key1" to "value",
"key2" to 3,
"key3" to true,
"level" to "ERROR",
"thread" to "testThreadName",
"breadcrumbs" to listOf("topic='log_request', data={key1=value, key2=3, key3=true}"),
),
TIMESTAMP,
TTL
)
val result = captor.value
result.id shouldBe expected.id
result.timestamp shouldBe expected.timestamp
result.ttl shouldBe expected.ttl
result.data shouldBe expected.data
}

@Test
fun testPersistLog_DoesntAddBreadcumbs_toNonErrorLog() {
whenever(mockLogLevelStorage.get()).thenReturn("INFO")

for (i in 0..13) {
loggerInstance.handleLog(
LogLevel.DEBUG, logEntryMock(
"log_request", mapOf(
"key$i" to "value",
"key2" to 3,
"key3" to true
)
), null
)
}
loggerInstance.persistLog(
LogLevel.INFO, logEntryMock(
"log_request", mapOf(
"key14" to "value",
"key2" to 3,
"key3" to true
)
), "testThreadName", null
)

val captor = ArgumentCaptor.forClass(ShardModel::class.java)

runBlocking {
verify(mockShardRepository, timeout(100)).add(capture<ShardModel>(captor))
}
val expected = ShardModel(
UUID,
"log_request",
mapOf(
"key14" to "value",
"key2" to 3,
"key3" to true,
"level" to "INFO",
"thread" to "testThreadName"
),
TIMESTAMP,
TTL
)
val result = captor.value
result.id shouldBe expected.id
result.timestamp shouldBe expected.timestamp
result.ttl shouldBe expected.ttl
result.data shouldBe expected.data
}

@Test
fun testPersistLog_addsBreadcumbs_toErrorLog() {

for (i in 0..13) {
loggerInstance.handleLog(
LogLevel.INFO, logEntryMock(
"log_request", mapOf(
"key$i" to "value",
"key2" to 3,
"key3" to true
)
), null
)
}
loggerInstance.persistLog(
LogLevel.ERROR, logEntryMock(
"log_request", mapOf(
"key14" to "value",
"key2" to 3,
"key3" to true
)
), "testThreadName", null
)

val captor = ArgumentCaptor.forClass(ShardModel::class.java)

runBlocking {
verify(mockShardRepository, timeout(100)).add(capture<ShardModel>(captor))
}
val expected = ShardModel(
UUID,
"log_request",
mapOf(
"key14" to "value",
"key2" to 3,
"key3" to true,
"level" to "ERROR",
"thread" to "testThreadName",
"breadcrumbs" to listOf(
"topic='log_request', data={key13=value, key2=3, key3=true}",
"topic='log_request', data={key12=value, key2=3, key3=true}",
"topic='log_request', data={key11=value, key2=3, key3=true}",
"topic='log_request', data={key10=value, key2=3, key3=true}",
"topic='log_request', data={key9=value, key2=3, key3=true}",
"topic='log_request', data={key8=value, key2=3, key3=true}",
"topic='log_request', data={key7=value, key2=3, key3=true}",
"topic='log_request', data={key6=value, key2=3, key3=true}",
"topic='log_request', data={key5=value, key2=3, key3=true}",
"topic='log_request', data={key4=value, key2=3, key3=true}",
"topic='log_request', data={key3=true, key2=3}"
),
),
TIMESTAMP,
TTL
)
val result = captor.value
result.id shouldBe expected.id
result.timestamp shouldBe expected.timestamp
result.ttl shouldBe expected.ttl
result.data shouldBe expected.data
}

@Test
Expand All @@ -154,16 +280,23 @@ class LoggerTest {
runBlocking {
verify(mockShardRepository, timeout(100)).add(capture<ShardModel>(captor))
}
captor.value shouldBe ShardModel(
val expected = ShardModel(
UUID,
"any_log",
"log_request",
mapOf(

"level" to "ERROR",
"thread" to "testThreadName"
"thread" to "testThreadName",
"breadcrumbs" to listOf<String>(),
),
TIMESTAMP,
TTL
)
val result = captor.value
result.id shouldBe expected.id
result.timestamp shouldBe expected.timestamp
result.ttl shouldBe expected.ttl
result.data shouldBe expected.data
}

@Test
Expand Down
16 changes: 15 additions & 1 deletion core/src/main/java/com/emarsys/core/util/log/Logger.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class Logger(

companion object {
const val TAG = "Emarsys SDK"
val queue = ArrayDeque<LogEntry>(10)

@JvmStatic
fun log(logEntry: LogEntry) {
Expand Down Expand Up @@ -91,6 +92,12 @@ class Logger(
fun handleLog(logLevel: LogLevel, logEntry: LogEntry, onCompleted: (() -> Unit)? = null) {
val currentThreadName = Thread.currentThread().name
concurrentHandlerHolder.coreHandler.post {
if (logLevel == DEBUG || logLevel == INFO) {
if (queue.size > 10) {
queue.removeLast()
}
queue.addFirst(logEntry)
}
val isDebugMode: Boolean =
0 != context.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
if ((verboseConsoleLoggingEnabled || logEntry is MethodNotAllowed) && isDebugMode) {
Expand All @@ -106,18 +113,23 @@ class Logger(
when (logLevel) {
DEBUG ->
Log.d(TAG, logEntry.asString())

TRACE ->
Log.v(TAG, logEntry.asString())

INFO ->
Log.i(TAG, logEntry.asString())

WARN ->
Log.w(TAG, logEntry.asString())

ERROR ->
if (logEntry is CrashLog) {
Log.e(TAG, logEntry.asString(), logEntry.throwable)
} else {
Log.e(TAG, logEntry.asString())
}

else -> {
}
}
Expand All @@ -140,10 +152,12 @@ class Logger(
logLevel,
currentThreadName,
WrapperInfoContainer.wrapperInfo
)
) + if (logLevel == ERROR) mapOf("breadcrumbs" to queue.map { it.asString() }) else emptyMap()
)
.build()
shardRepository.add(shard)
if (logLevel == ERROR)
queue.clear()
onCompleted?.invoke()
}
} else {
Expand Down

0 comments on commit bfd5cbe

Please sign in to comment.