expo-observe 0.1.3 → 0.1.4

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

@@ -122,29 +122,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 {

package/ios/OpenTelemetry.swift

@@ -105,9 +105,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 +115,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

@@ -136,7 +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"] == "")
+    #expect(attrs["expo.eas_build.id"] == nil)
   }
 
   // MARK: - Full OTEvent

package/package.json

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