git.iko.soy/parseable-android
on master help sign in
Add severity-based row tinting in log viewer (#15)
c55e0c3iko
app/src/main/java/com/parseable/android/ui/screens/logviewer/LogViewerScreen.kt+3−1
compare with master
unifiedsplit
@@ -649,7 +649,9 @@ fun LogEntryCard(
649 onCopied: () -> Unit = {},
649 onCopied: () -> Unit = {},
650 clipboardManager: android.content.ClipboardManager,
650 clipboardManager: android.content.ClipboardManager,
651) {
651) {
652+ val severity = remember(logEntry) { detectSeverity(logEntry) }
653+ val severityTint = severityBackgroundColor(severity)
652− val containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
654+ val containerColor = severityTint ?: MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f)
653 val cardColors = CardDefaults.cardColors(containerColor = containerColor)
655 val cardColors = CardDefaults.cardColors(containerColor = containerColor)
654 Card(
656 Card(
655 onClick = onClick,
657 onClick = onClick,
app/src/main/java/com/parseable/android/ui/screens/logviewer/SeverityColor.ktnew file+140
@@ -0,0 +1,140 @@
1+package com.parseable.android.ui.screens.logviewer
2+
3+import androidx.compose.foundation.isSystemInDarkTheme
4+import androidx.compose.runtime.Composable
5+import androidx.compose.ui.graphics.Color
6+import kotlinx.serialization.json.JsonObject
7+import kotlinx.serialization.json.JsonPrimitive
8+
9+/**
10+ * Severity levels for log entries, ordered from most to least severe.
11+ */
12+enum class LogSeverity {
13+ FATAL,
14+ ERROR,
15+ WARNING,
16+ INFO,
17+ DEBUG,
18+ TRACE,
19+ UNKNOWN,
20+}
21+
22+/**
23+ * Field names commonly used for severity/level across logging frameworks.
24+ * Checked in order of priority (case-insensitive).
25+ */
26+private val SEVERITY_FIELD_NAMES = listOf(
27+ "level",
28+ "severity",
29+ "loglevel",
30+ "log_level",
31+ "log.level",
32+ "priority",
33+ "verbosity",
34+ "p_level",
35+ "status",
36+ "syslog_severity",
37+ "log_severity",
38+ "msg_severity",
39+ "event_severity",
40+)
41+
42+/**
43+ * Attempts to detect the severity level from a log entry by checking common field names.
44+ * Returns [LogSeverity.UNKNOWN] if no recognizable severity field or value is found.
45+ */
46+fun detectSeverity(logEntry: JsonObject): LogSeverity {
47+ for (fieldName in SEVERITY_FIELD_NAMES) {
48+ val entry = logEntry.entries.firstOrNull { it.key.equals(fieldName, ignoreCase = true) }
49+ if (entry != null) {
50+ val value = entry.value
51+ if (value is JsonPrimitive) {
52+ val parsed = parseSeverityValue(value.content, entry.key)
53+ if (parsed != LogSeverity.UNKNOWN) return parsed
54+ }
55+ }
56+ }
57+ return LogSeverity.UNKNOWN
58+}
59+
60+private fun parseSeverityValue(raw: String, fieldName: String): LogSeverity {
61+ val trimmed = raw.trim()
62+ if (trimmed.isEmpty()) return LogSeverity.UNKNOWN
63+
64+ // Try numeric parsing first
65+ trimmed.toIntOrNull()?.let { num ->
66+ return when {
67+ // Syslog severity (0 = emergency .. 7 = debug)
68+ fieldName.equals("syslog_severity", ignoreCase = true) ||
69+ fieldName.equals("priority", ignoreCase = true) -> when (num) {
70+ 0, 1, 2 -> LogSeverity.FATAL // emergency, alert, critical
71+ 3 -> LogSeverity.ERROR
72+ 4 -> LogSeverity.WARNING
73+ 5 -> LogSeverity.INFO // notice
74+ 6 -> LogSeverity.INFO // informational
75+ 7 -> LogSeverity.DEBUG
76+ else -> LogSeverity.UNKNOWN
77+ }
78+ // HTTP status codes
79+ fieldName.equals("status", ignoreCase = true) -> when {
80+ num >= 500 -> LogSeverity.ERROR
81+ num >= 400 -> LogSeverity.WARNING
82+ num in 200..399 -> LogSeverity.INFO
83+ else -> LogSeverity.UNKNOWN
84+ }
85+ // Generic numeric (Java util logging style: higher = more severe)
86+ else -> when {
87+ num >= 1000 -> LogSeverity.FATAL
88+ num >= 900 -> LogSeverity.ERROR
89+ num >= 800 -> LogSeverity.WARNING
90+ num >= 700 -> LogSeverity.INFO
91+ num >= 400 -> LogSeverity.DEBUG
92+ num > 0 -> LogSeverity.TRACE
93+ else -> LogSeverity.UNKNOWN
94+ }
95+ }
96+ }
97+
98+ // String-based matching (case-insensitive)
99+ return when (trimmed.uppercase()) {
100+ "FATAL", "F", "CRIT", "CRITICAL", "EMERG", "EMERGENCY",
101+ "ALERT", "A", "PANIC",
102+ -> LogSeverity.FATAL
103+
104+ "ERROR", "ERR", "E", "SEVERE", "FAILURE", "FAIL",
105+ -> LogSeverity.ERROR
106+
107+ "WARN", "WARNING", "W",
108+ -> LogSeverity.WARNING
109+
110+ "INFO", "I", "INFORMATION", "INFORMATIONAL", "NOTICE", "N",
111+ "OK", "SUCCESS",
112+ -> LogSeverity.INFO
113+
114+ "DEBUG", "D", "FINE", "CONFIG", "FINER",
115+ -> LogSeverity.DEBUG
116+
117+ "TRACE", "T", "V", "VERBOSE", "FINEST", "ALL",
118+ -> LogSeverity.TRACE
119+
120+ else -> LogSeverity.UNKNOWN
121+ }
122+}
123+
124+/**
125+ * Returns a subtle background tint color for the given severity level,
126+ * or `null` to use the default card color.
127+ */
128+@Composable
129+fun severityBackgroundColor(severity: LogSeverity): Color? {
130+ val isDark = isSystemInDarkTheme()
131+ return when (severity) {
132+ LogSeverity.FATAL -> if (isDark) Color(0xFF3A1820) else Color(0xFFFCE4EC)
133+ LogSeverity.ERROR -> if (isDark) Color(0xFF2D1A1E) else Color(0xFFFDECEC)
134+ LogSeverity.WARNING -> if (isDark) Color(0xFF2D2715) else Color(0xFFFFF8E1)
135+ LogSeverity.INFO -> if (isDark) Color(0xFF152535) else Color(0xFFE8F4FD)
136+ LogSeverity.DEBUG -> null
137+ LogSeverity.TRACE -> if (isDark) Color(0xFF1E1F25) else Color(0xFFF5F5F8)
138+ LogSeverity.UNKNOWN -> null
139+ }
140+}
app/src/test/java/com/parseable/android/SeverityDetectionTest.ktnew file+167
@@ -0,0 +1,167 @@
1+package com.parseable.android
2+
3+import com.parseable.android.ui.screens.logviewer.LogSeverity
4+import com.parseable.android.ui.screens.logviewer.detectSeverity
5+import kotlinx.serialization.json.JsonObject
6+import kotlinx.serialization.json.JsonPrimitive
7+import org.junit.Assert.assertEquals
8+import org.junit.Test
9+
10+class SeverityDetectionTest {
11+
12+ private fun logWith(vararg pairs: Pair<String, String>): JsonObject {
13+ return JsonObject(pairs.associate { (k, v) -> k to JsonPrimitive(v) })
14+ }
15+
16+ // --- Field name detection ---
17+
18+ @Test
19+ fun `detects level field`() {
20+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("level" to "error")))
21+ }
22+
23+ @Test
24+ fun `detects severity field`() {
25+ assertEquals(LogSeverity.WARNING, detectSeverity(logWith("severity" to "warn")))
26+ }
27+
28+ @Test
29+ fun `detects loglevel field`() {
30+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("loglevel" to "info")))
31+ }
32+
33+ @Test
34+ fun `detects log_level field`() {
35+ assertEquals(LogSeverity.DEBUG, detectSeverity(logWith("log_level" to "debug")))
36+ }
37+
38+ @Test
39+ fun `field name matching is case-insensitive`() {
40+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("Level" to "ERROR")))
41+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("SEVERITY" to "error")))
42+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("LogLevel" to "ERR")))
43+ }
44+
45+ @Test
46+ fun `returns UNKNOWN when no severity field present`() {
47+ assertEquals(LogSeverity.UNKNOWN, detectSeverity(logWith("message" to "hello", "host" to "server1")))
48+ }
49+
50+ @Test
51+ fun `returns UNKNOWN for empty log entry`() {
52+ assertEquals(LogSeverity.UNKNOWN, detectSeverity(JsonObject(emptyMap())))
53+ }
54+
55+ // --- String value matching ---
56+
57+ @Test
58+ fun `matches fatal variants`() {
59+ for (value in listOf("fatal", "FATAL", "F", "crit", "critical", "emerg", "emergency", "alert", "panic")) {
60+ assertEquals("Expected FATAL for '$value'", LogSeverity.FATAL, detectSeverity(logWith("level" to value)))
61+ }
62+ }
63+
64+ @Test
65+ fun `matches error variants`() {
66+ for (value in listOf("error", "ERROR", "err", "E", "severe", "failure", "fail")) {
67+ assertEquals("Expected ERROR for '$value'", LogSeverity.ERROR, detectSeverity(logWith("level" to value)))
68+ }
69+ }
70+
71+ @Test
72+ fun `matches warning variants`() {
73+ for (value in listOf("warn", "WARNING", "W", "warning")) {
74+ assertEquals("Expected WARNING for '$value'", LogSeverity.WARNING, detectSeverity(logWith("level" to value)))
75+ }
76+ }
77+
78+ @Test
79+ fun `matches info variants`() {
80+ for (value in listOf("info", "INFO", "I", "information", "informational", "notice", "ok", "success")) {
81+ assertEquals("Expected INFO for '$value'", LogSeverity.INFO, detectSeverity(logWith("level" to value)))
82+ }
83+ }
84+
85+ @Test
86+ fun `matches debug variants`() {
87+ for (value in listOf("debug", "DEBUG", "D", "fine", "config", "finer")) {
88+ assertEquals("Expected DEBUG for '$value'", LogSeverity.DEBUG, detectSeverity(logWith("level" to value)))
89+ }
90+ }
91+
92+ @Test
93+ fun `matches trace variants`() {
94+ for (value in listOf("trace", "TRACE", "T", "V", "verbose", "finest", "all")) {
95+ assertEquals("Expected TRACE for '$value'", LogSeverity.TRACE, detectSeverity(logWith("level" to value)))
96+ }
97+ }
98+
99+ @Test
100+ fun `value matching is case-insensitive`() {
101+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("level" to "Error")))
102+ assertEquals(LogSeverity.WARNING, detectSeverity(logWith("level" to "WaRnInG")))
103+ }
104+
105+ @Test
106+ fun `trims whitespace from values`() {
107+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("level" to " error ")))
108+ }
109+
110+ @Test
111+ fun `returns UNKNOWN for unrecognized values`() {
112+ assertEquals(LogSeverity.UNKNOWN, detectSeverity(logWith("level" to "custom_level")))
113+ }
114+
115+ // --- Numeric values ---
116+
117+ @Test
118+ fun `syslog severity numeric values`() {
119+ assertEquals(LogSeverity.FATAL, detectSeverity(logWith("syslog_severity" to "0"))) // emergency
120+ assertEquals(LogSeverity.FATAL, detectSeverity(logWith("syslog_severity" to "1"))) // alert
121+ assertEquals(LogSeverity.FATAL, detectSeverity(logWith("syslog_severity" to "2"))) // critical
122+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("syslog_severity" to "3"))) // error
123+ assertEquals(LogSeverity.WARNING, detectSeverity(logWith("syslog_severity" to "4"))) // warning
124+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("syslog_severity" to "5"))) // notice
125+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("syslog_severity" to "6"))) // informational
126+ assertEquals(LogSeverity.DEBUG, detectSeverity(logWith("syslog_severity" to "7"))) // debug
127+ }
128+
129+ @Test
130+ fun `HTTP status code mapping`() {
131+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("status" to "200")))
132+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("status" to "301")))
133+ assertEquals(LogSeverity.WARNING, detectSeverity(logWith("status" to "404")))
134+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("status" to "500")))
135+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("status" to "503")))
136+ }
137+
138+ @Test
139+ fun `generic numeric level mapping`() {
140+ assertEquals(LogSeverity.FATAL, detectSeverity(logWith("level" to "1000")))
141+ assertEquals(LogSeverity.ERROR, detectSeverity(logWith("level" to "900")))
142+ assertEquals(LogSeverity.WARNING, detectSeverity(logWith("level" to "800")))
143+ assertEquals(LogSeverity.INFO, detectSeverity(logWith("level" to "700")))
144+ assertEquals(LogSeverity.DEBUG, detectSeverity(logWith("level" to "500")))
145+ assertEquals(LogSeverity.TRACE, detectSeverity(logWith("level" to "100")))
146+ }
147+
148+ // --- Priority among fields ---
149+
150+ @Test
151+ fun `level field takes priority over status`() {
152+ val log = JsonObject(mapOf(
153+ "level" to JsonPrimitive("error"),
154+ "status" to JsonPrimitive("200"),
155+ ))
156+ assertEquals(LogSeverity.ERROR, detectSeverity(log))
157+ }
158+
159+ @Test
160+ fun `first matching field with recognized value wins`() {
161+ val log = JsonObject(mapOf(
162+ "level" to JsonPrimitive("unknown_value"),
163+ "severity" to JsonPrimitive("warn"),
164+ ))
165+ assertEquals(LogSeverity.WARNING, detectSeverity(log))
166+ }
167+}