Revert internal perf session id

Author: tejasd

firebase-perf/src/main/java/com/google/firebase/perf/session/FirebasePerformanceSessionSubscriber.kt

@@ -17,16 +17,16 @@ class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Bo
 
   override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
     AndroidLogger.getInstance().debug("AQS Session Changed: $sessionDetails")
-    val currentInternalSessionId = SessionManager.getInstance().perfSession().internalSessionId
+    val perfSessionId = SessionManager.getInstance().perfSession().sessionId()
 
     // There can be situations where a new [PerfSession] was created, but an AQS wasn't
     // available (during cold start).
-    if (perfSessionToAqs[currentInternalSessionId] == null) {
-      perfSessionToAqs[currentInternalSessionId] = sessionDetails
+    if (perfSessionToAqs[perfSessionId] == null) {
+      perfSessionToAqs[perfSessionId] = sessionDetails
     } else {
       val newSession = PerfSession.createNewSession()
       SessionManager.getInstance().updatePerfSession(newSession)
-      perfSessionToAqs[newSession.internalSessionId] = sessionDetails
+      perfSessionToAqs[newSession.sessionId()] = sessionDetails
     }
   }
 

firebase-perf/src/main/java/com/google/firebase/perf/session/PerfSession.java

@@ -30,7 +30,7 @@
 /** Details of a session including a unique Id and related information. */
 public class PerfSession implements Parcelable {
 
-  private final String internalSessionId;
+  private final String sessionId;
   private final Timer creationTime;
 
   private boolean isGaugeAndEventCollectionEnabled = false;
@@ -54,27 +54,21 @@ public static PerfSession createNewSession() {
 
   /** Creates a PerfSession with the provided {@code sessionId} and {@code clock}. */
   @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-  public PerfSession(String internalSessionId, Clock clock) {
-    this.internalSessionId = internalSessionId;
+  public PerfSession(String sessionId, Clock clock) {
+    this.sessionId = sessionId;
     creationTime = clock.getTime();
   }
 
   private PerfSession(@NonNull Parcel in) {
     super();
-    internalSessionId = in.readString();
+    sessionId = in.readString();
     isGaugeAndEventCollectionEnabled = in.readByte() != 0;
     creationTime = in.readParcelable(Timer.class.getClassLoader());
   }
 
   /** Returns the sessionId of the object. */
   public String sessionId() {
-    return FirebasePerformanceSessionSubscriber.Companion.getInstance()
-        .getAqsMappedToPerfSession(this.internalSessionId);
-  }
-
-  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-  public String getInternalSessionId() {
-    return internalSessionId;
+    return this.sessionId;
   }
 
   /**
@@ -202,7 +196,7 @@ public int describeContents() {
    * @param flags Additional flags about how the object should be written.
    */
   public void writeToParcel(@NonNull Parcel out, int flags) {
-    out.writeString(internalSessionId);
+    out.writeString(sessionId);
     out.writeByte((byte) (isGaugeAndEventCollectionEnabled ? 1 : 0));
     out.writeParcelable(creationTime, 0);
   }

firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java

@@ -114,7 +114,7 @@ public void stopGaugeCollectionIfSessionRunningTooLong() {
   public void updatePerfSession(PerfSession perfSession) {
     // Do not update the perf session if it is the exact same sessionId.
     if (Objects.equals(
-        perfSession.getInternalSessionId(), this.perfSession.getInternalSessionId())) {
+        perfSession.sessionId(), this.perfSession.sessionId())) {
       return;
     }