Skip to content

Commit 281e7b1

Browse files
committed
Try simplifying logging
1 parent ebb5325 commit 281e7b1

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

firebase-perf/src/main/java/com/google/firebase/perf/logging/DebugEnforcementCheck.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,18 @@ class DebugEnforcementCheck {
2525
@JvmStatic var enforcement: Boolean = false
2626
private var logger: AndroidLogger = AndroidLogger.getInstance()
2727

28-
public fun checkSession(session: PerfSession, failureMessage: String) {
28+
fun checkSession(session: PerfSession, failureMessage: String) {
2929
if (session.isLegacy()) {
3030
logger.debug("legacy session ${session.sessionId()}: $failureMessage")
3131
assert(!enforcement) { failureMessage }
3232
}
3333
}
34+
35+
fun checkSession(sessionId: String, failureMessage: String) {
36+
if (sessionId.isLegacy()) {
37+
logger.debug("legacy session ${sessionId}: $failureMessage")
38+
assert(!enforcement) { failureMessage }
39+
}
40+
}
3441
}
3542
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ import java.util.UUID
55

66
/** Identifies whether the [PerfSession] is legacy or not. */
77
fun PerfSession.isLegacy(): Boolean {
8-
return this.sessionId().startsWith(Constants.UNDEFINED_AQS_ID_PREFIX)
8+
return this.sessionId().isLegacy()
9+
}
10+
11+
/** Identifies whether the string is from a legacy [PerfSession]. */
12+
fun String.isLegacy(): Boolean {
13+
return this.startsWith(Constants.UNDEFINED_AQS_ID_PREFIX)
914
}
1015

1116
/** Creates a valid session ID for [PerfSession] that can be predictably identified as legacy. */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.google.firebase.components.Lazy;
2323
import com.google.firebase.perf.config.ConfigResolver;
2424
import com.google.firebase.perf.logging.AndroidLogger;
25+
import com.google.firebase.perf.logging.DebugEnforcementCheck;
2526
import com.google.firebase.perf.session.FirebaseSessionsHelperKt;
2627
import com.google.firebase.perf.session.PerfSession;
2728
import com.google.firebase.perf.transport.TransportManager;
@@ -287,10 +288,7 @@ public void stopCollectingGaugesForLegacySession(
287288
* @param appState The app state for which these gauges are collected.
288289
*/
289290
private void syncFlush(String sessionId, ApplicationProcessState appState) {
290-
if (sessionId.contains(Constants.UNDEFINED_AQS_ID_PREFIX)) {
291-
// TODO(b/394127311): Use DebugEnforcementCheck.
292-
logger.debug("Flushing gauge metrics to a legacy session ID.");
293-
}
291+
DebugEnforcementCheck.Companion.checkSession(sessionId, "syncFlush");
294292
GaugeMetric.Builder gaugeMetricBuilder = GaugeMetric.newBuilder();
295293

296294
// Adding CPU metric readings.

0 commit comments

Comments
 (0)