From c4a308c056bc6183beec2cd0c03113ec98f01311 Mon Sep 17 00:00:00 2001 From: Matthew Robertson Date: Fri, 30 May 2025 10:06:03 -0400 Subject: [PATCH] Use the same tag for all logs in sessions --- .../kotlin/com/google/firebase/sessions/EventGDTLogger.kt | 3 +-- .../kotlin/com/google/firebase/sessions/FirebaseSessions.kt | 2 +- .../google/firebase/sessions/FirebaseSessionsComponent.kt | 3 +-- .../google/firebase/sessions/FirebaseSessionsRegistrar.kt | 2 +- .../kotlin/com/google/firebase/sessions/InstallationId.kt | 3 +-- .../com/google/firebase/sessions/SessionFirelogPublisher.kt | 3 +-- .../com/google/firebase/sessions/SharedSessionRepository.kt | 5 +---- .../firebase/sessions/api/FirebaseSessionsDependencies.kt | 3 +-- .../com/google/firebase/sessions/settings/RemoteSettings.kt | 3 +-- .../com/google/firebase/sessions/settings/SettingsCache.kt | 5 +---- 10 files changed, 10 insertions(+), 22 deletions(-) diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt index 496cc70d36d..25656396fff 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/EventGDTLogger.kt @@ -21,6 +21,7 @@ import com.google.android.datatransport.Encoding import com.google.android.datatransport.Event import com.google.android.datatransport.TransportFactory import com.google.firebase.inject.Provider +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import javax.inject.Inject import javax.inject.Singleton @@ -61,8 +62,6 @@ constructor(private val transportFactoryProvider: Provider) : } companion object { - private const val TAG = "EventGDTLogger" - private const val AQS_LOG_SOURCE = "FIREBASE_APPQUALITY_SESSION" } } diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt index 3830f34a1eb..59b6d9c201f 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessions.kt @@ -75,7 +75,7 @@ constructor( } companion object { - private const val TAG = "FirebaseSessions" + internal const val TAG = "FirebaseSessions" val instance: FirebaseSessions get() = Firebase.app[FirebaseSessions::class.java] diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt index 6eb15149cb3..e3449ee405f 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsComponent.kt @@ -31,6 +31,7 @@ import com.google.firebase.annotations.concurrent.Background import com.google.firebase.annotations.concurrent.Blocking import com.google.firebase.inject.Provider import com.google.firebase.installations.FirebaseInstallationsApi +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import com.google.firebase.sessions.settings.CrashlyticsSettingsFetcher import com.google.firebase.sessions.settings.LocalOverrideSettings import com.google.firebase.sessions.settings.RemoteSettings @@ -121,8 +122,6 @@ internal interface FirebaseSessionsComponent { @Binds @Singleton fun processDataManager(impl: ProcessDataManagerImpl): ProcessDataManager companion object { - private const val TAG = "FirebaseSessions" - @Provides @Singleton fun timeProvider(): TimeProvider = TimeProviderImpl @Provides @Singleton fun uuidGenerator(): UuidGenerator = UuidGeneratorImpl diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt index 76c0c6330f4..3d66959bdcd 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/FirebaseSessionsRegistrar.kt @@ -31,6 +31,7 @@ import com.google.firebase.components.Qualified.qualified import com.google.firebase.components.Qualified.unqualified import com.google.firebase.installations.FirebaseInstallationsApi import com.google.firebase.platforminfo.LibraryVersionComponent +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import kotlinx.coroutines.CoroutineDispatcher /** @@ -71,7 +72,6 @@ internal class FirebaseSessionsRegistrar : ComponentRegistrar { ) private companion object { - const val TAG = "FirebaseSessions" const val LIBRARY_NAME = "fire-sessions" val appContext = unqualified(Context::class.java) diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt index 0df42fda953..69a7c4f4330 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/InstallationId.kt @@ -18,13 +18,12 @@ package com.google.firebase.sessions import android.util.Log import com.google.firebase.installations.FirebaseInstallationsApi +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import kotlinx.coroutines.tasks.await /** Provides the Firebase installation id and Firebase authentication token. */ internal class InstallationId private constructor(val fid: String, val authToken: String) { companion object { - private const val TAG = "InstallationId" - suspend fun create(firebaseInstallations: FirebaseInstallationsApi): InstallationId { // Fetch the auth token first, so the fid will be validated. val authToken: String = diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt index b6a3c87e1dc..21cb379cacb 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SessionFirelogPublisher.kt @@ -22,6 +22,7 @@ import com.google.firebase.FirebaseApp import com.google.firebase.annotations.concurrent.Background import com.google.firebase.app import com.google.firebase.installations.FirebaseInstallationsApi +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import com.google.firebase.sessions.api.FirebaseSessionsDependencies import com.google.firebase.sessions.settings.SessionsSettings import javax.inject.Inject @@ -122,8 +123,6 @@ constructor( } internal companion object { - private const val TAG = "SessionFirelogPublisher" - private val randomValueForSampling: Double = Math.random() } } diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt index c1ad7b26fc4..415fd5d6fae 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt @@ -19,6 +19,7 @@ package com.google.firebase.sessions import android.util.Log import androidx.datastore.core.DataStore import com.google.firebase.annotations.concurrent.Background +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import com.google.firebase.sessions.api.FirebaseSessionsDependencies import com.google.firebase.sessions.api.SessionSubscriber import com.google.firebase.sessions.settings.SessionsSettings @@ -233,8 +234,4 @@ constructor( Log.d(TAG, "No process data for ${processDataManager.myProcessName}") return true } - - private companion object { - const val TAG = "SharedSessionRepository" - } } diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt index 8d3548c8f4b..26923beee01 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/api/FirebaseSessionsDependencies.kt @@ -18,6 +18,7 @@ package com.google.firebase.sessions.api import android.util.Log import androidx.annotation.VisibleForTesting +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import java.util.Collections.synchronizedMap import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -30,8 +31,6 @@ import kotlinx.coroutines.sync.withLock * This is important because the Sessions SDK starts up before dependent SDKs. */ object FirebaseSessionsDependencies { - private const val TAG = "SessionsDependencies" - private val dependencies = synchronizedMap(mutableMapOf()) /** diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt index 1079577e03c..1b25202b4f9 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/RemoteSettings.kt @@ -21,6 +21,7 @@ import android.util.Log import androidx.annotation.VisibleForTesting import com.google.firebase.installations.FirebaseInstallationsApi import com.google.firebase.sessions.ApplicationInfo +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import com.google.firebase.sessions.InstallationId import com.google.firebase.sessions.TimeProvider import javax.inject.Inject @@ -150,8 +151,6 @@ constructor( private fun sanitize(s: String) = s.replace(sanitizeRegex, "") private companion object { - const val TAG = "SessionConfigFetcher" - val defaultCacheDuration = 24.hours.inWholeSeconds.toInt() val sanitizeRegex = "/".toRegex() diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt index 1640a5c7b7a..6b5cc96a138 100644 --- a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt +++ b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/settings/SettingsCache.kt @@ -20,6 +20,7 @@ import android.util.Log import androidx.annotation.VisibleForTesting import androidx.datastore.core.DataStore import com.google.firebase.annotations.concurrent.Background +import com.google.firebase.sessions.FirebaseSessions.Companion.TAG import com.google.firebase.sessions.TimeProvider import java.io.IOException import java.util.concurrent.atomic.AtomicReference @@ -107,8 +108,4 @@ constructor( } catch (ex: IOException) { Log.w(TAG, "Failed to remove config values: $ex") } - - private companion object { - const val TAG = "SettingsCache" - } }