feat: Set event.origin and event.environment tags

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - build(ios): Bump `sentry-cocoa` to 6.2.1 (#205)
 - feat(android): Add Android native bridge, full scope sync, and cached events (#202)
+- feat: Set `event.origin` and `event.environment` tags (#204)
 
 ## v1.0.0-rc.0
 

src/android/io/sentry/SentryCordova.java

@@ -31,6 +31,7 @@
 import io.sentry.android.core.AnrIntegration;
 import io.sentry.android.core.NdkIntegration;
 import io.sentry.android.core.SentryAndroid;
+import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.User;
 
 public class SentryCordova extends CordovaPlugin {
@@ -196,6 +197,12 @@ private void startWithOptions(final JSONObject jsonOptions, final CallbackContex
             options.setEnableNdk(false);
           }
 
+          options.setBeforeSend((event, hint) -> {
+            setEventOriginTag(event);
+
+            return event;
+          });
+
           sentryOptions = options;
         } catch (JSONException e) {
           logger.severe("Error parsing options JSON sent over native bridge.");
@@ -380,5 +387,27 @@ private SentryLevel getSentryLevelFromString(String level) {
     }
   }
 
+  private void setEventOriginTag(SentryEvent event) {
+    SdkVersion sdk = event.getSdk();
+    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");
+        break;
+      case "sentry.java.android":
+        setEventEnvironmentTag(event, "android", "java");
+        break;
+      default:
+        break;
+      }
+    }
+  }
+
+  private void setEventEnvironmentTag(SentryEvent event, String origin, String environment) {
+    event.setTag("event.origin", origin);
+    event.setTag("event.environment", environment);
+  }
+
   private void crash() { Sentry.captureException(new RuntimeException("TEST - Sentry Silent Client Crash")); }
 }

src/ios/SentryCordova.m

@@ -2,9 +2,6 @@
 #import <Cordova/CDVAvailability.h>
 @import Sentry;
 
-NSString *const SentryCordovaVersionString = @"1.0.0-rc.0";
-NSString *const SentryCordovaSdkName = @"sentry-cordova";
-
 @implementation SentryCordova
 
 - (void)pluginInitialize {
@@ -14,9 +11,10 @@ - (void)pluginInitialize {
 - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
   NSDictionary *options = [command.arguments objectAtIndex:0];
 
-  SentryBeforeSendEventCallback beforeSend =
-      ^SentryEvent *(SentryEvent *event) {
+  SentryBeforeSendEventCallback beforeSend = ^SentryEvent *(SentryEvent *event) {
     [self setReleaseVersionDist:event];
+    [self setEventOriginTag:event];
+
     return event;
   };
   [options setValue:beforeSend forKey:@"beforeSend"];
@@ -39,6 +37,27 @@ - (void)startWithOptions:(CDVInvokedUrlCommand *)command {
   [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }
 
+- (void)setEventOriginTag:(SentryEvent *)event {
+  if (event.sdk != nil) {
+    NSString *sdkName = event.sdk[@"name"];
+
+    // 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"];
+    }
+  }
+}
+
+- (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:environment forKey:@"event.environment"];
+  event.tags = newTags;
+}
+
 - (void)setReleaseVersionDist:(SentryEvent *)event {
   if (event.extra[@"__sentry_version"]) {
     NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
@@ -54,11 +73,6 @@ - (void)setReleaseVersionDist:(SentryEvent *)event {
     event.dist =
         [NSString stringWithFormat:@"%@", event.extra[@"__sentry_dist"]];
   }
-  event.sdk = @{
-    @"name" : SentryCordovaSdkName,
-    @"version" : SentryCordovaVersionString,
-    @"integrations" : @[ @"sentry-cocoa" ]
-  };
 }
 
 - (void)captureEnvelope:(CDVInvokedUrlCommand *)command {

src/js/client.ts

@@ -37,6 +37,12 @@ export class CordovaClient extends BaseClient<CordovaBackend, CordovaOptions> {
       version: SDK_VERSION,
     };
 
+    if (!event.tags) {
+      event.tags = {};
+    }
+    event.tags['event.origin'] = 'cordova';
+    event.tags['event.environment'] = 'javascript';
+
     return super._prepareEvent(event, scope, hint);
   }
 }