Skip to content

Commit 79aac4c

Browse files
committed
Improve logging and adda TODO
1 parent e4b7114 commit 79aac4c

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Bo
1616
get() = SessionSubscriber.Name.PERFORMANCE
1717

1818
override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) {
19-
AndroidLogger.getInstance().debug("AQS Session Changed: $sessionDetails")
2019
val perfSessionId = SessionManager.getInstance().perfSession().sessionId()
20+
AndroidLogger.getInstance()
21+
.debug("CFPRS AQS Session Changed: $sessionDetails, PerfSession: $perfSessionId")
2122

2223
// There can be situations where a new [PerfSession] was created, but an AQS wasn't
2324
// available (during cold start).

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import androidx.annotation.Nullable;
2121
import androidx.annotation.VisibleForTesting;
2222
import com.google.firebase.perf.config.ConfigResolver;
23+
import com.google.firebase.perf.logging.AndroidLogger;
2324
import com.google.firebase.perf.util.Clock;
2425
import com.google.firebase.perf.util.Timer;
2526
import com.google.firebase.perf.v1.SessionVerbosity;
@@ -55,6 +56,7 @@ public PerfSession(String sessionId, Clock clock) {
5556
// SessionManagerKt verifies if this is an active session, and sets the AQS session ID.
5657
// The assumption is that new PerfSessions *should* be limited to either App Start, or through
5758
// AQS.
59+
AndroidLogger.getInstance().debug("CFPRS PerfSession(): " + sessionId);
5860
FirebasePerformanceSessionSubscriber.Companion.getInstance().reportPerfSession(sessionId);
5961
}
6062

@@ -176,9 +178,9 @@ public static com.google.firebase.perf.v1.PerfSession[] buildAndSort(
176178
/** If true, Session Gauge collection is enabled. */
177179
public static boolean shouldCollectGaugesAndEvents() {
178180
ConfigResolver configResolver = ConfigResolver.getInstance();
179-
180-
return configResolver.isPerformanceMonitoringEnabled()
181-
&& Math.random() < configResolver.getSessionsSamplingRate();
181+
return true;
182+
// return configResolver.isPerformanceMonitoringEnabled()
183+
// && Math.random() < configResolver.getSessionsSamplingRate();
182184
}
183185

184186
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public SessionManager(
6868
this.gaugeManager = gaugeManager;
6969
this.perfSession = perfSession;
7070
this.appStateMonitor = appStateMonitor;
71+
AndroidLogger.getInstance().debug("CFPRS: SessionManager()");
7172
}
7273

7374
/**
@@ -117,8 +118,6 @@ public void updatePerfSession(PerfSession perfSession) {
117118
return;
118119
}
119120

120-
AndroidLogger.getInstance().debug("Perf Session Changed: " + perfSession);
121-
122121
this.perfSession = perfSession;
123122

124123
synchronized (clients) {

firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/GaugeManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
247247
FirebasePerformanceSessionSubscriber.Companion.getInstance()
248248
.getAqsMappedToPerfSession(sessionId);
249249
gaugeMetricBuilder.setSessionId(aqsSessionId);
250+
AndroidLogger.getInstance().debug("CFPR syncFlush: " + sessionId + " AQS: " + aqsSessionId);
250251

251252
transportManager.log(gaugeMetricBuilder.build(), appState);
252253
}
@@ -260,9 +261,13 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
260261
* @return true if GaugeMetadata was logged, false otherwise.
261262
*/
262263
public boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
264+
// TODO(b/394127311): Based on logs, AQS session ID isn't available any time
265+
// this is called. Adding a TODO to identify potential changes.
263266
String aqsSessionId =
264267
FirebasePerformanceSessionSubscriber.Companion.getInstance()
265268
.getAqsMappedToPerfSession(sessionId);
269+
AndroidLogger.getInstance()
270+
.debug("CFPR logGaugeMetadata: " + sessionId + " AQS: " + aqsSessionId);
266271
if (gaugeMetadataManager != null) {
267272
GaugeMetric gaugeMetric =
268273
GaugeMetric.newBuilder()

0 commit comments

Comments
 (0)