Redo plumbing for device arch and use semconv attribute name

bidetofevil · bidetofevil · commit 16d5c4e8fae0 · 2026-07-27T15:09:13.000-07:00
diff --git a/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/ConfigServiceImpl.kt b/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/ConfigServiceImpl.kt
@@ -46,7 +46,7 @@ class ConfigServiceImpl(
     private val serializer: PlatformSerializer,
     store: KeyValueStore,
     okHttpClient: Lazy<OkHttpClient>,
-    abis: Array<String>,
+    architecture: String,
     private val sdkVersion: String,
     private val apiLevel: Int,
     private val filesDir: File,
@@ -156,7 +156,7 @@ class ConfigServiceImpl(
         AppFramework.fromString(it)
     } ?: AppFramework.NATIVE
 
-    override val cpuAbi: CpuAbi = CpuAbi.current(abis)
+    override val cpuAbi: CpuAbi = CpuAbi.fromArchName(architecture)
 
     override val nativeSymbolMap: Map<String, String>? by lazy {
         getNativeSymbols()?.let {
diff --git a/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/CpuAbi.kt b/embrace-android-config/src/main/kotlin/io/embrace/android/embracesdk/internal/config/CpuAbi.kt
@@ -1,20 +1,15 @@
 package io.embrace.android.embracesdk.internal.config
 
-enum class CpuAbi(
-    val archName: String,
-    val is32BitDevice: Boolean,
-) {
+enum class CpuAbi(val archName: String) {
 
-    ARMEABI_V7A("armeabi-v7a", true),
-    ARM64_V8A("arm64-v8a", false),
-    X86("x86", true),
-    X86_64("x86_64", false),
-    UNKNOWN("unknown", false),
+    ARMEABI_V7A("armeabi-v7a"),
+    ARM64_V8A("arm64-v8a"),
+    X86("x86"),
+    X86_64("x86_64"),
+    UNKNOWN("unknown"),
     ;
 
     companion object {
-        fun current(abis: Array<String>) = fromArchName(abis[0])
-
         fun fromArchName(abi: String): CpuAbi {
             return CpuAbi.entries.find { it.archName == abi } ?: UNKNOWN
         }
diff --git a/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/ConfigServiceImplTest.kt b/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/ConfigServiceImplTest.kt
@@ -116,7 +116,7 @@ internal class ConfigServiceImplTest {
         serializer = serializer,
         store = FakeKeyValueStore(),
         okHttpClient = lazyOf(okHttpClient),
-        abis = arrayOf("arm64-v8a"),
+        architecture = "arm64-v8a",
         sdkVersion = "1.2.3",
         apiLevel = 36,
         filesDir = Files.createTempDirectory("tmp").toFile(),
diff --git a/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/NativeSymbolTest.kt b/embrace-android-config/src/test/kotlin/io/embrace/android/embracesdk/internal/config/NativeSymbolTest.kt
@@ -80,7 +80,7 @@ class NativeSymbolTest {
             serializer = serializer,
             store = FakeKeyValueStore(),
             okHttpClient = lazyOf(okHttpClient),
-            abis = arrayOf(arch),
+            architecture = arch,
             sdkVersion = "1.2.3",
             apiLevel = 36,
             filesDir = Files.createTempDirectory("tmp").toFile(),
diff --git a/embrace-android-envelope/src/main/kotlin/io/embrace/android/embracesdk/internal/envelope/resource/EnvelopeResourceSourceImpl.kt b/embrace-android-envelope/src/main/kotlin/io/embrace/android/embracesdk/internal/envelope/resource/EnvelopeResourceSourceImpl.kt
@@ -39,7 +39,6 @@ class EnvelopeResourceSourceImpl(
             putValue("disk_total_capacity", device.internalStorageTotalCapacity.value)
             putValue("screen_resolution", device.screenResolution)
             putValue("num_cores", device.numberOfCores)
-            putValue("device_architecture", configService.cpuAbi.archName)
             putValue("environment", environment.value)
 
             // attributes set by hosted SDKs or other parts of the SDK that are not always present
diff --git a/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/config/OtelSdkConfig.kt b/embrace-android-otel/src/main/kotlin/io/embrace/android/embracesdk/internal/otel/config/OtelSdkConfig.kt
@@ -15,6 +15,7 @@ import io.opentelemetry.kotlin.logging.export.LogRecordExporter
 import io.opentelemetry.kotlin.logging.export.LogRecordProcessor
 import io.opentelemetry.kotlin.semconv.AndroidAttributes
 import io.opentelemetry.kotlin.semconv.DeviceAttributes
+import io.opentelemetry.kotlin.semconv.HostAttributes
 import io.opentelemetry.kotlin.semconv.OsAttributes
 import io.opentelemetry.kotlin.semconv.ServiceAttributes
 import io.opentelemetry.kotlin.semconv.TelemetryAttributes
@@ -80,6 +81,7 @@ class OtelSdkConfig(
         put(OsAttributes.OS_TYPE, systemInfo.osType)
         put(OsAttributes.OS_BUILD_ID, systemInfo.osBuild)
         put(AndroidAttributes.ANDROID_OS_API_LEVEL, systemInfo.androidOsApiLevel)
+        put(HostAttributes.HOST_ARCH, systemInfo.architecture)
         put(DeviceAttributes.DEVICE_MANUFACTURER, systemInfo.deviceManufacturer)
         put(DeviceAttributes.DEVICE_MODEL_IDENTIFIER, systemInfo.deviceModel)
         put(DeviceAttributes.DEVICE_MODEL_NAME, systemInfo.deviceModel)
diff --git a/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/config/OtelSdkConfigTest.kt b/embrace-android-otel/src/test/kotlin/io/embrace/android/embracesdk/internal/otel/config/OtelSdkConfigTest.kt
@@ -6,6 +6,7 @@ import io.embrace.android.embracesdk.internal.otel.logs.LogSinkImpl
 import io.embrace.android.embracesdk.internal.otel.spans.SpanRepository
 import io.opentelemetry.kotlin.semconv.AndroidAttributes
 import io.opentelemetry.kotlin.semconv.DeviceAttributes
+import io.opentelemetry.kotlin.semconv.HostAttributes
 import io.opentelemetry.kotlin.semconv.OsAttributes
 import io.opentelemetry.kotlin.semconv.ServiceAttributes
 import io.opentelemetry.kotlin.semconv.TelemetryAttributes
@@ -25,6 +26,7 @@ internal class OtelSdkConfigTest {
             androidOsApiLevel = "99",
             deviceManufacturer = "testManufacturer",
             deviceModel = "testModel",
+            architecture = "arm64-v8a",
         )
 
         val configuration = OtelSdkConfig(
@@ -48,6 +50,7 @@ internal class OtelSdkConfigTest {
             OsAttributes.OS_TYPE to systemInfo.osType,
             OsAttributes.OS_BUILD_ID to systemInfo.osBuild,
             AndroidAttributes.ANDROID_OS_API_LEVEL to systemInfo.androidOsApiLevel,
+            HostAttributes.HOST_ARCH to systemInfo.architecture,
             DeviceAttributes.DEVICE_MANUFACTURER to systemInfo.deviceManufacturer,
             DeviceAttributes.DEVICE_MODEL_IDENTIFIER to systemInfo.deviceModel,
             DeviceAttributes.DEVICE_MODEL_NAME to systemInfo.deviceModel,
diff --git a/embrace-android-payload/src/test/kotlin/io/embrace/android/embracesdk/internal/serialization/EnvelopeResourceSerializerTest.kt b/embrace-android-payload/src/test/kotlin/io/embrace/android/embracesdk/internal/serialization/EnvelopeResourceSerializerTest.kt
@@ -17,7 +17,7 @@ internal class EnvelopeResourceSerializerTest {
             "app_framework" to EnvelopeResourceValue.of(AppFramework.NATIVE.value.toLong()),
             "build_id" to EnvelopeResourceValue.of("abc123"),
             "emb.app.environment" to EnvelopeResourceValue.of("prod"),
-            "device_architecture" to EnvelopeResourceValue.of("arm64-v8a"),
+            "host.arch" to EnvelopeResourceValue.of("arm64-v8a"),
             "os.version" to EnvelopeResourceValue.of("13"),
             "jailbroken" to EnvelopeResourceValue.of(false),
             "disk_total_capacity" to EnvelopeResourceValue.of(64000000000L),
diff --git a/embrace-android-payload/src/test/resources/envelope_resource_full.json b/embrace-android-payload/src/test/resources/envelope_resource_full.json
@@ -4,7 +4,7 @@
   "app_framework": 1,
   "build_id": "abc123",
   "emb.app.environment": "prod",
-  "device_architecture": "arm64-v8a",
+  "host.arch": "arm64-v8a",
   "os.version": "13",
   "jailbroken": false,
   "disk_total_capacity": 64000000000,
diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceSetupInterface.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceSetupInterface.kt
@@ -125,7 +125,7 @@ internal class EmbraceSetupInterface(
                 apiLevel = Build.VERSION.SDK_INT,
                 filesDir = coreModule.context.filesDir,
                 store = coreModule.store,
-                abis = Build.SUPPORTED_ABIS,
+                architecture = initModule.systemInfo.architecture,
                 logger = initModule.logger,
                 uuidSource = initModule.uuidSource,
             )
diff --git a/embrace-android-sdk/src/main/kotlin/io/embrace/android/embracesdk/internal/injection/ModuleInitBootstrapper.kt b/embrace-android-sdk/src/main/kotlin/io/embrace/android/embracesdk/internal/injection/ModuleInitBootstrapper.kt
@@ -66,7 +66,7 @@ internal class ModuleInitBootstrapper(
                 apiLevel = Build.VERSION.SDK_INT,
                 filesDir = coreModule.context.filesDir,
                 store = coreModule.store,
-                abis = Build.SUPPORTED_ABIS,
+                architecture = initModule.systemInfo.architecture,
                 logger = initModule.logger,
                 uuidSource = initModule.uuidSource,
             )
diff --git a/embrace-android-sdk/src/test/resources/v2_session_expected.json b/embrace-android-sdk/src/test/resources/v2_session_expected.json
@@ -20,6 +20,7 @@
     "os.version": "__EMBRACE_TEST_IGNORE__",
     "os.build_id": "__EMBRACE_TEST_IGNORE__",
     "android.os.api_level": "__EMBRACE_TEST_IGNORE__",
+    "host.arch": "__EMBRACE_TEST_IGNORE__",
     "device.manufacturer": "Fake Manufacturer",
     "device.model.identifier": "Phake Phone Phive",
     "device.model.name": "Phake Phone Phive",
@@ -31,7 +32,6 @@
     "build_flavor": "fakeBuildFlavor",
     "bundle_version": "99",
     "sdk_simple_version": 53,
-    "device_architecture": "__EMBRACE_TEST_IGNORE__",
     "jailbroken": "__EMBRACE_TEST_IGNORE__",
     "disk_total_capacity": "__EMBRACE_TEST_IGNORE__",
     "screen_resolution": "__EMBRACE_TEST_IGNORE__",
diff --git a/embrace-android-utils/src/main/kotlin/io/embrace/android/embracesdk/internal/SystemInfo.kt b/embrace-android-utils/src/main/kotlin/io/embrace/android/embracesdk/internal/SystemInfo.kt
@@ -3,7 +3,7 @@ package io.embrace.android.embracesdk.internal
 import android.os.Build
 
 /**
- * Information about the the device or OS that can be retrieved without disk or platform API access
+ * Information about the device or OS that can be retrieved without disk or platform API access
  */
 data class SystemInfo(
     /**
@@ -40,6 +40,13 @@ data class SystemInfo(
      * Name of the model of the device.
      */
     val deviceModel: String = getDeviceModel(),
+
+    /**
+     * The primary CPU architecture (ABI) the device supports, e.g. "arm64-v8a". This is the single source
+     * of the device architecture: [io.embrace.android.embracesdk.internal.config.CpuAbi] and the exported
+     * `host.arch` resource attribute both derive from it.
+     */
+    val architecture: String = getArchitecture(),
 )
 
 internal fun getOsBuild(): String {
@@ -82,6 +89,14 @@ internal fun getDeviceModel(): String {
     }
 }
 
+internal fun getArchitecture(): String {
+    return try {
+        Build.SUPPORTED_ABIS.firstOrNull() ?: ""
+    } catch (_: Throwable) {
+        ""
+    }
+}
+
 /**
  * Tries to determine whether the device is an emulator by looking for known models and
  * manufacturers which correspond to emulators.

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ internal class EmbraceSetupInterface(`
`125`	`125`	`apiLevel = Build.VERSION.SDK_INT,`
`126`	`126`	`filesDir = coreModule.context.filesDir,`
`127`	`127`	`store = coreModule.store,`
`128`		`- abis = Build.SUPPORTED_ABIS,`
	`128`	`+ architecture = initModule.systemInfo.architecture,`
`129`	`129`	`logger = initModule.logger,`
`130`	`130`	`uuidSource = initModule.uuidSource,`
`131`	`131`	`)`