Skip to content

Commit 21d4778

Browse files
committed
Update subscriber
1 parent dfbc521 commit 21d4778

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed
Submodule crashpad updated from b8937c6 to c902f6b
Submodule lss updated from ed31caa to 9719c1e
Submodule mini_chromium updated from c081fd0 to 4332ddb

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import com.google.firebase.perf.logging.ConsoleUrlGenerator;
3737
import com.google.firebase.perf.metrics.HttpMetric;
3838
import com.google.firebase.perf.metrics.Trace;
39+
import com.google.firebase.perf.session.FirebasePerformanceSessionSubscriber;
3940
import com.google.firebase.perf.session.SessionManager;
40-
import com.google.firebase.perf.session.SessionManagerKt;
4141
import com.google.firebase.perf.transport.TransportManager;
4242
import com.google.firebase.perf.util.Constants;
4343
import com.google.firebase.perf.util.ImmutableBundle;
@@ -182,7 +182,8 @@ public static FirebasePerformance getInstance() {
182182

183183
// Prioritize registering the FirebaseSession dependency to have the session
184184
// `setApplicationContext`.
185-
FirebaseSessionsDependencies.register(SessionManagerKt.Companion.getInstance());
185+
FirebaseSessionsDependencies.register(
186+
FirebasePerformanceSessionSubscriber.Companion.getInstance());
186187
TransportManager.getInstance()
187188
.initialize(firebaseApp, firebaseInstallationsApi, transportFactoryProvider);
188189

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import com.google.firebase.perf.config.ConfigResolver
44
import com.google.firebase.perf.logging.AndroidLogger
55
import com.google.firebase.sessions.api.SessionSubscriber
66

7-
class SessionManagerKt(private val dataCollectionEnabled: Boolean) : SessionSubscriber {
7+
class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Boolean) :
8+
SessionSubscriber {
89
private val perfSessionToAqs: MutableMap<String, SessionSubscriber.SessionDetails?> =
910
mutableMapOf()
1011

@@ -44,8 +45,10 @@ class SessionManagerKt(private val dataCollectionEnabled: Boolean) : SessionSubs
4445
}
4546

4647
companion object {
47-
val instance: SessionManagerKt by lazy {
48-
SessionManagerKt(ConfigResolver.getInstance().isPerformanceMonitoringEnabled)
48+
val instance: FirebasePerformanceSessionSubscriber by lazy {
49+
FirebasePerformanceSessionSubscriber(
50+
ConfigResolver.getInstance().isPerformanceMonitoringEnabled
51+
)
4952
}
5053
}
5154
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static PerfSession createNewSession() {
4747
// SessionManagerKt verifies if this is an active session, and sets the AQS session ID.
4848
// The assumption is that new PerfSessions *should* be limited to either App Start, or through
4949
// AQS.
50-
SessionManagerKt.Companion.getInstance().reportPerfSession(prunedSessionId);
50+
FirebasePerformanceSessionSubscriber.Companion.getInstance().reportPerfSession(prunedSessionId);
5151

5252
return session;
5353
}
@@ -68,7 +68,7 @@ private PerfSession(@NonNull Parcel in) {
6868

6969
/** Returns the sessionId of the object. */
7070
public String sessionId() {
71-
return SessionManagerKt.Companion.getInstance()
71+
return FirebasePerformanceSessionSubscriber.Companion.getInstance()
7272
.getAqsMappedToPerfSession(this.internalSessionId);
7373
}
7474

firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTestBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.firebase.FirebaseApp;
2424
import com.google.firebase.FirebaseOptions;
2525
import com.google.firebase.perf.config.ConfigResolver;
26-
import com.google.firebase.perf.session.SessionManagerKt;
26+
import com.google.firebase.perf.session.FirebasePerformanceSessionSubscriber;
2727
import com.google.firebase.perf.util.ImmutableBundle;
2828
import com.google.firebase.sessions.api.SessionSubscriber;
2929
import java.util.UUID;
@@ -81,7 +81,7 @@ public void setUpFirebaseApp() {
8181
@After
8282
public void tearDownFirebaseApp() {
8383
FirebaseApp.clearInstancesForTest();
84-
SessionManagerKt.Companion.getInstance().clearSessionForTest();
84+
FirebasePerformanceSessionSubscriber.Companion.getInstance().clearSessionForTest();
8585
}
8686

8787
protected static void forceSessionsFeatureDisabled() {
@@ -99,7 +99,7 @@ protected static void forceNonVerboseSession() {
9999
}
100100

101101
protected static void triggerAqsSession() {
102-
SessionManagerKt.Companion.getInstance()
102+
FirebasePerformanceSessionSubscriber.Companion.getInstance()
103103
.onSessionChanged(
104104
new SessionSubscriber.SessionDetails(FAKE_AQS_SESSION_PREFIX + UUID.randomUUID()));
105105
}

0 commit comments

Comments
 (0)