Mention Cordova SDK name on Native errors (#378)

* finish implementation of iOS

* add changelog

* Update src/ios/SentryCordova.m

* Added sdk names for Android/iOS. iOS still in WIP

Author: lucas-zimerman

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 ### Fixes
 
+- Set custom SDK names on events to indicate where it was captured ([#378](https://github.com/getsentry/sentry-cordova/pull/378))
 - Use a minified and optimized bundle to reduce the SDK size by three times, improving performance and reducing load times ([#371](https://github.com/getsentry/sentry-cordova/pull/371))
 
 ### Dependencies

src/android/io/sentry/SentryCordova.java

@@ -37,6 +37,9 @@
 public class SentryCordova extends CordovaPlugin {
   private static final String TAG = "Sentry";
 
+    private static final String NATIVE_SDK_NAME = "sentry.native.android.cordova";
+    private static final String ANDROID_SDK_NAME = "sentry.java.android.cordova";
+
   final static Logger logger = Logger.getLogger("sentry-cordova");
 
   private SentryOptions sentryOptions;
@@ -165,6 +168,13 @@ private void startWithOptions(final JSONObject jsonOptions, final CallbackContex
           logger.info(String.format("Starting with DSN: '%s'", dsn));
           options.setDsn(dsn);
 
+          SdkVersion sdkVersion = options.getSdkVersion();
+          if (sdkVersion == null) {
+              sdkVersion = new SdkVersion(ANDROID_SDK_NAME, BuildConfig.VERSION_NAME);
+          } else {
+              sdkVersion.setName(ANDROID_SDK_NAME);
+          }
+
           boolean debug = jsonOptions.optBoolean("debug", false);
           options.setDebug(debug);
 
@@ -211,6 +221,8 @@ private void startWithOptions(final JSONObject jsonOptions, final CallbackContex
             return event;
           });
 
+          options.setNativeSdkName(NATIVE_SDK_NAME);
+
           sentryOptions = options;
         } catch (JSONException e) {
           logger.severe("Error parsing options JSON sent over native bridge.");
@@ -422,20 +434,20 @@ private void setEventOriginTag(SentryEvent event) {
     if (sdk != null) {
       switch (sdk.getName()) {
       // If the event is from cordova js, it gets set there and we do not handle it here.
-      case "sentry.native":
-        setEventEnvironmentTag(event, "android", "native");
+      case NATIVE_SDK_NAME:
+        setEventEnvironmentTag(event, "native");
         break;
-      case "sentry.java.android":
-        setEventEnvironmentTag(event, "android", "java");
+      case ANDROID_SDK_NAME:
+        setEventEnvironmentTag(event, "java");
         break;
       default:
         break;
       }
     }
   }
 
-  private void setEventEnvironmentTag(SentryEvent event, String origin, String environment) {
-    event.setTag("event.origin", origin);
+  private void setEventEnvironmentTag(SentryEvent event, String environment) {
+    event.setTag("event.origin", "android");
     event.setTag("event.environment", environment);
   }
 

src/ios/SentryCordova.m

@@ -9,13 +9,18 @@ @implementation SentryCordova {
   bool sentHybridSdkDidBecomeActive;
 }
 
+NSString * const nativeSdkName = @"sentry.cocoa.cordova";
+
 - (void)pluginInitialize {
   NSLog(@"Sentry Cordova Plugin initialized");
 }
 
 - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
   NSDictionary *options = [command.arguments objectAtIndex:0];
 
+  NSString *sdkVersion = [PrivateSentrySDKOnly getSdkVersionString];
+  [PrivateSentrySDKOnly setSdkName:nativeSdkName andVersionString:sdkVersion];
+
   SentryBeforeSendEventCallback beforeSend =
       ^SentryEvent *(SentryEvent *event) {
     [self setEventOriginTag:event];
@@ -119,20 +124,19 @@ - (void)setEventOriginTag:(SentryEvent *)event {
 
     // If the event is from cordova js, it gets set there and we do not handle
     // it here.
-    if ([sdkName isEqualToString:@"sentry.cocoa"]) {
-      [self setEventEnvironmentTag:event origin:@"ios" environment:@"native"];
+    if ([sdkName isEqualToString:nativeSdkName]) {
+      [self setEventEnvironmentTag:event environment:@"native"];
     }
   }
 }
 
 - (void)setEventEnvironmentTag:(SentryEvent *)event
-                        origin:(NSString *)origin
                    environment:(NSString *)environment {
   NSMutableDictionary *newTags = [NSMutableDictionary new];
   if (nil != event.tags) {
     [newTags addEntriesFromDictionary:event.tags];
   }
-  [newTags setValue:origin forKey:@"event.origin"];
+  [newTags setValue:@"ios" forKey:@"event.origin"];
   [newTags setValue:environment forKey:@"event.environment"];
   event.tags = newTags;
 }