fix: error handling around models

Models can throw if something goes wrong initializing them.

Author: jkasten2

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

@@ -5,6 +5,7 @@ import androidx.annotation.RequiresApi
 import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.http.impl.HTTP_SDK_VERSION_HEADER_KEY
 import com.onesignal.core.internal.http.impl.HTTP_SDK_VERSION_HEADER_VALUE
+import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.debug.internal.logging.otel.attributes.OneSignalOtelFieldsPerEvent
 import com.onesignal.debug.internal.logging.otel.attributes.OneSignalOtelFieldsTopLevel
 import com.onesignal.debug.internal.logging.otel.config.OtelConfigCrashFile
@@ -71,9 +72,17 @@ internal class OneSignalOpenTelemetryRemote(
     _osPerEventFields: OneSignalOtelFieldsPerEvent,
 ) : OneSignalOpenTelemetryBase(_osTopLevelFields, _osPerEventFields),
     IOneSignalOpenTelemetryRemote {
-    val extraHttpHeaders by lazy {
+    private val appId: String get() =
+        try {
+            _configModelStore.model.appId
+        } catch (_: NullPointerException) {
+            Logging.error("Auth missing for crash log reporting!")
+            ""
+        }
+
+    val extraHttpHeaders: Map<String, String> by lazy {
         mapOf(
-            "X-OneSignal-App-Id" to _configModelStore.model.appId,
+            "X-OneSignal-App-Id" to appId,
             HTTP_SDK_VERSION_HEADER_KEY to HTTP_SDK_VERSION_HEADER_VALUE,
             "x-honeycomb-team" to "", // TODO: REMOVE
         )

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/attributes/OneSignalOtelFieldsPerEvent.kt

@@ -4,6 +4,7 @@ import com.onesignal.common.IDManager
 import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.time.ITime
+import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.user.internal.identity.IdentityModelStore
 import com.squareup.wire.internal.toUnmodifiableMap
 import java.util.UUID
@@ -17,39 +18,61 @@ internal class OneSignalOtelFieldsPerEvent(
     fun getAttributes(): Map<String, String> {
         val attributes: MutableMap<String, String> = mutableMapOf()
 
-        attributes.put("log.record.uid", recordId.toString())
+        attributes["log.record.uid"] = recordId.toString()
 
         attributes
             .putIfValueNotNull(
+                "$OS_OTEL_NAMESPACE.app_id",
+                appId
+            ).putIfValueNotNull(
                 "$OS_OTEL_NAMESPACE.onesignal_id",
                 onesignalId
             ).putIfValueNotNull(
                 "$OS_OTEL_NAMESPACE.push_subscription_id",
                 subscriptionId
             )
 
-        attributes.put("android.app.state", appState)
-        attributes.put("process.uptime", processUptime.toString())
-        attributes.put("thread.name", currentThreadName)
+        attributes["android.app.state"] = appState
+        attributes["process.uptime"] = processUptime.toString()
+        attributes["thread.name"] = currentThreadName
 
         return attributes.toUnmodifiableMap()
     }
 
+    private val appId: String? get() {
+        try {
+            return _configModelStore.model.appId
+        } catch (_: NullPointerException) {
+            Logging.warn("app_id not available to add to crash log")
+            return null
+        }
+    }
+
     private val onesignalId: String? get() {
-        val onesignalId = _identityModelStore.model.onesignalId
-        if (IDManager.isLocalId(onesignalId)) {
+        try {
+            val onesignalId = _identityModelStore.model.onesignalId
+            if (IDManager.isLocalId(onesignalId)) {
+                return null
+            }
+            return onesignalId
+        } catch (_: NullPointerException) {
+            Logging.warn("onesignalId not available to add to crash log")
             return null
         }
-        return onesignalId
     }
 
     private val subscriptionId: String? get() {
-        val pushSubscriptionId = _configModelStore.model.pushSubscriptionId
-        if (pushSubscriptionId == null ||
-            IDManager.isLocalId(pushSubscriptionId)) {
+        try {
+            val pushSubscriptionId = _configModelStore.model.pushSubscriptionId
+            if (pushSubscriptionId == null ||
+                IDManager.isLocalId(pushSubscriptionId)) {
+                return null
+            }
+            return pushSubscriptionId
+        } catch (_: NullPointerException) {
+            Logging.warn("subscriptionId not available to add to crash log")
             return null
         }
-        return pushSubscriptionId
     }
 
     // https://opentelemetry.io/docs/specs/semconv/registry/attributes/android/

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/debug/internal/logging/otel/attributes/OneSignalOtelFieldsTopLevel.kt

@@ -5,7 +5,6 @@ import com.onesignal.common.AndroidUtils
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.common.OneSignalWrapper
 import com.onesignal.core.internal.application.IApplicationService
-import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.device.IInstallIdService
 import com.squareup.wire.internal.toUnmodifiableMap
 
@@ -20,14 +19,11 @@ internal const val OS_OTEL_NAMESPACE: String = "ossdk"
  */
 internal class OneSignalOtelFieldsTopLevel(
     private val _applicationService: IApplicationService,
-    private val _configModelStore: ConfigModelStore,
     private val _installIdService: IInstallIdService,
 ) {
     suspend fun getAttributes(): Map<String, String> {
         val attributes: MutableMap<String, String> =
             mutableMapOf(
-                "$OS_OTEL_NAMESPACE.app_id" to
-                    _configModelStore.model.appId,
                 "$OS_OTEL_NAMESPACE.install_id" to
                     _installIdService.getId().toString(),
                 "$OS_OTEL_NAMESPACE.sdk_base"