expo-observe 0.1.3 → 0.1.5

package/android/build.gradle

@@ -46,6 +46,8 @@ android {
     defaultConfig {
         versionCode 1
         versionName packageJson.version
+
+        buildConfigField "String", "EXPO_OBSERVE_VERSION", "\"${packageJson.version}\""
     }
 }
 

package/android/src/main/java/expo/modules/observe/Event.kt

@@ -54,6 +54,7 @@ data class EASMetric(
   val name: String,
   val value: Double,
   val routeName: String? = null,
+  val updateId: String? = null,
   val customParams: JsonObject? = null
 ) {
   companion object {
@@ -65,6 +66,7 @@ data class EASMetric(
         name = metric.name,
         value = metric.value,
         routeName = metric.routeName,
+        updateId = metric.updateId,
         // TODO(@lukmccall): Consider using `org.json.JSONObject` instead of kotlinx.serialization. Also, we're not handling exceptions that might be thrown here.
         customParams = metric.params?.let { Json.decodeFromString<JsonObject>(it) }
       )

package/android/src/main/java/expo/modules/observe/OpenTelemetry.kt

@@ -1,7 +1,6 @@
 package expo.modules.observe
 
 import expo.modules.appmetrics.utils.TimeUtils.timestampToDateNS
-import java.util.UUID
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
@@ -93,6 +92,9 @@ private val metricNameMap = mapOf(
   // Legacy metrics - will be removed in a future release
   "loadTime" to "expo.app_startup.load_time",
   "launchTime" to "expo.app_startup.launch_time",
+
+  // Updates
+  "updateDownloadTime" to "expo.updates.download_time",
 )
 
 fun EASMetric.toOTMetric(): OTMetric {
@@ -102,6 +104,9 @@ fun EASMetric.toOTMetric(): OTMetric {
   routeName?.let {
     attributes.add(OTAttribute.of(key = "expo.route_name", rawValue = it))
   }
+  updateId?.let {
+    attributes.add(OTAttribute.of(key = "expo.update_id", rawValue = it))
+  }
   customParams?.let {
     attributes.add(OTAttribute.of(key = "expo.custom_params", rawValue = it.toString()))
   }
@@ -122,29 +127,56 @@ fun EASMetric.toOTMetric(): OTMetric {
 }
 
 fun Event.toOTMetadata(easClientId: String): OTMetadata {
-  return OTMetadata(
-    attributes = listOf(
-      OTAttribute.of("service.name", metadata.appIdentifier),
-      OTAttribute.of("service.version", metadata.appVersion ?: ""),
-      OTAttribute.of("os.type", "linux"),
-      OTAttribute.of("os.name", metadata.deviceOs ?: ""),
-      OTAttribute.of("os.version", metadata.deviceOsVersion ?: ""),
-      OTAttribute.of("device.model.name", metadata.deviceName ?: ""),
-      OTAttribute.of("device.model.identifier", metadata.deviceModel ?: ""),
-      OTAttribute.of("browser.language", metadata.languageTag ?: ""),
-      OTAttribute.of("telemetry.sdk.name", "expo-observe"),
-      OTAttribute.of("telemetry.sdk.version", metadata.clientVersion ?: ""),
-      OTAttribute.of("telemetry.sdk.language", "kotlin"),
-      OTAttribute.of("expo.app.name", metadata.appName ?: ""),
-      OTAttribute.of("expo.app.build_number", metadata.appBuildNumber ?: ""),
-      OTAttribute.of("expo.app.update_id", metadata.appUpdateId ?: ""),
-      OTAttribute.of("expo.sdk.version", metadata.expoSdkVersion),
-      OTAttribute.of("expo.environment", metadata.environment ?: ""),
-      OTAttribute.of("expo.react_native.version", metadata.reactNativeVersion),
-      OTAttribute.of("expo.eas_client.id", easClientId),
-      OTAttribute.of("expo.eas_build.id", metadata.appEasBuildId ?: "")
-    )
+  val attributes = mutableListOf(
+    OTAttribute.of("service.name", metadata.appIdentifier),
+    OTAttribute.of("os.type", "linux"),
+    OTAttribute.of("telemetry.sdk.name", "expo-observe"),
+    OTAttribute.of("telemetry.sdk.language", "kotlin"),
+    OTAttribute.of("expo.sdk.version", metadata.expoSdkVersion),
+    OTAttribute.of("expo.react_native.version", metadata.reactNativeVersion),
+    OTAttribute.of("expo.eas_client.id", easClientId),
   )
+
+  // Send optional attributes only if they are set.
+  // Their defaults should be defined by the backend.
+  metadata.appVersion?.let {
+    attributes.add(OTAttribute.of("service.version", it))
+  }
+  metadata.deviceOs?.let {
+    attributes.add(OTAttribute.of("os.name", it))
+  }
+  metadata.deviceOsVersion?.let {
+    attributes.add(OTAttribute.of("os.version", it))
+  }
+  metadata.deviceName?.let {
+    attributes.add(OTAttribute.of("device.model.name", it))
+  }
+  metadata.deviceModel?.let {
+    attributes.add(OTAttribute.of("device.model.identifier", it))
+  }
+  metadata.languageTag?.let {
+    attributes.add(OTAttribute.of("browser.language", it))
+  }
+  metadata.clientVersion?.let {
+    attributes.add(OTAttribute.of("telemetry.sdk.version", it))
+  }
+  metadata.appName?.let {
+    attributes.add(OTAttribute.of("expo.app.name", it))
+  }
+  metadata.appBuildNumber?.let {
+    attributes.add(OTAttribute.of("expo.app.build_number", it))
+  }
+  metadata.appUpdateId?.let {
+    attributes.add(OTAttribute.of("expo.app.update_id", it))
+  }
+  metadata.environment?.let {
+    attributes.add(OTAttribute.of("expo.environment", it))
+  }
+  metadata.appEasBuildId?.let {
+    attributes.add(OTAttribute.of("expo.eas_build.id", it))
+  }
+
+  return OTMetadata(attributes = attributes)
 }
 
 fun Event.toOTEvent(easClientId: String): OTEvent {
@@ -152,7 +184,7 @@ fun Event.toOTEvent(easClientId: String): OTEvent {
     resource = toOTMetadata(easClientId),
     scopeMetrics = listOf(
       OTScopeMetrics(
-        scope = OTScope(name = "expo-observe", version = metadata.clientVersion ?: ""),
+        scope = OTScope(name = "expo-observe", version = BuildConfig.EXPO_OBSERVE_VERSION),
         metrics = metrics.map { it.toOTMetric() }
       )
     )

package/ios/Event.swift

@@ -46,6 +46,7 @@ struct Event: Codable, Sendable {
 
     // Metadata
     let routeName: String?
+    let updateId: String?
     let customParams: AnyCodable?
   }
 
@@ -60,15 +61,15 @@ struct Event: Codable, Sendable {
         appVersion: app.appVersion,
         appBuildNumber: app.buildNumber,
         appUpdateId: app.updateId,
-        appEasBuildId: app.easBuildId == "" ? nil : app.easBuildId,
+        appEasBuildId: app.easBuildId,
 
         deviceName: device.modelName,
         deviceModel: device.modelIdentifier,
         deviceOs: device.systemName,
         deviceOsVersion: device.systemVersion,
 
-        reactNativeVersion: ObserveVersions.reactNativeVersion,
-        expoSdkVersion: ObserveVersions.expoSdkVersion,
+        reactNativeVersion: app.reactNativeVersion,
+        expoSdkVersion: app.expoSdkVersion,
         clientVersion: ObserveVersions.clientVersion,
 
         languageTag: Locale.preferredLanguages.first ?? "en-US",
@@ -84,6 +85,7 @@ struct Event: Codable, Sendable {
             sessionId: session.id,
             parentSessionId: nil,
             routeName: metric.routeName,
+            updateId: metric.updateId,
             customParams: metric.params
           )
         }

package/ios/ExpoObserve.podspec

@@ -2,10 +2,6 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
-reactNativeVersion = begin `node --print "require('react-native/package.json').version"`.strip rescue '0.0.0' end
-expoSdkVersion = begin `node --print "require('expo/package.json').version"`.strip rescue '0.0.0' end
-easBuildId = ENV.has_key?('EAS_BUILD_ID') ? ENV['EAS_BUILD_ID'] : nil
-
 Pod::Spec.new do |s|
   s.name           = 'ExpoObserve'
   s.version        = package['version']
@@ -32,10 +28,7 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
     'GCC_PREPROCESSOR_DEFINITIONS' => [
-      "REACT_NATIVE_VERSION=\"#{reactNativeVersion}\"",
-      "EXPO_SDK_VERSION=\"#{expoSdkVersion}\"",
-      "EXPO_OBSERVE_VERSION=\"#{package['version']}\"",
-      easBuildId ? "EXPO_OBSERVE_BUILD_ID=\"#{easBuildId}\"" : nil
+      "EXPO_OBSERVE_VERSION=\"#{package['version']}\""
     ].compact
   }
 

package/ios/ObserveVersions.h

@@ -4,9 +4,6 @@
 
 @interface ObserveVersions : NSObject
 
-@property (class, readonly, nonnull) NSString *reactNativeVersion;
-@property (class, readonly, nonnull) NSString *expoSdkVersion;
 @property (class, readonly, nonnull) NSString *clientVersion;
-@property (class, readonly, nullable) NSString *easBuildId;
 
 @end

package/ios/ObserveVersions.m

@@ -5,35 +5,13 @@
 #define STRINGIZE(x) #x
 #define STRINGIZE2(x) STRINGIZE(x)
 
-#define REACT_NATIVE_VERSION_STRING STRINGIZE2(REACT_NATIVE_VERSION)
-#define EXPO_SDK_VERSION_STRING STRINGIZE2(EXPO_SDK_VERSION)
 #define EXPO_OBSERVE_VERSION_STRING STRINGIZE2(EXPO_OBSERVE_VERSION)
-#define EXPO_OBSERVE_BUILD_ID_STRING STRINGIZE2(EXPO_OBSERVE_BUILD_ID)
 
 @implementation ObserveVersions
 
-+ (NSString *)reactNativeVersion
-{
-  return @REACT_NATIVE_VERSION_STRING;
-}
-
-+ (NSString *)expoSdkVersion
-{
-  return @EXPO_SDK_VERSION_STRING;
-}
-
 + (NSString *)clientVersion
 {
   return @EXPO_OBSERVE_VERSION_STRING;
 }
 
-+ (NSString *)easBuildId
-{
-#ifdef EXPO_OBSERVE_BUILD_ID
-  return @EXPO_OBSERVE_BUILD_ID_STRING;
-#else
-  return nil;
-#endif
-}
-
 @end

package/ios/OpenTelemetry.swift

@@ -1,4 +1,5 @@
 import Foundation
+import ExpoAppMetrics
 
 // MARK: -- Open Telemetry data classes
 
@@ -65,6 +66,9 @@ let metricNameMap = [
   // Legacy metrics - will be removed in a future release
   "loadTime": "expo.app_startup.load_time",
   "launchTime": "expo.app_startup.launch_time",
+
+  // Updates
+  "updateDownloadTime": "expo.updates.download_time"
 ]
 
 nonisolated(unsafe) let formatter = ISO8601DateFormatter()
@@ -85,6 +89,9 @@ extension Event.Metric {
     if let routeName {
       attributes.append(OTAttribute(key: "expo.route_name", rawValue: routeName))
     }
+    if let updateId {
+      attributes.append(OTAttribute(key: "expo.update_id", rawValue: updateId))
+    }
     if let customParamsString = try? customParams?.toJSONString() {
       attributes.append(OTAttribute(key: "expo.custom_params", rawValue: customParamsString))
     }
@@ -105,9 +112,7 @@ extension Event.Metric {
 
 extension Event {
   func toOTMetadata(_ easClientId: String) -> OTMetadata {
-    OTMetadata(attributes: [
-      OTAttribute(key: "service.name", rawValue: Bundle.main.bundleIdentifier ?? ""),
-      OTAttribute(key: "service.version", rawValue: metadata.appVersion ?? ""),
+    var attributes: [OTAttribute] = [
       OTAttribute(key: "os.type", rawValue: "darwin"),
       OTAttribute(key: "os.name", rawValue: metadata.deviceOs),
       OTAttribute(key: "os.version", rawValue: metadata.deviceOsVersion),
@@ -117,15 +122,35 @@ extension Event {
       OTAttribute(key: "telemetry.sdk.name", rawValue: "expo-observe"),
       OTAttribute(key: "telemetry.sdk.version", rawValue: ObserveVersions.clientVersion),
       OTAttribute(key: "telemetry.sdk.language", rawValue: "swift"),
-      OTAttribute(key: "expo.app.name", rawValue: metadata.appName ?? ""),
-      OTAttribute(key: "expo.app.build_number", rawValue: metadata.appBuildNumber ?? ""),
-      OTAttribute(key: "expo.app.update_id", rawValue: metadata.appUpdateId ?? ""),
       OTAttribute(key: "expo.sdk.version", rawValue: metadata.expoSdkVersion),
-      OTAttribute(key: "expo.environment", rawValue: metadata.environment ?? ""),
       OTAttribute(key: "expo.react_native.version", rawValue: metadata.reactNativeVersion),
       OTAttribute(key: "expo.eas_client.id", rawValue: easClientId),
-      OTAttribute(key: "expo.eas_build.id", rawValue: metadata.appEasBuildId ?? ""),
-    ])
+    ]
+
+    // Send optional attributes only if they are set.
+    // Their defaults should be defined by the backend.
+    if let appIdentifier = metadata.appIdentifier {
+      attributes.append(OTAttribute(key: "service.name", rawValue: appIdentifier))
+    }
+    if let appVersion = metadata.appVersion {
+      attributes.append(OTAttribute(key: "service.version", rawValue: appVersion))
+    }
+    if let appName = metadata.appName {
+      attributes.append(OTAttribute(key: "expo.app.name", rawValue: appName))
+    }
+    if let appBuildNumber = metadata.appBuildNumber {
+      attributes.append(OTAttribute(key: "expo.app.build_number", rawValue: appBuildNumber))
+    }
+    if let appUpdateId = metadata.appUpdateId {
+      attributes.append(OTAttribute(key: "expo.app.update_id", rawValue: appUpdateId))
+    }
+    if let environment = metadata.environment {
+      attributes.append(OTAttribute(key: "expo.environment", rawValue: environment))
+    }
+    if let appEasBuildId = metadata.appEasBuildId {
+      attributes.append(OTAttribute(key: "expo.eas_build.id", rawValue: appEasBuildId))
+    }
+    return OTMetadata(attributes: attributes)
   }
 
   func toOTEvent(_ easClientId: String) -> OTEvent {

package/ios/Tests/OpenTelemetryTests.swift

@@ -36,6 +36,7 @@ struct OpenTelemetryTests {
       sessionId: testSessionId,
       parentSessionId: nil,
       routeName: nil,
+      updateId: nil,
       customParams: nil
     )
   }
@@ -136,7 +137,7 @@ struct OpenTelemetryTests {
     #expect(attrs["expo.sdk.version"] == "55.0.0")
     #expect(attrs["expo.react_native.version"] == "0.83.1")
     #expect(attrs["expo.eas_client.id"] == testEasClientId)
-    #expect(attrs["expo.eas_build.id"] == "")
+    #expect(attrs["expo.eas_build.id"] == nil)
   }
 
   // MARK: - Full OTEvent
@@ -235,6 +236,7 @@ struct OpenTelemetryTests {
       sessionId: testSessionId,
       parentSessionId: nil,
       routeName: "/home",
+      updateId: nil,
       customParams: nil
     )
     let otMetric = metric.toOTMetric()
@@ -243,6 +245,36 @@ struct OpenTelemetryTests {
     #expect(attrs["expo.route_name"] == "/home")
   }
 
+  @Test
+  func `toOTMetric includes update id attribute when present`() {
+    let metric = Event.Metric(
+      category: "updates",
+      name: "updateDownloadTime",
+      value: 2.5,
+      timestamp: "2026-01-01T00:00:00Z",
+      sessionId: testSessionId,
+      parentSessionId: nil,
+      routeName: nil,
+      updateId: "abc123-def456",
+      customParams: nil
+    )
+    let otMetric = metric.toOTMetric()
+    let attrs = Dictionary(uniqueKeysWithValues: otMetric.gauge.dataPoints[0].attributes.map { ($0.key, $0.value.stringValue) })
+
+    #expect(otMetric.name == "expo.updates.download_time")
+    #expect(attrs["expo.update_id"] == "abc123-def456")
+    #expect(attrs["session.id"] == testSessionId)
+  }
+
+  @Test
+  func `toOTMetric excludes update id attribute when nil`() {
+    let metric = makeMetric(name: "bundleLoadTime", value: 1.0, timestamp: "2026-01-01T00:00:00Z")
+    let otMetric = metric.toOTMetric()
+    let keys = otMetric.gauge.dataPoints[0].attributes.map { $0.key }
+
+    #expect(keys.contains("expo.update_id") == false)
+  }
+
   @Test
   func `toOTMetric excludes route name attribute when nil`() {
     let metric = makeMetric(name: "bundleLoadTime", value: 1.0, timestamp: "2026-01-01T00:00:00Z")
@@ -262,6 +294,7 @@ struct OpenTelemetryTests {
       sessionId: testSessionId,
       parentSessionId: nil,
       routeName: nil,
+      updateId: nil,
       customParams: AnyCodable(["screen": "dashboard", "variant": "A"] as [String: Any])
     )
     let otMetric = metric.toOTMetric()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-observe",
   "title": "Expo Observe",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Expo module that dispatches collected app metrics to EAS Observe",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -33,7 +33,7 @@
   "author": "650 Industries, Inc.",
   "license": "MIT",
   "dependencies": {
-    "expo-app-metrics": "~0.1.3",
+    "expo-app-metrics": "~0.1.5",
     "expo-eas-client": "~55.0.3"
   },
   "devDependencies": {