TransportManager could not be initialized with sessionManager, changing provider

Author: jrodiz

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java

@@ -26,11 +26,8 @@
 import com.google.firebase.components.Qualified;
 import com.google.firebase.installations.FirebaseInstallationsApi;
 import com.google.firebase.perf.injection.components.DaggerFirebasePerformanceComponent;
-import com.google.firebase.perf.injection.components.DaggerSessionManagerComponent;
 import com.google.firebase.perf.injection.components.FirebasePerformanceComponent;
-import com.google.firebase.perf.injection.components.SessionManagerComponent;
 import com.google.firebase.perf.injection.modules.FirebasePerformanceModule;
-import com.google.firebase.perf.injection.modules.SessionManagerModule;
 import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
@@ -81,7 +78,9 @@ public List<Component<?>> getComponents() {
                         container.get(uiExecutor),
                         container.get(SessionManager.class)))
             .build(),
-        Component.builder(SessionManager.class).factory(container -> new SessionManager()).build(),
+        Component.builder(SessionManager.class).factory(container ->
+                SessionManager.getInstance() //TODO: JR: Remove getInstance in subsequent phases
+        ).build(),
         /**
          * Fireperf SDK is lazily by {@link FirebasePerformanceInitializer} during {@link
          * com.google.firebase.perf.application.AppStateMonitor#onActivityResumed(Activity)}. we use

firebase-perf/src/main/java/com/google/firebase/perf/application/AppStateMonitor.java

@@ -200,7 +200,7 @@ public synchronized void onActivityStarted(Activity activity) {
       // Starts recording frame metrics for this activity.
       activityToRecorderMap.get(activity).start();
       // Start the Trace
-      Trace screenTrace = new Trace(getScreenTraceName(activity), transportManager, clock, this, sessionManager);
+      Trace screenTrace = new Trace(getScreenTraceName(activity), transportManager, clock, this);
       screenTrace.start();
       activityToScreenTraceMap.put(activity, screenTrace);
     }
@@ -416,6 +416,10 @@ private static boolean isScreenPerformanceRecordingSupported() {
     return FrameMetricsRecorder.isFrameMetricsRecordingSupported();
   }
 
+  public SessionManager getSessionManager() {
+    return sessionManager;
+  }
+
   /** An interface to be implemented by subscribers which needs to receive app state update. */
   public static interface AppStateCallback {
     public void onUpdateAppState(ApplicationProcessState newState);
@@ -466,10 +470,6 @@ public void setIsColdStart(boolean isColdStart) {
     this.isColdStart = isColdStart;
   }
 
-  public SessionManager getSessionManager() {
-    return sessionManager;
-  }
-
   public void setSessionManager(SessionManager sessionManager) {
     this.sessionManager = sessionManager;
   }

firebase-perf/src/main/java/com/google/firebase/perf/application/FragmentStateMonitor.java

@@ -67,7 +67,7 @@ public void onFragmentResumed(@NonNull FragmentManager fm, @NonNull Fragment f)
     // Start Fragment screen trace
     logger.debug("FragmentMonitor %s.onFragmentResumed", f.getClass().getSimpleName());
     Trace fragmentTrace =
-        new Trace(getFragmentScreenTraceName(f), transportManager, clock, appStateMonitor, sessionManager);
+        new Trace(getFragmentScreenTraceName(f), transportManager, clock, appStateMonitor);
     fragmentTrace.start();
 
     fragmentTrace.putAttribute(

firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java

@@ -181,11 +181,12 @@ public Trace(
     this.transportManager = transportManager;
     sessions = Collections.synchronizedList(new ArrayList<>());
     this.gaugeManager = gaugeManager;
-    this.sessionManager = transportManager.getSessionManager();
+    this.sessionManager = appStateMonitor.getSessionManager();
   }
 
   private Trace(@NonNull Parcel in, boolean isDataOnly) {
     super(isDataOnly ? null : AppStateMonitor.getInstance());
+    this.sessionManager = AppStateMonitor.getInstance().getSessionManager();
     parent = in.readParcelable(Trace.class.getClassLoader());
     name = in.readString();
     subtraces = new ArrayList<>();
@@ -207,7 +208,6 @@ private Trace(@NonNull Parcel in, boolean isDataOnly) {
       clock = new Clock();
       gaugeManager = GaugeManager.getInstance();
     }
-    sessionManager = TransportManager.getInstance().getSessionManager();
   }
 
   /** Starts this trace. */
@@ -437,8 +437,7 @@ static synchronized Trace getTrace(
       @NonNull String traceName,
       @NonNull TransportManager transportManager,
       @NonNull Clock clock,
-      @NonNull AppStateMonitor appStateMonitor,
-      @NonNull SessionManager sessionManager) {
+      @NonNull AppStateMonitor appStateMonitor) {
     Trace trace = traceNameToTraceMap.get(traceName);
     if (trace == null) {
       trace =

firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfHttpClient.java

@@ -15,7 +15,10 @@
 package com.google.firebase.perf.network;
 
 import androidx.annotation.Keep;
+
+import com.google.firebase.perf.FirebasePerformance;
 import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.session.SessionManager;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
@@ -45,7 +48,7 @@ private FirebasePerfHttpClient() {}
   @Keep
   public static HttpResponse execute(final HttpClient client, final HttpUriRequest request)
       throws IOException {
-    return execute(client, request, new Timer(), TransportManager.getInstance());
+    return execute(client, request, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -58,7 +61,7 @@ public static HttpResponse execute(final HttpClient client, final HttpUriRequest
   public static HttpResponse execute(
       final HttpClient client, final HttpUriRequest request, final HttpContext context)
       throws IOException {
-    return execute(client, request, context, new Timer(), TransportManager.getInstance());
+    return execute(client, request, context, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -73,7 +76,7 @@ public static <T> T execute(
       final HttpUriRequest request,
       final ResponseHandler<T> responseHandler)
       throws IOException {
-    return execute(client, request, responseHandler, new Timer(), TransportManager.getInstance());
+    return execute(client, request, responseHandler, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -90,7 +93,7 @@ public static <T> T execute(
       final HttpContext context)
       throws IOException {
     return execute(
-        client, request, responseHandler, context, new Timer(), TransportManager.getInstance());
+        client, request, responseHandler, context, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -103,7 +106,7 @@ public static <T> T execute(
   public static HttpResponse execute(
       final HttpClient client, final HttpHost target, final HttpRequest request)
       throws IOException {
-    return execute(client, target, request, new Timer(), TransportManager.getInstance());
+    return execute(client, target, request, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -119,7 +122,7 @@ public static HttpResponse execute(
       final HttpRequest request,
       final HttpContext context)
       throws IOException {
-    return execute(client, target, request, context, new Timer(), TransportManager.getInstance());
+    return execute(client, target, request, context, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -136,7 +139,7 @@ public static <T> T execute(
       final ResponseHandler<? extends T> responseHandler)
       throws IOException {
     return execute(
-        client, target, request, responseHandler, new Timer(), TransportManager.getInstance());
+        client, target, request, responseHandler, new Timer(), TransportManager.getInstance(), SessionManager.getInstance());
   }
 
   /**
@@ -160,7 +163,8 @@ public static <T> T execute(
         responseHandler,
         context,
         new Timer(),
-        TransportManager.getInstance());
+        TransportManager.getInstance(),
+        SessionManager.getInstance());
   }
 
   /**
@@ -173,10 +177,11 @@ static HttpResponse execute(
       final HttpClient client,
       final HttpUriRequest request,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
     HttpResponse response = null;
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder.setUrl(request.getURI().toString()).setHttpMethod(request.getMethod());
       Long requestContentLength =
@@ -221,10 +226,11 @@ static HttpResponse execute(
       final HttpUriRequest request,
       final HttpContext context,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
     HttpResponse response = null;
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder.setUrl(request.getURI().toString()).setHttpMethod(request.getMethod());
       Long requestContentLength =
@@ -270,9 +276,10 @@ static <T> T execute(
       final HttpUriRequest request,
       final ResponseHandler<T> responseHandler,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder.setUrl(request.getURI().toString()).setHttpMethod(request.getMethod());
       Long requestContentLength =
@@ -307,9 +314,10 @@ static <T> T execute(
       final ResponseHandler<T> responseHandler,
       final HttpContext context,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder.setUrl(request.getURI().toString()).setHttpMethod(request.getMethod());
       Long requestContentLength =
@@ -344,10 +352,11 @@ static HttpResponse execute(
       final HttpHost target,
       final HttpRequest request,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
     HttpResponse response = null;
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder
           .setUrl(target.toURI() + request.getRequestLine().getUri())
@@ -396,10 +405,11 @@ static HttpResponse execute(
       final HttpRequest request,
       final HttpContext context,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
     HttpResponse response = null;
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder
           .setUrl(target.toURI() + request.getRequestLine().getUri())
@@ -448,9 +458,10 @@ static <T> T execute(
       final HttpRequest request,
       final ResponseHandler<? extends T> responseHandler,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder
           .setUrl(target.toURI() + request.getRequestLine().getUri())
@@ -490,9 +501,10 @@ static <T> T execute(
       final ResponseHandler<? extends T> responseHandler,
       final HttpContext context,
       final Timer timer,
-      final TransportManager transportManager)
+      final TransportManager transportManager,
+      final SessionManager sessionManager)
       throws IOException {
-    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, transportManager.getSessionManager());
+    NetworkRequestMetricBuilder builder = NetworkRequestMetricBuilder.builder(transportManager, sessionManager);
     try {
       builder
           .setUrl(target.toURI() + request.getRequestLine().getUri())

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

@@ -36,7 +36,8 @@
 /** Session manager to generate sessionIDs and broadcast to the application. */
 @Keep // Needed because of b/117526359.
 public class SessionManager extends AppStateUpdateHandler {
-
+  @SuppressLint("StaticFieldLeak")
+  private static final SessionManager instance = new SessionManager();
   private final GaugeManager gaugeManager;
   private final AppStateMonitor appStateMonitor;
   private final Set<WeakReference<SessionAwareObject>> clients = new HashSet<>();
@@ -49,7 +50,12 @@ public final PerfSession perfSession() {
     return perfSession;
   }
 
-  public SessionManager() {
+  /** Returns the singleton instance of SessionManager. */
+  public static SessionManager getInstance() {
+    return instance;
+  }
+
+  private SessionManager() {
     // Generate a new sessionID for every cold start.
     this(
         GaugeManager.getInstance(),

firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java

@@ -664,10 +664,6 @@ private String getConsoleUrl(TraceMetric traceMetric) {
       return ConsoleUrlGenerator.generateCustomTraceUrl(projectId, packageName, traceName);
     }
   }
-
-  public SessionManager getSessionManager() {
-    return sessionManager;
-  }
   // endregion
 
   // region Visible for Testing