fix(sdk): Add event.origin and event.environment on unhandled nat…

…ive exceptions (#1419)

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix `event.origin` and `event.environment` on unhandled exceptions ([#1419](https:/getsentry/sentry-dart/pull/1419))
+
 ### Dependencies
 
 - Bump Android SDK from v6.17.0 to v6.18.1 ([#1415](https:/getsentry/sentry-dart/pull/1415))

flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -40,6 +40,10 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
  private var framesTracker: ActivityFramesTracker? = null
  private var autoPerformanceTracingEnabled = false
 
+ private val flutterSdk = "sentry.dart.flutter"
+ private val androidSdk = "sentry.java.android.flutter"
+ private val nativeSdk = "sentry.native.android"
+
  override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
  context = flutterPluginBinding.applicationContext
  channel = MethodChannel(flutterPluginBinding.binaryMessenger, "sentry_flutter")
@@ -169,17 +173,15 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
  args.getIfNotNull<Long>("maxAttachmentSize") { options.maxAttachmentSize = it }
 
- val name = "sentry.java.android.flutter"
-
  var sdkVersion = options.sdkVersion
  if (sdkVersion == null) {
- sdkVersion = SdkVersion(name, VERSION_NAME)
+ sdkVersion = SdkVersion(androidSdk, VERSION_NAME)
  } else {
- sdkVersion.name = name
+ sdkVersion.name = androidSdk
  }
 
  options.sdkVersion = sdkVersion
- options.sentryClientName = "$name/$VERSION_NAME"
+ options.sentryClientName = "$androidSdk/$VERSION_NAME"
 
  options.setBeforeSend { event, _ ->
  setEventOriginTag(event)
@@ -464,10 +466,6 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
  result.success("")
  }
 
- private val flutterSdk = "sentry.dart.flutter"
- private val androidSdk = "sentry.java.android"
- private val nativeSdk = "sentry.native"
-
  private fun setEventOriginTag(event: SentryEvent) {
  event.sdk?.let {
  when (it.name) {

flutter/ios/Classes/SentryFlutterPluginApple.swift

@@ -12,6 +12,8 @@ import AppKit
 // swiftlint:disable:next type_body_length
 public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
 
+ private static let nativeClientName = "sentry.cocoa.flutter"
+
  // The Cocoa SDK is init. after the notification didBecomeActiveNotification is registered.
  // We need to be able to receive this notification and start a session when the SDK is fully operational.
  private var didReceiveDidBecomeActiveNotification = false
@@ -257,9 +259,8 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
  #endif
  }
 
- let name = "sentry.cocoa.flutter"
  let version = PrivateSentrySDKOnly.getSdkVersionString()
- PrivateSentrySDKOnly.setSdkName(name, andVersionString: version)
+ PrivateSentrySDKOnly.setSdkName(SentryFlutterPluginApple.nativeClientName, andVersionString: version)
 
  // note : for now, in sentry-cocoa, beforeSend is not called before captureEnvelope
  options.beforeSend = { event in
@@ -409,7 +410,7 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
  if isValidSdk(sdk: sdk) {
 
  switch sdk["name"] as? String {
- case "sentry.cocoa":
+ case SentryFlutterPluginApple.nativeClientName:
  #if os(OSX)
  let origin = "mac"
  #elseif os(watchOS)