feat: cherry-pick otel crash reporting into 5.6-main

OneSignalSDK/build.gradle

@@ -14,8 +14,8 @@ buildscript {
         huaweiAgconnectVersion = '1.9.1.304'
         huaweiHMSPushVersion = '6.3.0.304'
         huaweiHMSLocationVersion = '4.0.0.300'
-        kotlinVersion = '1.9.25'
-        dokkaVersion = '1.9.10' // Dokka version compatible with Kotlin 1.9.25
+        kotlinVersion = '2.2.0'
+        dokkaVersion = '1.9.10'
         coroutinesVersion = '1.7.3'
         kotestVersion = '5.8.0'
         ioMockVersion = '1.13.2'
@@ -25,6 +25,10 @@ buildscript {
         ktlintVersion = '0.50.0' // Used by Spotless for Kotlin formatting (compatible with Kotlin 1.7.10)
         spotlessVersion = '6.25.0'
         tdunningJsonForTest = '1.0' // DO NOT upgrade for tests, using an old version so it matches AOSP
+        // OpenTelemetry versions
+        opentelemetryBomVersion = '1.55.0'
+        opentelemetrySemconvVersion = '1.37.0'
+        opentelemetryDiskBufferingVersion = '1.51.0-alpha'
 
         sharedRepos = {
             google()
@@ -45,11 +49,9 @@ buildscript {
         ]
     }
 
-    buildscript {
-        repositories sharedRepos
-        dependencies {
-            classpath sharedDeps
-        }
+    repositories sharedRepos
+    dependencies {
+        classpath sharedDeps
     }
 }
 

OneSignalSDK/detekt/detekt-config.yml

@@ -91,7 +91,7 @@ comments:
   UndocumentedPublicFunction:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/testhelpers/**']
-  
+
   EndOfSentenceFormat:
     active: false
     endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!:]$)

OneSignalSDK/onesignal/core/build.gradle

@@ -82,6 +82,8 @@ dependencies {
         }
     }
 
+    // Otel module dependency
+    implementation(project(':OneSignal:otel'))
     testImplementation(project(':OneSignal:testhelpers'))
 
     testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion")

OneSignalSDK/onesignal/core/src/main/AndroidManifest.xml

@@ -1,4 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Override otel module's minSdk requirement (26) since we have runtime checks -->
+    <!-- The otel module is only used on SDK 26+, so this is safe -->
+    <uses-sdk tools:overrideLibrary="com.onesignal.otel" />
 
     <!-- Required so the device can access the internet. -->
     <uses-permission android:name="android.permission.INTERNET" />

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt

@@ -61,7 +61,7 @@ object JSONUtils {
             try {
                 val value = jsonObject.opt(key)
                 if (value is JSONArray || value is JSONObject) {
-                    Logging.error("Omitting key '$key'! sendTags DO NOT supported nested values!")
+                    Logging.warn("Omitting key '$key'! sendTags DO NOT supported nested values!")
                 } else if (jsonObject.isNull(key) || "" == value) {
                     result[key] = ""
                 } else {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/CoreModule.kt

@@ -33,6 +33,7 @@ import com.onesignal.core.internal.purchases.impl.TrackGooglePurchase
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.core.internal.time.ITime
 import com.onesignal.core.internal.time.impl.Time
+import com.onesignal.debug.internal.crash.OneSignalCrashUploaderWrapper
 import com.onesignal.inAppMessages.IInAppMessagesManager
 import com.onesignal.inAppMessages.internal.MisconfiguredIAMManager
 import com.onesignal.location.ILocationManager
@@ -81,6 +82,9 @@ internal class CoreModule : IModule {
         // Purchase Tracking
         builder.register<TrackGooglePurchase>().provides<IStartableService>()
 
+        // Crash Uploader (crash handler is initialized directly in OneSignalImp for early initialization)
+        builder.register<OneSignalCrashUploaderWrapper>().provides<IStartableService>()
+
         // Register dummy services in the event they are not configured. These dummy services
         // will throw an error message if the associated functionality is attempted to be used.
         builder.register<MisconfiguredNotificationsManager>().provides<INotificationsManager>()

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

@@ -2,7 +2,7 @@ package com.onesignal.core.internal.backend
 
 import org.json.JSONArray
 
-interface IParamsBackendService {
+internal interface IParamsBackendService {
     /**
      * Retrieve the configuration parameters for the [appId] and optional [subscriptionId].
      *
@@ -20,7 +20,8 @@ interface IParamsBackendService {
     ): ParamsObject
 }
 
-class ParamsObject(
+@Suppress("LongParameterList")
+internal class ParamsObject(
     var googleProjectNumber: String? = null,
     var enterprise: Boolean? = null,
     var useIdentityVerification: Boolean? = null,
@@ -36,9 +37,10 @@ class ParamsObject(
     var opRepoExecutionInterval: Long? = null,
     var influenceParams: InfluenceParamsObject,
     var fcmParams: FCMParamsObject,
+    val remoteLoggingParams: RemoteLoggingParamsObject,
 )
 
-class InfluenceParamsObject(
+internal class InfluenceParamsObject(
     val indirectNotificationAttributionWindow: Int? = null,
     val notificationLimit: Int? = null,
     val indirectIAMAttributionWindow: Int? = null,
@@ -48,8 +50,13 @@ class InfluenceParamsObject(
     val isUnattributedEnabled: Boolean? = null,
 )
 
-class FCMParamsObject(
+internal class FCMParamsObject(
     val projectId: String? = null,
     val appId: String? = null,
     val apiKey: String? = null,
 )
+
+internal class RemoteLoggingParamsObject(
+    val logLevel: com.onesignal.debug.LogLevel? = null,
+    val isEnabled: Boolean = logLevel != null,
+)

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

@@ -11,6 +11,7 @@ import com.onesignal.core.internal.backend.FCMParamsObject
 import com.onesignal.core.internal.backend.IParamsBackendService
 import com.onesignal.core.internal.backend.InfluenceParamsObject
 import com.onesignal.core.internal.backend.ParamsObject
+import com.onesignal.core.internal.backend.RemoteLoggingParamsObject
 import com.onesignal.core.internal.http.CacheKeys
 import com.onesignal.core.internal.http.IHttpClient
 import com.onesignal.core.internal.http.impl.OptionalHeaders
@@ -57,6 +58,16 @@ internal class ParamsBackendService(
                 )
         }
 
+        // Process Remote Logging params
+        var remoteLoggingParams: RemoteLoggingParamsObject? = null
+        responseJson.expandJSONObject("logging_config") {
+            val logLevel = LogLevel.fromString(it.safeString("log_level"))
+            remoteLoggingParams =
+                RemoteLoggingParamsObject(
+                    logLevel = logLevel,
+                )
+        }
+
         return ParamsObject(
             googleProjectNumber = responseJson.safeString("android_sender_id"),
             enterprise = responseJson.safeBool("enterp"),
@@ -75,6 +86,7 @@ internal class ParamsBackendService(
             opRepoExecutionInterval = responseJson.safeLong("oprepo_execution_interval"),
             influenceParams = influenceParams ?: InfluenceParamsObject(),
             fcmParams = fcmParams ?: FCMParamsObject(),
+            remoteLoggingParams = remoteLoggingParams ?: RemoteLoggingParamsObject(),
         )
     }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt

@@ -186,7 +186,7 @@ internal class BackgroundManager(
         } catch (e: NullPointerException) {
             // Catch for buggy Oppo devices
             // https://github.com/OneSignal/OneSignal-Android-SDK/issues/487
-            Logging.error(
+            Logging.info(
                 "scheduleSyncServiceAsJob called JobScheduler.jobScheduler which " +
                     "triggered an internal null Android error. Skipping job.",
                 e,

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)
         }
@@ -301,6 +302,9 @@ class ConfigModel : Model() {
     val fcmParams: FCMConfigModel
         get() = getAnyProperty(::fcmParams.name) { FCMConfigModel(this, ::fcmParams.name) } as FCMConfigModel
 
+    val remoteLoggingParams: RemoteLoggingConfigModel
+        get() = getAnyProperty(::remoteLoggingParams.name) { RemoteLoggingConfigModel(this, ::remoteLoggingParams.name) } as RemoteLoggingConfigModel
+
     override fun createModelForProperty(
         property: String,
         jsonObject: JSONObject,
@@ -317,6 +321,12 @@ class ConfigModel : Model() {
             return model
         }
 
+        if (property == ::remoteLoggingParams.name) {
+            val model = RemoteLoggingConfigModel(this, ::remoteLoggingParams.name)
+            model.initializeFromJson(jsonObject)
+            return model
+        }
+
         return null
     }
 }
@@ -425,3 +435,34 @@ class FCMConfigModel(parentModel: Model, parentProperty: String) : Model(parentM
             setOptStringProperty(::apiKey.name, value)
         }
 }
+
+/**
+ * Configuration related to OneSignal's remote logging.
+ */
+class RemoteLoggingConfigModel(
+    parentModel: Model,
+    parentProperty: String,
+) : Model(parentModel, parentProperty) {
+    /**
+     * The minimum log level to send to OneSignal's server.
+     * If null, defaults to ERROR level for client-side logging.
+     * If NONE, no logs (including errors) will be sent remotely.
+     *
+     * Log levels: NONE < FATAL < ERROR < WARN < INFO < DEBUG < VERBOSE
+     */
+    var logLevel: com.onesignal.debug.LogLevel?
+        get() = getOptEnumProperty<com.onesignal.debug.LogLevel>(::logLevel.name)
+        set(value) {
+            setOptEnumProperty(::logLevel.name, value)
+        }
+
+    /**
+     * Whether remote logging is enabled.
+     * Set by backend config hydration — true when the server sends a valid log_level, false otherwise.
+     */
+    var isEnabled: Boolean
+        get() = getBooleanProperty(::isEnabled.name) { false }
+        set(value) {
+            setBooleanProperty(::isEnabled.name, value)
+        }
+}

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

@@ -3,7 +3,8 @@ package com.onesignal.core.internal.config
 import com.onesignal.common.modeling.SimpleModelStore
 import com.onesignal.common.modeling.SingletonModelStore
 import com.onesignal.core.internal.preferences.IPreferencesService
+const val CONFIG_NAME_SPACE = "config"
 
 open class ConfigModelStore(prefs: IPreferencesService) : SingletonModelStore<ConfigModel>(
-    SimpleModelStore({ ConfigModel() }, "config", prefs),
+    SimpleModelStore({ ConfigModel() }, CONFIG_NAME_SPACE, prefs),
 )

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

@@ -103,6 +103,9 @@ internal class ConfigModelStoreListener(
                     params.influenceParams.isIndirectEnabled?.let { config.influenceParams.isIndirectEnabled = it }
                     params.influenceParams.isUnattributedEnabled?.let { config.influenceParams.isUnattributedEnabled = it }
 
+                    params.remoteLoggingParams.logLevel?.let { config.remoteLoggingParams.logLevel = it }
+                    config.remoteLoggingParams.isEnabled = params.remoteLoggingParams.isEnabled
+
                     _configModelStore.replace(config, ModelChangeTags.HYDRATE)
                     success = true
                 } catch (ex: BackendException) {

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/core/internal/http/impl/HttpClient.kt

@@ -29,6 +29,9 @@ import java.net.UnknownHostException
 import java.util.Scanner
 import javax.net.ssl.HttpsURLConnection
 
+internal const val HTTP_SDK_VERSION_HEADER_KEY = "SDK-Version"
+internal val HTTP_SDK_VERSION_HEADER_VALUE = "onesignal/android/${OneSignalUtils.sdkVersion}"
+
 internal class HttpClient(
     private val _connectionFactory: IHttpConnectionFactory,
     private val _prefs: IPreferencesService,
@@ -93,7 +96,7 @@ internal class HttpClient(
                 return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, headers)
             }
         } catch (e: TimeoutCancellationException) {
-            Logging.error("HttpClient: Request timed out: $url", e)
+            Logging.info("HttpClient: Request timed out: $url", e)
             return HttpResponse(0, null, e)
         } catch (e: Throwable) {
             return HttpResponse(0, null, e)
@@ -135,7 +138,7 @@ internal class HttpClient(
                     con.useCaches = false
                     con.connectTimeout = timeout
                     con.readTimeout = timeout
-                    con.setRequestProperty("SDK-Version", "onesignal/android/" + OneSignalUtils.sdkVersion)
+                    con.setRequestProperty(HTTP_SDK_VERSION_HEADER_KEY, HTTP_SDK_VERSION_HEADER_VALUE)
 
                     if (OneSignalWrapper.sdkType != null && OneSignalWrapper.sdkVersion != null) {
                         con.setRequestProperty("SDK-Wrapper", "onesignal/${OneSignalWrapper.sdkType}/${OneSignalWrapper.sdkVersion}")

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt

@@ -264,7 +264,7 @@ internal class OperationRepo(
                 ExecutionResult.FAIL_NORETRY,
                 ExecutionResult.FAIL_CONFLICT,
                 -> {
-                    Logging.error("Operation execution failed without retry: $operations")
+                    Logging.warn("Operation execution failed without retry: $operations")
                     // on failure we remove the operation from the store and wake any waiters
                     ops.forEach { _operationModelStore.remove(it.operation.id) }
                     ops.forEach { it.waiter?.wake(false) }
@@ -279,7 +279,7 @@ internal class OperationRepo(
                     }
                 }
                 ExecutionResult.FAIL_RETRY -> {
-                    Logging.error("Operation execution failed, retrying: $operations")
+                    Logging.info("Operation execution failed, retrying: $operations")
                     // add back all operations to the front of the queue to be re-executed.
                     synchronized(queue) {
                         ops.reversed().forEach {
@@ -341,7 +341,7 @@ internal class OperationRepo(
         val delayForOnRetries = retries * _configModelStore.model.opRepoDefaultFailRetryBackoff
         val delayFor = max(delayForOnRetries, retryAfterSecondsNonNull * 1_000)
         if (delayFor < 1) return
-        Logging.error("Operations being delay for: $delayFor ms")
+        Logging.debug("Operations being delay for: $delayFor ms")
         withTimeoutOrNull(delayFor) {
             retryWaiter.waitForWake()
         }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/ITime.kt

@@ -10,4 +10,9 @@ interface ITime {
      * current time and midnight, January 1, 1970 UTC).
      */
     val currentTimeMillis: Long
+
+    /**
+     * Returns how long the app has been running.
+     */
+    val processUptimeMillis: Long
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/time/impl/Time.kt

@@ -1,8 +1,14 @@
 package com.onesignal.core.internal.time.impl
 
+import android.os.Build
+import android.os.SystemClock
+import androidx.annotation.RequiresApi
 import com.onesignal.core.internal.time.ITime
 
 internal class Time : ITime {
     override val currentTimeMillis: Long
         get() = System.currentTimeMillis()
+    override val processUptimeMillis: Long
+        @RequiresApi(Build.VERSION_CODES.N)
+        get() = SystemClock.uptimeMillis() - android.os.Process.getStartUptimeMillis()
 }

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
+            }
+        }
     }
 }