fix: Transfer session as string value

Avoid ambiguity/conversion differences between layers
bugsnag · Sep 21, 2018 · 7876dfb · 7876dfb
1 parent 8c82a15
commit 7876dfb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java b/ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java
@@ -53,7 +53,7 @@ public static native void addBreadcrumb(String name, String type, String timesta
 
     public static native void removeMetadata(String tab, String key);
 
-    public static native void startedSession(String sessionID, long key);
+    public static native void startedSession(String sessionID, String key);
 
     public static native void updateAppVersion(String appVersion);
 
@@ -302,8 +302,8 @@ private void handleStartSession(Object arg) {
             if (metadata.size() == 2) {
                 Object id = metadata.get(0);
                 Object startTime = metadata.get(1);
-                if (id instanceof String && startTime instanceof Long) {
-                    startedSession((String)id, (Long)startTime);
+                if (id instanceof String && startTime instanceof String) {
+                    startedSession((String)id, (String)startTime);
                     return;
                 }
             }

diff --git a/ndk/src/main/jni/bugsnag_ndk.c b/ndk/src/main/jni/bugsnag_ndk.c
@@ -122,15 +122,17 @@ Java_com_bugsnag_android_ndk_NativeBridge_addHandledEvent(JNIEnv *env,
 }
 
 JNIEXPORT void JNICALL Java_com_bugsnag_android_ndk_NativeBridge_startedSession(
-    JNIEnv *env, jobject _this, jstring session_id_, jlong start_date_) {
+    JNIEnv *env, jobject _this, jstring session_id_, jstring start_date_) {
   if (bsg_global_env == NULL || session_id_ == NULL)
     return;
   char *session_id = (char *)(*env)->GetStringUTFChars(env, session_id_, 0);
+  char *started_at = (char *)(*env)->GetStringUTFChars(env, start_date_, 0);
   bsg_request_env_write_lock();
   bugsnag_report_start_session(&bsg_global_env->next_report, session_id,
-                               (long)start_date_);
+                               started_at);
   bsg_release_env_write_lock();
   (*env)->ReleaseStringUTFChars(env, session_id_, session_id);
+  (*env)->ReleaseStringUTFChars(env, start_date_, started_at);
 }
 
 JNIEXPORT void JNICALL

diff --git a/ndk/src/main/jni/report.c b/ndk/src/main/jni/report.c
@@ -83,9 +83,10 @@ void bugsnag_report_remove_metadata_tab(bugsnag_report *report, char *section) {
 }
 
 void bugsnag_report_start_session(bugsnag_report *report, char *session_id,
-                                  long started_at) {
+                                  char *started_at) {
   bsg_strncpy_safe(report->session_id, session_id, sizeof(report->session_id));
-  report->session_start = started_at;
+  bsg_strncpy_safe(report->session_start, started_at,
+                   sizeof(report->session_start));
   report->handled_events = 0;
 }
 

diff --git a/ndk/src/main/jni/report.h b/ndk/src/main/jni/report.h
@@ -289,7 +289,7 @@ typedef struct {
   bsg_severity_t severity;
 
   char session_id[33];
-  time_t session_start;
+  char session_start[33];
   int handled_events;
 } bugsnag_report;
 
@@ -314,7 +314,7 @@ void bugsnag_report_set_user_email(bugsnag_report *report, char *value);
 void bugsnag_report_set_user_id(bugsnag_report *report, char *value);
 void bugsnag_report_set_user_name(bugsnag_report *report, char *value);
 void bugsnag_report_start_session(bugsnag_report *report, char *session_id,
-                                  long started_at);
+                                  char *started_at);
 #ifdef __cplusplus
 }
 #endif

diff --git a/ndk/src/main/jni/utils/serializer.c b/ndk/src/main/jni/utils/serializer.c
@@ -252,9 +252,8 @@ char *bsg_serialize_report_to_json_string(bugsnag_report *report) {
     if (strlen(report->user.id) > 0)
       json_object_dotset_string(event, "user.id", report->user.id);
     if (strlen(report->session_id) > 0) {
-      strftime(report_time, sizeof report_time, "%FT%TZ",
-               gmtime(&report->session_start));
-      json_object_dotset_string(event, "session.startedAt", report_time);
+      json_object_dotset_string(event, "session.startedAt",
+                                report->session_start);
       json_object_dotset_string(event, "session.id", report->session_id);
       json_object_dotset_number(event, "session.events.handled",
                                 report->handled_events);

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ObserverInterfaceTest.java
@@ -159,7 +159,7 @@ public void testStartSessionSendsMessage() throws InterruptedException {
                 NativeInterface.MessageType.START_SESSION, List.class);
         assertEquals(2, sessionInfo.size());
         assertTrue(sessionInfo.get(0) instanceof String);
-        assertTrue(sessionInfo.get(1) instanceof Long);
+        assertTrue(sessionInfo.get(1) instanceof String);
     }
 
     @Test

diff --git a/sdk/src/main/java/com/bugsnag/android/NativeInterface.java b/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
@@ -53,7 +53,7 @@ public enum MessageType {
         /**
          * A new session was started. The Message object should be a string
          * array
-         * containing [id, startDate]
+         * containing [id, startDateIsoString]
          */
         START_SESSION,
         /**

diff --git a/sdk/src/main/java/com/bugsnag/android/SessionTracker.java b/sdk/src/main/java/com/bugsnag/android/SessionTracker.java
@@ -116,9 +116,10 @@ public void run() {
                 sessionStore.write(session);
             }
             setChanged();
+            String startedAt = DateUtils.toIso8601(session.getStartedAt());
             notifyObservers(new NativeInterface.Message(
                         NativeInterface.MessageType.START_SESSION,
-                        Arrays.asList(session.getId(), session.getStartedAt().getTime())));
+                        Arrays.asList(session.getId(), startedAt)));
         }
     }