otel logging detekt

Author: AR Abdul Azeez

OneSignalSDK/detekt/detekt-baseline-core.xml

@@ -138,6 +138,7 @@
     <ID>ConstructorParameterNaming:UpdateUserOperationExecutor.kt$UpdateUserOperationExecutor$private val _propertiesModelStore: PropertiesModelStore</ID>
     <ID>ConstructorParameterNaming:UpdateUserOperationExecutor.kt$UpdateUserOperationExecutor$private val _userBackend: IUserBackendService</ID>
     <ID>ConstructorParameterNaming:UserBackendService.kt$UserBackendService$private val _httpClient: IHttpClient</ID>
+    <ID>ConstructorParameterNaming:UserManager.kt$UserManager$private val _customEventController: ICustomEventController</ID>
     <ID>ConstructorParameterNaming:UserManager.kt$UserManager$private val _identityModelStore: IdentityModelStore</ID>
     <ID>ConstructorParameterNaming:UserManager.kt$UserManager$private val _languageContext: ILanguageContext</ID>
     <ID>ConstructorParameterNaming:UserManager.kt$UserManager$private val _propertiesModelStore: PropertiesModelStore</ID>
@@ -191,6 +192,7 @@
     <ID>LongMethod:TrackGooglePurchase.kt$TrackGooglePurchase$private fun queryBoughtItems()</ID>
     <ID>LongMethod:TrackGooglePurchase.kt$TrackGooglePurchase$private fun sendPurchases( skusToAdd: ArrayList&lt;String>, newPurchaseTokens: ArrayList&lt;String>, )</ID>
     <ID>LongMethod:UpdateUserOperationExecutor.kt$UpdateUserOperationExecutor$override suspend fun execute(operations: List&lt;Operation>): ExecutionResponse</ID>
+    <ID>LongParameterList:ICustomEventBackendService.kt$ICustomEventBackendService$( appId: String, onesignalId: String, externalId: String?, timestamp: Long, eventName: String, eventProperties: String?, metadata: CustomEventMetadata, )</ID>
     <ID>LongParameterList:IDatabase.kt$IDatabase$( table: String, columns: Array&lt;String>? = null, whereClause: String? = null, whereArgs: Array&lt;String>? = null, groupBy: String? = null, having: String? = null, orderBy: String? = null, limit: String? = null, action: (ICursor) -> Unit, )</ID>
     <ID>LongParameterList:IOutcomeEventsBackendService.kt$IOutcomeEventsBackendService$( appId: String, userId: String, subscriptionId: String, deviceType: String, direct: Boolean?, event: OutcomeEvent, )</ID>
     <ID>LongParameterList:IParamsBackendService.kt$ParamsObject$( var googleProjectNumber: String? = null, var enterprise: Boolean? = null, var useIdentityVerification: Boolean? = null, var notificationChannels: JSONArray? = null, var firebaseAnalytics: Boolean? = null, var restoreTTLFilter: Boolean? = null, var clearGroupOnSummaryClick: Boolean? = null, var receiveReceiptEnabled: Boolean? = null, var disableGMSMissingPrompt: Boolean? = null, var unsubscribeWhenNotificationsDisabled: Boolean? = null, var locationShared: Boolean? = null, var requiresUserPrivacyConsent: Boolean? = null, var opRepoExecutionInterval: Long? = null, var influenceParams: InfluenceParamsObject, var fcmParams: FCMParamsObject, )</ID>
@@ -279,6 +281,7 @@
     <ID>RethrowCaughtException:OSDatabase.kt$OSDatabase$throw e</ID>
     <ID>ReturnCount:AppIdResolution.kt$fun resolveAppId( inputAppId: String?, configModel: ConfigModel, preferencesService: IPreferencesService, ): AppIdResolution</ID>
     <ID>ReturnCount:BackgroundManager.kt$BackgroundManager$override fun cancelRunBackgroundServices(): Boolean</ID>
+    <ID>ReturnCount:OneSignalImp.kt$OneSignalImp$private fun internalInit( context: Context, appId: String?, ): Boolean</ID>
     <ID>ReturnCount:ConfigModel.kt$ConfigModel$override fun createModelForProperty( property: String, jsonObject: JSONObject, ): Model?</ID>
     <ID>ReturnCount:HttpClient.kt$HttpClient$private suspend fun makeRequest( url: String, method: String?, jsonBody: JSONObject?, timeout: Int, headers: OptionalHeaders?, ): HttpResponse</ID>
     <ID>ReturnCount:IdentityOperationExecutor.kt$IdentityOperationExecutor$override suspend fun execute(operations: List&lt;Operation>): ExecutionResponse</ID>
@@ -370,6 +373,7 @@
     <ID>TooManyFunctions:IUserManager.kt$IUserManager</ID>
     <ID>TooManyFunctions:InfluenceManager.kt$InfluenceManager : IInfluenceManagerISessionLifecycleHandler</ID>
     <ID>TooManyFunctions:JSONObjectExtensions.kt$com.onesignal.common.JSONObjectExtensions.kt</ID>
+    <ID>TooManyFunctions:JSONUtils.kt$JSONUtils$JSONUtils</ID>
     <ID>TooManyFunctions:Logging.kt$Logging$Logging</ID>
     <ID>TooManyFunctions:Model.kt$Model : IEventNotifier</ID>
     <ID>TooManyFunctions:ModelStore.kt$ModelStore&lt;TModel> : IEventNotifierIModelStoreIModelChangedHandler</ID>

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/IParamsBackendService.kt

@@ -58,5 +58,5 @@ internal class FCMParamsObject(
 
 internal class RemoteLoggingParamsObject(
     val logLevel: com.onesignal.debug.LogLevel? = null,
-    val isEnabled: Boolean = logLevel != null && logLevel != com.onesignal.debug.LogLevel.NONE,
+    val isEnabled: Boolean = logLevel != null,
 )

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/backend/impl/ParamsBackendService.kt

@@ -61,7 +61,7 @@ internal class ParamsBackendService(
         // Process Remote Logging params
         var remoteLoggingParams: RemoteLoggingParamsObject? = null
         responseJson.expandJSONObject("logging_config") {
-            val logLevel = parseLogLevel(it)
+            val logLevel = LogLevel.fromString(it.safeString("log_level"))
             remoteLoggingParams =
                 RemoteLoggingParamsObject(
                     logLevel = logLevel,
@@ -134,21 +134,4 @@ internal class ParamsBackendService(
             isUnattributedEnabled,
         )
     }
-
-    /**
-     * Parse LogLevel from JSON. Supports string (enum name)
-     */
-    @Suppress("ReturnCount", "TooGenericExceptionCaught", "SwallowedException")
-    private fun parseLogLevel(json: JSONObject): LogLevel {
-        val logLevel = json.safeString("log_level")
-        if (logLevel != null) {
-            try {
-                return LogLevel.valueOf(logLevel.uppercase())
-            } catch (_: IllegalArgumentException) {
-                Logging.warn("Invalid log_level string: $logLevel")
-            }
-        }
-
-        return LogLevel.NONE
-    }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt

@@ -1,6 +1,7 @@
 package com.onesignal.core.internal.config
 
 import com.onesignal.common.modeling.Model
+import com.onesignal.core.internal.http.OneSignalService.ONESIGNAL_API_BASE_URL
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -36,7 +37,7 @@ class ConfigModel : Model() {
      * The API URL String.
      */
     var apiUrl: String
-        get() = getStringProperty(::apiUrl.name) { "https://api.onesignal.com/" }
+        get() = getStringProperty(::apiUrl.name) { ONESIGNAL_API_BASE_URL }
         set(value) {
             setStringProperty(::apiUrl.name, value)
         }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/OneSignalService.kt

@@ -0,0 +1,7 @@
+package com.onesignal.core.internal.http
+
+/** Central API base URL used by all SDK HTTP traffic, including Otel log export. */
+object OneSignalService {
+//    const val ONESIGNAL_API_BASE_URL = "https://api.staging.onesignal.com/"
+    const val ONESIGNAL_API_BASE_URL = "https://api.onesignal.com/"
+}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/LogLevel.kt

@@ -49,5 +49,19 @@ enum class LogLevel {
         fun fromInt(value: Int): LogLevel {
             return values()[value]
         }
+
+        /**
+         * Parses a [LogLevel] from its string name (case-insensitive).
+         * Returns `null` if the string is null or not a valid level name.
+         */
+        @JvmStatic
+        fun fromString(value: String?): LogLevel? {
+            if (value == null) return null
+            return try {
+                valueOf(value.uppercase())
+            } catch (_: IllegalArgumentException) {
+                null
+            }
+        }
     }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/crash/OneSignalCrashUploaderWrapper.kt

@@ -1,12 +1,12 @@
 package com.onesignal.debug.internal.crash
 
+import com.onesignal.common.threading.OneSignalDispatchers
 import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.debug.internal.logging.otel.android.AndroidOtelLogger
 import com.onesignal.debug.internal.logging.otel.android.createAndroidOtelPlatformProvider
 import com.onesignal.otel.OtelFactory
 import com.onesignal.otel.crash.OtelCrashUploader
-import kotlinx.coroutines.runBlocking
 
 /**
  * Android-specific wrapper for OtelCrashUploader that implements IStartableService.
@@ -46,15 +46,15 @@ internal class OneSignalCrashUploaderWrapper(
     @Suppress("TooGenericExceptionCaught")
     override fun start() {
         if (!OtelSdkSupport.isSupported) return
-        try {
-            runBlocking {
+        OneSignalDispatchers.launchOnIO {
+            try {
                 uploader.start()
+            } catch (t: Throwable) {
+                com.onesignal.debug.internal.logging.Logging.warn(
+                    "OneSignal: Crash uploader failed to start: ${t.message}",
+                    t,
+                )
             }
-        } catch (t: Throwable) {
-            com.onesignal.debug.internal.logging.Logging.warn(
-                "OneSignal: Crash uploader failed to start: ${t.message}",
-                t,
-            )
         }
     }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/crash/OtelAnrDetector.kt

@@ -58,6 +58,7 @@ internal class OtelAnrDetector(
         logger.info("$TAG: ✅ ANR detection started successfully")
     }
 
+    @Suppress("TooGenericExceptionCaught")
     private fun setupRunnables() {
         // Runnable that runs on the main thread to indicate it's responsive
         mainThreadRunnable = Runnable {
@@ -81,8 +82,8 @@ internal class OtelAnrDetector(
     }
 
     private fun checkForAnr() {
-        // Post a message to the main thread
-        mainHandler.post(mainThreadRunnable!!)
+        val runnable = mainThreadRunnable ?: return
+        mainHandler.post(runnable)
 
         // Wait for the check interval
         Thread.sleep(checkIntervalMs)
@@ -145,6 +146,7 @@ internal class OtelAnrDetector(
         logger.info("$TAG: ✅ ANR detection stopped")
     }
 
+    @Suppress("TooGenericExceptionCaught")
     private fun reportAnr(unresponsiveDurationMs: Long) {
         try {
             logger.info("$TAG: Checking if ANR is OneSignal-related (unresponsive for ${unresponsiveDurationMs}ms)")

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

@@ -226,19 +226,10 @@ internal class OtelIdResolver(
         }
     }
 
-    @Suppress("TooGenericExceptionCaught", "SwallowedException")
-    private fun extractLogLevelFromParams(remoteLoggingParams: JSONObject): com.onesignal.debug.LogLevel? {
-        return if (remoteLoggingParams.has("logLevel")) {
-            val logLevelString = remoteLoggingParams.getString("logLevel")
-            try {
-                com.onesignal.debug.LogLevel.valueOf(logLevelString.uppercase())
-            } catch (e: Exception) {
-                null
-            }
-        } else {
-            null
-        }
-    }
+    private fun extractLogLevelFromParams(remoteLoggingParams: JSONObject): com.onesignal.debug.LogLevel? =
+        com.onesignal.debug.LogLevel.fromString(
+            if (remoteLoggingParams.has("logLevel")) remoteLoggingParams.getString("logLevel") else null
+        )
 
     /**
      * Resolves install ID from SharedPreferences.

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.os.Build
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.common.OneSignalWrapper
+import com.onesignal.core.internal.http.OneSignalService
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.otel.IOtelPlatformProvider
 
@@ -107,16 +108,11 @@ internal class OtelPlatformProvider(
     override val currentThreadName: String
         get() = Thread.currentThread().name
 
-    // Crash-specific configuration
-    // Store crashStoragePath privately since we need a custom getter that logs
-    private val _crashStoragePath: String = config.crashStoragePath
-
-    override val crashStoragePath: String
-        get() {
-            // Log the path on first access so developers know where to find crash logs
-            Logging.info("OneSignal: Crash logs stored at: $_crashStoragePath")
-            return _crashStoragePath
-        }
+    override val crashStoragePath: String by lazy {
+        val path = config.crashStoragePath
+        Logging.info("OneSignal: Crash logs stored at: $path")
+        path
+    }
 
     override val minFileAgeForReadMillis: Long = 5_000
 
@@ -141,6 +137,8 @@ internal class OtelPlatformProvider(
 
     override val appIdForHeaders: String
         get() = appId ?: ""
+
+    override val apiBaseUrl: String = OneSignalService.ONESIGNAL_API_BASE_URL
 }
 
 /**