Skip to content

Commit ba27d56

Browse files
committed
Use the same tag for all logs in sessions (#7002)
Use the same tag for all logs in sessions. This will make it easier to dogfood, and is consistent with Perf and Crashlytics If any context is lost by losing the tag named after the class, we can update those log lines as we run into them. A future change we can do is refactor to use the firebase common logger
1 parent 473050e commit ba27d56

File tree

10 files changed

+10
-22
lines changed

10 files changed

+10
-22
lines changed

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import com.google.android.datatransport.Encoding
2121
import com.google.android.datatransport.Event
2222
import com.google.android.datatransport.TransportFactory
2323
import com.google.firebase.inject.Provider
24+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2425
import javax.inject.Inject
2526
import javax.inject.Singleton
2627

@@ -61,8 +62,6 @@ constructor(private val transportFactoryProvider: Provider<TransportFactory>) :
6162
}
6263

6364
companion object {
64-
private const val TAG = "EventGDTLogger"
65-
6665
private const val AQS_LOG_SOURCE = "FIREBASE_APPQUALITY_SESSION"
6766
}
6867
}

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ constructor(
7575
}
7676

7777
companion object {
78-
private const val TAG = "FirebaseSessions"
78+
internal const val TAG = "FirebaseSessions"
7979

8080
val instance: FirebaseSessions
8181
get() = Firebase.app[FirebaseSessions::class.java]

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.google.firebase.annotations.concurrent.Background
3131
import com.google.firebase.annotations.concurrent.Blocking
3232
import com.google.firebase.inject.Provider
3333
import com.google.firebase.installations.FirebaseInstallationsApi
34+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
3435
import com.google.firebase.sessions.settings.CrashlyticsSettingsFetcher
3536
import com.google.firebase.sessions.settings.LocalOverrideSettings
3637
import com.google.firebase.sessions.settings.RemoteSettings
@@ -121,8 +122,6 @@ internal interface FirebaseSessionsComponent {
121122
@Binds @Singleton fun processDataManager(impl: ProcessDataManagerImpl): ProcessDataManager
122123

123124
companion object {
124-
private const val TAG = "FirebaseSessions"
125-
126125
@Provides @Singleton fun timeProvider(): TimeProvider = TimeProviderImpl
127126

128127
@Provides @Singleton fun uuidGenerator(): UuidGenerator = UuidGeneratorImpl

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.google.firebase.components.Qualified.qualified
3131
import com.google.firebase.components.Qualified.unqualified
3232
import com.google.firebase.installations.FirebaseInstallationsApi
3333
import com.google.firebase.platforminfo.LibraryVersionComponent
34+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
3435
import kotlinx.coroutines.CoroutineDispatcher
3536

3637
/**
@@ -71,7 +72,6 @@ internal class FirebaseSessionsRegistrar : ComponentRegistrar {
7172
)
7273

7374
private companion object {
74-
const val TAG = "FirebaseSessions"
7575
const val LIBRARY_NAME = "fire-sessions"
7676

7777
val appContext = unqualified(Context::class.java)

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ package com.google.firebase.sessions
1818

1919
import android.util.Log
2020
import com.google.firebase.installations.FirebaseInstallationsApi
21+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2122
import kotlinx.coroutines.tasks.await
2223

2324
/** Provides the Firebase installation id and Firebase authentication token. */
2425
internal class InstallationId private constructor(val fid: String, val authToken: String) {
2526
companion object {
26-
private const val TAG = "InstallationId"
27-
2827
suspend fun create(firebaseInstallations: FirebaseInstallationsApi): InstallationId {
2928
// Fetch the auth token first, so the fid will be validated.
3029
val authToken: String =

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import com.google.firebase.FirebaseApp
2222
import com.google.firebase.annotations.concurrent.Background
2323
import com.google.firebase.app
2424
import com.google.firebase.installations.FirebaseInstallationsApi
25+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2526
import com.google.firebase.sessions.api.FirebaseSessionsDependencies
2627
import com.google.firebase.sessions.settings.SessionsSettings
2728
import javax.inject.Inject
@@ -122,8 +123,6 @@ constructor(
122123
}
123124

124125
internal companion object {
125-
private const val TAG = "SessionFirelogPublisher"
126-
127126
private val randomValueForSampling: Double = Math.random()
128127
}
129128
}

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.google.firebase.sessions
1919
import android.util.Log
2020
import androidx.datastore.core.DataStore
2121
import com.google.firebase.annotations.concurrent.Background
22+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2223
import com.google.firebase.sessions.api.FirebaseSessionsDependencies
2324
import com.google.firebase.sessions.api.SessionSubscriber
2425
import com.google.firebase.sessions.settings.SessionsSettings
@@ -233,8 +234,4 @@ constructor(
233234
Log.d(TAG, "No process data for ${processDataManager.myProcessName}")
234235
return true
235236
}
236-
237-
private companion object {
238-
const val TAG = "SharedSessionRepository"
239-
}
240237
}

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.google.firebase.sessions.api
1818

1919
import android.util.Log
2020
import androidx.annotation.VisibleForTesting
21+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2122
import java.util.Collections.synchronizedMap
2223
import kotlinx.coroutines.sync.Mutex
2324
import kotlinx.coroutines.sync.withLock
@@ -30,8 +31,6 @@ import kotlinx.coroutines.sync.withLock
3031
* This is important because the Sessions SDK starts up before dependent SDKs.
3132
*/
3233
object FirebaseSessionsDependencies {
33-
private const val TAG = "SessionsDependencies"
34-
3534
private val dependencies = synchronizedMap(mutableMapOf<SessionSubscriber.Name, Dependency>())
3635

3736
/**

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.util.Log
2121
import androidx.annotation.VisibleForTesting
2222
import com.google.firebase.installations.FirebaseInstallationsApi
2323
import com.google.firebase.sessions.ApplicationInfo
24+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2425
import com.google.firebase.sessions.InstallationId
2526
import com.google.firebase.sessions.TimeProvider
2627
import javax.inject.Inject
@@ -150,8 +151,6 @@ constructor(
150151
private fun sanitize(s: String) = s.replace(sanitizeRegex, "")
151152

152153
private companion object {
153-
const val TAG = "SessionConfigFetcher"
154-
155154
val defaultCacheDuration = 24.hours.inWholeSeconds.toInt()
156155

157156
val sanitizeRegex = "/".toRegex()

firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import android.util.Log
2020
import androidx.annotation.VisibleForTesting
2121
import androidx.datastore.core.DataStore
2222
import com.google.firebase.annotations.concurrent.Background
23+
import com.google.firebase.sessions.FirebaseSessions.Companion.TAG
2324
import com.google.firebase.sessions.TimeProvider
2425
import java.io.IOException
2526
import java.util.concurrent.atomic.AtomicReference
@@ -107,8 +108,4 @@ constructor(
107108
} catch (ex: IOException) {
108109
Log.w(TAG, "Failed to remove config values: $ex")
109110
}
110-
111-
private companion object {
112-
const val TAG = "SettingsCache"
113-
}
114111
}

0 commit comments

Comments
 (0)