Skip to content

Commit 278897f

Browse files
committed
Extracts only the first segment of the pubNubId UUID
1 parent ad9f1f5 commit 278897f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

pubnub-kotlin/pubnub-kotlin-impl/src/main/kotlin/com/pubnub/internal/logging/networkLogging/LogMessageFormatter.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ object LogMessageFormatter {
4242

4343
/**
4444
* Extension function to create a simplified string representation of LogMessage.
45+
* Extracts only the first segment of the pubNubId UUID (e.g., "646f1660" from "646f1660-6621-4c27-8560-597017d1ba95")
46+
* for more concise logging output.
4547
*/
4648
fun LogMessage.simplified(): String {
4749
val messageContent = LogMessageFormatter.formatMessageContent(this.message)
48-
return "PubNub-$pubNubId details: ${details ?: ""}\n$messageContent"
50+
val shortPubNubId = pubNubId?.substringBefore('-')
51+
return "PubNub-$shortPubNubId details: ${details ?: ""}\n$messageContent"
4952
}

pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/internal/logging/networkLogging/LogMessageFormatterTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ class LogMessageFormatterTest {
145145
details = "Additional context information",
146146
type = LogMessageType.TEXT,
147147
location = "TestClass.testMethod",
148-
pubNubId = "test-instance-123",
148+
pubNubId = "646f1660-6621-4c27-8560-597017d1ba95",
149149
logLevel = Level.INFO
150150
)
151151

152152
val result = logMessage.simplified()
153153

154-
assertTrue(result.contains("PubNub-test-instance-123"))
154+
assertTrue(result.contains("PubNub-646f1660"))
155155
assertFalse(result.contains("location: TestClass.testMethod"))
156156
assertTrue(result.contains("details: Additional context information"))
157157
assertTrue(result.contains("This is a test message"))
@@ -164,13 +164,13 @@ class LogMessageFormatterTest {
164164
details = null,
165165
type = LogMessageType.OBJECT,
166166
location = "AnotherClass.anotherMethod",
167-
pubNubId = "test-instance-456",
167+
pubNubId = "646f1660-6621-4c27-8560-597017d1ba95",
168168
logLevel = Level.DEBUG
169169
)
170170

171171
val result = logMessage.simplified()
172172

173-
assertTrue(result.contains("PubNub-test-instance"))
173+
assertTrue(result.contains("PubNub-646f1660"))
174174
assertFalse(result.contains("location: AnotherClass.anotherMethod"))
175175
assertTrue(result.contains("details: ")) // Should show empty string for null details
176176
assertTrue(result.contains("\"key\": \"value\""))
@@ -198,13 +198,13 @@ class LogMessageFormatterTest {
198198
details = "Publishing message to channel",
199199
type = LogMessageType.NETWORK_REQUEST,
200200
location = "PublishEndpoint",
201-
pubNubId = "publish-instance",
201+
pubNubId = "646f1660-6621-4c27-8560-597017d1ba95",
202202
logLevel = Level.DEBUG
203203
)
204204

205205
val result = logMessage.simplified()
206206

207-
assertTrue(result.contains("PubNub-publish-instance"))
207+
assertTrue(result.contains("PubNub-646f1660"))
208208
assertFalse(result.contains("location: PublishEndpoint"))
209209
assertTrue(result.contains("details: Publishing message to channel"))
210210
assertTrue(result.contains("NetworkRequest:"))

0 commit comments

Comments
 (0)