Implement a SessionSubscriber for Firebase Performance #6683
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.google.firebase.perf.session | ||
|
|
||
| import com.google.firebase.perf.session.gauges.GaugeManager | ||
| import com.google.firebase.perf.v1.ApplicationProcessState | ||
| import com.google.firebase.sessions.api.SessionSubscriber | ||
| import java.util.UUID | ||
|
|
||
| class FirebasePerformanceSessionSubscriber(private val dataCollectionEnabled: Boolean) : | ||
| SessionSubscriber { | ||
| override val isDataCollectionEnabled: Boolean | ||
| get() = dataCollectionEnabled | ||
|
|
||
| override val sessionSubscriberName: SessionSubscriber.Name | ||
| get() = SessionSubscriber.Name.PERFORMANCE | ||
|
There was a problem hiding this comment. I don't think you need the explicit getter. Can you just say something like There was a problem hiding this comment. If you copied this from Crashlytics, it's likely a result of Java Kotlin interop |
||
|
|
||
| override fun onSessionChanged(sessionDetails: SessionSubscriber.SessionDetails) { | ||
tejasd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| val currentPerfSession = SessionManager.getInstance().perfSession() | ||
|
|
||
| // A [PerfSession] was created before a session was started. | ||
| if (currentPerfSession.aqsSessionId() == null) { | ||
| currentPerfSession.setAQSId(sessionDetails) | ||
| GaugeManager.getInstance() | ||
| .logGaugeMetadata(currentPerfSession.aqsSessionId(), ApplicationProcessState.FOREGROUND) | ||
| return | ||
| } | ||
|
|
||
| val updatedSession = PerfSession.createWithId(UUID.randomUUID().toString()) | ||
| updatedSession.setAQSId(sessionDetails) | ||
| SessionManager.getInstance().updatePerfSession(updatedSession) | ||
| GaugeManager.getInstance() | ||
| .logGaugeMetadata(updatedSession.aqsSessionId(), ApplicationProcessState.FOREGROUND) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| import com.google.firebase.perf.util.Clock; | ||
| import com.google.firebase.perf.util.Timer; | ||
| import com.google.firebase.perf.v1.SessionVerbosity; | ||
| import com.google.firebase.sessions.api.SessionSubscriber; | ||
| import java.util.List; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
|
|
@@ -31,6 +32,7 @@ public class PerfSession implements Parcelable { | |
|
|
||
| private final String sessionId; | ||
| private final Timer creationTime; | ||
| @Nullable private String aqsSessionId; | ||
|
|
||
| private boolean isGaugeAndEventCollectionEnabled = false; | ||
|
|
||
|
|
@@ -59,11 +61,23 @@ private PerfSession(@NonNull Parcel in) { | |
| creationTime = in.readParcelable(Timer.class.getClassLoader()); | ||
| } | ||
|
|
||
| /** Returns the sessionId of the session. */ | ||
| public String sessionId() { | ||
| return sessionId; | ||
| } | ||
|
|
||
| /** Returns the AQS sessionId for the given session. */ | ||
| public String aqsSessionId() { | ||
|
|
||
| return aqsSessionId; | ||
| } | ||
|
|
||
| /** Returns the AQS sessionId for the given session. */ | ||
|
|
||
| public void setAQSId(SessionSubscriber.SessionDetails aqs) { | ||
|
There was a problem hiding this comment. Do we want the Perf session to have the id of the current AQS session when the Perf session starts, but then allow AQS to have different sessions due to background foreground etc? Because Crashlytics will have the current AQS session id at crash time added to the report. There was a problem hiding this comment. AQS knows the "first session id" and the current session id. If that is your concern, I think it's better to have the current aqs session id as the perf session id, and then if we need to do lookups we can join it to aqs data and know the first session id. There was a problem hiding this comment. I changed the behaviour a little compared to #6665. This retains the PerfSession ID as is, which is used to identify sessions for gauge collection. However, my plan is to use the AQS session ID to log the gauges. Whenever there is an AQS change, it will also result in a new PerfSession. |
||
| if (aqsSessionId == null) { | ||
| aqsSessionId = aqs.getSessionId(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns a timer object that has been seeded with the system time at which the session began. | ||
| */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you just put
override val isDataCollectionEnabled: Booleanin the ctor?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.