Merge branch 'feat/unhandled-sessions-protocol' into feat/unhandled-sessions-cache

Author: buenaflor

sentry/src/main/java/io/sentry/Session.java

@@ -99,6 +99,46 @@ public Session(
       final @Nullable String environment,
       final @NotNull String release,
       final @Nullable String abnormalMechanism) {
+    this(
+        status,
+        started,
+        timestamp,
+        errorCount,
+        distinctId,
+        sessionId,
+        init,
+        sequence,
+        duration,
+        ipAddress,
+        userAgent,
+        environment,
+        release,
+        abnormalMechanism,
+        false);
+  }
+
+  /**
+   * Canonical constructor. Kept private so {@code nonTerminatingUnhandledError} stays off the
+   * public API: it is internal bookkeeping that only {@link #clone()} and {@link Deserializer} need
+   * to restore, and a public overload carrying it would let callers fabricate a session claiming an
+   * unhandled error that was never counted.
+   */
+  private Session(
+      final @NotNull State status,
+      final @NotNull Date started,
+      final @Nullable Date timestamp,
+      final int errorCount,
+      final @Nullable String distinctId,
+      final @Nullable String sessionId,
+      final @Nullable Boolean init,
+      final @Nullable Long sequence,
+      final @Nullable Double duration,
+      final @Nullable String ipAddress,
+      final @Nullable String userAgent,
+      final @Nullable String environment,
+      final @NotNull String release,
+      final @Nullable String abnormalMechanism,
+      final boolean nonTerminatingUnhandledError) {
     this.status = status;
     this.started = started;
     this.timestamp = timestamp;
@@ -113,6 +153,7 @@ public Session(
     this.environment = environment;
     this.release = release;
     this.abnormalMechanism = abnormalMechanism;
+    this.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
   }
 
   public Session(
@@ -368,24 +409,22 @@ private long getSequenceTimestamp(final @NotNull Date timestamp) {
    */
   @SuppressWarnings("MissingOverride")
   public @NotNull Session clone() {
-    final Session session =
-        new Session(
-            status,
-            started,
-            timestamp,
-            errorCount.get(),
-            distinctId,
-            sessionId,
-            init,
-            sequence,
-            duration,
-            ipAddress,
-            userAgent,
-            environment,
-            release,
-            abnormalMechanism);
-    session.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
-    return session;
+    return new Session(
+        status,
+        started,
+        timestamp,
+        errorCount.get(),
+        distinctId,
+        sessionId,
+        init,
+        sequence,
+        duration,
+        ipAddress,
+        userAgent,
+        environment,
+        release,
+        abnormalMechanism,
+        nonTerminatingUnhandledError);
   }
 
   // JsonSerializable
@@ -604,8 +643,8 @@ public static final class Deserializer implements JsonDeserializer<Session> {
               userAgent,
               environment,
               release,
-              abnormalMechanism);
-      session.nonTerminatingUnhandledError = nonTerminatingUnhandledError;
+              abnormalMechanism,
+              nonTerminatingUnhandledError);
       session.setUnknown(unknown);
       reader.endObject();
       return session;