Skip to content

Commit 13cef86

Browse files
author
AR Abdul Azeez
committed
more cleanup
1 parent 1d5b6f4 commit 13cef86

5 files changed

Lines changed: 11 additions & 253 deletions

File tree

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/android/OtelPlatformProvider.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,20 @@ internal class OtelPlatformProvider(
120120

121121
override val minFileAgeForReadMillis: Long = 5_000
122122

123-
// Remote logging configuration
123+
// Cached from SharedPreferences on first access and held for the session.
124+
// Mid-session config updates are handled by OtelLifecycleManager reading
125+
// from ConfigModel directly, not from these cached values.
124126
override val isRemoteLoggingEnabled: Boolean by lazy {
125127
idResolver.resolveRemoteLoggingEnabled()
126128
}
127129

128-
/**
129-
* The minimum log level to send remotely as a string.
130-
* - "logging_config": {"log_level": "ERROR"} → returns "ERROR" (enabled, on allowlist)
131-
* - "logging_config": {} → returns null (disabled, not on allowlist)
132-
* - No config cached yet → returns null (first launch)
133-
*/
130+
// Cached from SharedPreferences on first access and held for the session.
131+
// Mid-session config updates are handled by OtelLifecycleManager reading
132+
// from ConfigModel directly, not from these cached values.
134133
@Suppress("TooGenericExceptionCaught", "SwallowedException")
135134
override val remoteLogLevel: String? by lazy {
136135
try {
137-
val configLevel = idResolver.resolveRemoteLogLevel()
138-
configLevel?.name
136+
idResolver.resolveRemoteLogLevel()?.name
139137
} catch (e: Exception) {
140138
null
141139
}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OtelLifecycleManager.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ internal class OtelLifecycleManager(
4141
createAndroidOtelPlatformProvider(context)
4242
}
4343

44+
private val logger = AndroidOtelLogger()
45+
4446
private var crashHandler: IOtelCrashHandler? = null
4547
private var anrDetector: IOtelAnrDetector? = null
4648
private var remoteTelemetry: IOtelOpenTelemetryRemote? = null
@@ -59,7 +61,7 @@ internal class OtelLifecycleManager(
5961
}
6062

6163
try {
62-
val cachedConfig = readCurrentConfig()
64+
val cachedConfig = readCurrentCachedConfig()
6365
val action = OtelConfigEvaluator.evaluate(old = null, new = cachedConfig)
6466
applyAction(action, cachedConfig)
6567
} catch (t: Throwable) {
@@ -105,7 +107,7 @@ internal class OtelLifecycleManager(
105107
// Internal
106108
// ------------------------------------------------------------------
107109

108-
private fun readCurrentConfig(): OtelConfig {
110+
private fun readCurrentCachedConfig(): OtelConfig {
109111
val enabled = platformProvider.isRemoteLoggingEnabled
110112
val levelStr = platformProvider.remoteLogLevel
111113
val level = levelStr?.let {
@@ -195,7 +197,6 @@ internal class OtelLifecycleManager(
195197

196198
private fun startCrashHandler() {
197199
if (crashHandler != null) return
198-
val logger = AndroidOtelLogger()
199200
val handler = OneSignalCrashHandlerFactory.createCrashHandler(context, logger)
200201
handler.initialize()
201202
crashHandler = handler
@@ -204,7 +205,6 @@ internal class OtelLifecycleManager(
204205

205206
private fun startAnrDetector() {
206207
if (anrDetector != null) return
207-
val logger = AndroidOtelLogger()
208208
val detector = createAnrDetector(
209209
platformProvider,
210210
logger,

OneSignalSDK/onesignal/otel/docs/flow_chart.mmd

Lines changed: 0 additions & 106 deletions
This file was deleted.

OneSignalSDK/onesignal/otel/docs/flow_chartv1.svg

Lines changed: 0 additions & 67 deletions
This file was deleted.

OneSignalSDK/onesignal/otel/docs/flow_chartv2.svg

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)