expo-observe 0.1.2 → 0.1.3

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

@@ -96,6 +96,16 @@ private val metricNameMap = mapOf(
 )
 
 fun EASMetric.toOTMetric(): OTMetric {
+  val attributes = mutableListOf(
+    OTAttribute.of(key = "session.id", rawValue = sessionId)
+  )
+  routeName?.let {
+    attributes.add(OTAttribute.of(key = "expo.route_name", rawValue = it))
+  }
+  customParams?.let {
+    attributes.add(OTAttribute.of(key = "expo.custom_params", rawValue = it.toString()))
+  }
+
   return OTMetric(
     unit = "s",
     name = metricNameMap[name] ?: "expo.app_startup.$name",
@@ -104,12 +114,7 @@ fun EASMetric.toOTMetric(): OTMetric {
         OTDataPoint(
           timeUnixNano = timestampToDateNS(timestamp),
           asDouble = value,
-          attributes = listOf(
-            OTAttribute.of(
-              key = "session.id",
-              rawValue = sessionId
-            )
-          )
+          attributes = attributes
         )
       )
     )
@@ -136,7 +141,8 @@ fun Event.toOTMetadata(easClientId: String): OTMetadata {
       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_client.id", easClientId),
+      OTAttribute.of("expo.eas_build.id", metadata.appEasBuildId ?: "")
     )
   )
 }

package/ios/Encodable+JSON.swift

@@ -0,0 +1,16 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import Foundation
+
+extension Encodable {
+  func toJSONData(_ formatting: JSONEncoder.OutputFormatting = []) throws -> Data {
+    let encoder = JSONEncoder()
+    encoder.outputFormatting = formatting
+    return try encoder.encode(self)
+  }
+
+  func toJSONString(_ formatting: JSONEncoder.OutputFormatting = []) throws -> String {
+    let data = try toJSONData(formatting)
+    return String(data: data, encoding: .utf8) ?? ""
+  }
+}

package/ios/Observability.swift

@@ -56,7 +56,7 @@ internal struct ObservabilityManager {
         return
       }
 
-      let body: any RequestBodyProtocol
+      let body: any Encodable
       if useOpenTelemetry {
         body = OTRequestBody(resourceMetrics: events.map { $0.toOTEvent(easClientId)})
       } else {
@@ -65,11 +65,11 @@ internal struct ObservabilityManager {
       var request = URLRequest(url: endpointUrl)
       request.httpMethod = "POST"
       request.allHTTPHeaderFields = ["Content-Type": "application/json"]
-      request.httpBody = try body.toData([])
+      request.httpBody = try body.toJSONData([])
 
       observeLogger.debug("[EAS Observe] Sending the request to \(endpointUrl) with body:")
       // Use `print` so the JSON can be copied without including the log level emojis.
-      print(try body.toString(.prettyPrinted))
+      print(try body.toJSONString(.prettyPrinted))
 
       let (responseData, urlResponse) = try await URLSession.shared.data(for: request)
 

package/ios/OpenTelemetry.swift

@@ -79,19 +79,24 @@ extension Event.Metric {
   }
 
   func toOTMetric() -> OTMetric {
-    OTMetric(
+    var attributes: [OTAttribute] = [
+      OTAttribute(key: "session.id", rawValue: sessionId)
+    ]
+    if let routeName {
+      attributes.append(OTAttribute(key: "expo.route_name", rawValue: routeName))
+    }
+    if let customParamsString = try? customParams?.toJSONString() {
+      attributes.append(OTAttribute(key: "expo.custom_params", rawValue: customParamsString))
+    }
+
+    return OTMetric(
       unit: "s",
       name: metricNameMap[self.name] ?? "expo.app_startup.\(self.name)",
       gauge: OTGauge(dataPoints: [
         OTDataPoint(
           timeUnixNano: nsFromISODateString(),
           asDouble: self.value,
-          attributes: [
-            OTAttribute(
-              key: "session.id",
-              rawValue: self.sessionId
-            )
-          ]
+          attributes: attributes
         )
       ])
     )
@@ -119,6 +124,7 @@ extension Event {
       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 ?? ""),
     ])
   }
 
@@ -137,17 +143,6 @@ extension Event {
 
 // MARK: -- Request body for Open Telemetry events
 
-internal struct OTRequestBody: Codable, Sendable, RequestBodyProtocol {
+internal struct OTRequestBody: Codable, Sendable {
   let resourceMetrics: [OTEvent]
-
-  func toData(_ formatting: JSONEncoder.OutputFormatting = []) throws -> Data {
-    let encoder = JSONEncoder()
-    encoder.outputFormatting = formatting
-    return try encoder.encode(self)
-  }
-
-  func toString(_ formatting: JSONEncoder.OutputFormatting = []) throws -> String {
-    let data = try toData(formatting)
-    return String(data: data, encoding: .utf8) ?? ""
-  }
 }

package/ios/RequestBody.swift

@@ -1,25 +1,9 @@
 // Copyright 2025-present 650 Industries. All rights reserved.
 
-internal protocol RequestBodyProtocol {
-  func toData(_ formatting: JSONEncoder.OutputFormatting) throws -> Data
-  func toString(_ formatting: JSONEncoder.OutputFormatting) throws -> String
-}
-
 /**
  Body of the request containing events with metrics for the EAS server.
  */
-internal struct RequestBody: Codable, Sendable, RequestBodyProtocol {
+internal struct RequestBody: Codable, Sendable {
   let easClientId: String
   let events: [Event]
-
-  func toData(_ formatting: JSONEncoder.OutputFormatting = []) throws -> Data {
-    let encoder = JSONEncoder()
-    encoder.outputFormatting = formatting
-    return try encoder.encode(self)
-  }
-
-  func toString(_ formatting: JSONEncoder.OutputFormatting = []) throws -> String {
-    let data = try toData(formatting)
-    return String(data: data, encoding: .utf8) ?? ""
-  }
 }

package/ios/Tests/OpenTelemetryTests.swift

@@ -1,6 +1,7 @@
 import Testing
 
 @testable import ExpoObserve
+@testable import ExpoAppMetrics
 
 @Suite("OpenTelemetry conversion")
 struct OpenTelemetryTests {
@@ -135,6 +136,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"] == "")
   }
 
   // MARK: - Full OTEvent
@@ -181,11 +183,11 @@ struct OpenTelemetryTests {
     let otEvent = event.toOTEvent(testEasClientId)
     let requestBody = OTRequestBody(resourceMetrics: [otEvent])
 
-    let jsonString = try requestBody.toString()
+    let jsonString = try requestBody.toJSONString()
     #expect(!jsonString.isEmpty)
 
     // Verify it can be round-tripped
-    let data = try requestBody.toData()
+    let data = try requestBody.toJSONData()
     let decoded = try JSONDecoder().decode(OTRequestBody.self, from: data)
     #expect(decoded.resourceMetrics.count == 1)
     #expect(decoded.resourceMetrics[0].scopeMetrics[0].metrics.count == 4)
@@ -197,7 +199,7 @@ struct OpenTelemetryTests {
     let otEvent = event.toOTEvent(testEasClientId)
     let requestBody = OTRequestBody(resourceMetrics: [otEvent])
 
-    let data = try requestBody.toData()
+    let data = try requestBody.toJSONData()
     let json = try JSONSerialization.jsonObject(with: data) as! [String: Any]
 
     // Top level should have "resourceMetrics" array
@@ -221,6 +223,67 @@ struct OpenTelemetryTests {
     #expect(attrValue["stringValue"] != nil)
   }
 
+  // MARK: - Metric attributes
+
+  @Test
+  func `toOTMetric includes route name attribute when present`() {
+    let metric = Event.Metric(
+      category: "appStartup",
+      name: "bundleLoadTime",
+      value: 1.0,
+      timestamp: "2026-01-01T00:00:00Z",
+      sessionId: testSessionId,
+      parentSessionId: nil,
+      routeName: "/home",
+      customParams: nil
+    )
+    let otMetric = metric.toOTMetric()
+    let attrs = Dictionary(uniqueKeysWithValues: otMetric.gauge.dataPoints[0].attributes.map { ($0.key, $0.value.stringValue) })
+
+    #expect(attrs["expo.route_name"] == "/home")
+  }
+
+  @Test
+  func `toOTMetric excludes route name 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.route_name") == false)
+  }
+
+  @Test
+  func `toOTMetric includes custom params as JSON string`() {
+    let metric = Event.Metric(
+      category: "appStartup",
+      name: "bundleLoadTime",
+      value: 1.0,
+      timestamp: "2026-01-01T00:00:00Z",
+      sessionId: testSessionId,
+      parentSessionId: nil,
+      routeName: nil,
+      customParams: AnyCodable(["screen": "dashboard", "variant": "A"] as [String: Any])
+    )
+    let otMetric = metric.toOTMetric()
+    let attrs = Dictionary(uniqueKeysWithValues: otMetric.gauge.dataPoints[0].attributes.map { ($0.key, $0.value.stringValue) })
+
+    let jsonString = attrs["expo.custom_params"]!
+    let parsed = try! JSONSerialization.jsonObject(with: jsonString.data(using: .utf8)!) as! [String: String]
+    #expect(parsed["screen"] == "dashboard")
+    #expect(parsed["variant"] == "A")
+  }
+
+  @Test
+  func `toOTMetric excludes custom params 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.custom_params") == false)
+  }
+
+  // MARK: - Multiple events
+
   @Test
   func `multiple events produce multiple resourceMetrics entries`() {
     let event1 = Event(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-observe",
   "title": "Expo Observe",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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.2",
+    "expo-app-metrics": "~0.1.3",
     "expo-eas-client": "~55.0.3"
   },
   "devDependencies": {