From 68f3a7befe0288994118f7ecd244636b8fe25e4f Mon Sep 17 00:00:00 2001
From: Abhay Sood <abhay@measure.sh>
Date: Mon, 2 Mar 2026 10:32:47 +0530
Subject: [PATCH] chore(android): use ISO 8601 for session start time attribute

Also, use same time for session start event timestamp
---
 .../src/main/java/sh/measure/android/MeasureInternal.kt     | 2 +-
 .../measure/android/attributes/SessionAttributeProcessor.kt | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/measure/src/main/java/sh/measure/android/MeasureInternal.kt b/android/measure/src/main/java/sh/measure/android/MeasureInternal.kt
index a8ac8b719..47ab6b1dc 100644
--- a/android/measure/src/main/java/sh/measure/android/MeasureInternal.kt
+++ b/android/measure/src/main/java/sh/measure/android/MeasureInternal.kt
@@ -42,7 +42,7 @@ internal class MeasureInternal(private val measure: MeasureInitializer) : AppLif
         // is triggered.
         measure.signalProcessor.track(
             SessionStartData,
-            timestamp = measure.timeProvider.now(),
+            timestamp = measure.sessionManager.getSessionStartTime(),
             type = EventType.SESSION_START,
             sessionId = sessionId,
             // always sample session start event
diff --git a/android/measure/src/main/java/sh/measure/android/attributes/SessionAttributeProcessor.kt b/android/measure/src/main/java/sh/measure/android/attributes/SessionAttributeProcessor.kt
index a13976f54..6b71de8ba 100644
--- a/android/measure/src/main/java/sh/measure/android/attributes/SessionAttributeProcessor.kt
+++ b/android/measure/src/main/java/sh/measure/android/attributes/SessionAttributeProcessor.kt
@@ -1,6 +1,7 @@
 package sh.measure.android.attributes
 
 import sh.measure.android.SessionManager
+import sh.measure.android.utils.iso8601Timestamp
 
 /**
  * Generates the session start time attribute. This attribute changes when a new session is created,
@@ -10,6 +11,9 @@ internal class SessionAttributeProcessor(
     private val sessionManager: SessionManager,
 ) : AttributeProcessor {
     override fun appendAttributes(attributes: MutableMap<String, Any?>) {
-        attributes.put(Attribute.SESSION_START_TIME_KEY, sessionManager.getSessionStartTime())
+        attributes.put(
+            Attribute.SESSION_START_TIME_KEY,
+            sessionManager.getSessionStartTime().iso8601Timestamp(),
+        )
     }
 }