Add support for android

Author: HazAT

android/build.gradle

@@ -21,5 +21,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'io.sentry:sentry-android:1.0.0-beta'
+    compile 'io.sentry:sentry-android:1.0.0-beta2'
 }

android/src/main/java/io/sentry/RNSentryExceptionsManagerModule.java

@@ -126,7 +126,7 @@ public static void convertAndCaptureReactNativeException(String title, ReadableN
         EventBuilder eventBuilder = new EventBuilder()
                 .withLevel(Event.Level.FATAL)
                 .withSentryInterface(new ExceptionInterface(exceptions));
-        Sentry.capture(eventBuilder);
+        Sentry.capture(RNSentryModule.buildEvent(eventBuilder));
     }
 
     private static SentryStackTraceElement[] convertToNativeStacktrace(ReadableNativeArray stack) {

android/src/main/java/io/sentry/RNSentryModule.java

@@ -1,5 +1,10 @@
 package io.sentry;
 
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
 import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -10,6 +15,7 @@
 import com.facebook.react.bridge.ReadableNativeArray;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,14 +37,18 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
     private final ReactApplicationContext reactContext;
     private final ReactApplication reactApplication;
 
+    private static AndroidEventBuilderHelper androidHelper;
+    private static PackageInfo packageInfo;
     final static Logger logger = Logger.getLogger("react-native-sentry");
-    private ReadableMap extra;
-    private ReadableMap tags;
+    private static WritableNativeMap extra;
+    private static ReadableMap tags;
 
     public RNSentryModule(ReactApplicationContext reactContext, ReactApplication reactApplication) {
         super(reactContext);
         this.reactContext = reactContext;
         this.reactApplication = reactApplication;
+        RNSentryModule.extra = new WritableNativeMap();
+        RNSentryModule.packageInfo = getPackageInfo(reactContext);
     }
 
     public ReactApplication getReactApplication() {
@@ -60,6 +70,7 @@ public Map<String, Object> getConstants() {
     @ReactMethod
     public void startWithDsnString(String dsnString) {
         SentryClient sentryClient = Sentry.init(dsnString, new AndroidSentryClientFactory(this.getReactApplicationContext()));
+        androidHelper = new AndroidEventBuilderHelper(this.getReactApplicationContext());
         sentryClient.addEventSendCallback(new EventSendCallback() {
             @Override
             public void onFailure(Event event, Exception exception) {
@@ -84,12 +95,18 @@ public void setLogLevel(int level) {
 
     @ReactMethod
     public void setExtra(ReadableMap extra) {
-        this.extra = extra;
+        RNSentryModule.extra.merge(extra);
+    }
+
+    @ReactMethod
+    public void addExtra(String key, String value) {
+        RNSentryModule.extra.putString(key, value);
+        logger.info(String.format("addExtra '%s' '%s'", key, value));
     }
 
     @ReactMethod
     public void setTags(ReadableMap tags) {
-        this.tags = tags;
+        RNSentryModule.tags = tags;
     }
 
     @ReactMethod
@@ -128,7 +145,6 @@ public void captureBreadcrumb(ReadableMap breadcrumb) {
     public void captureEvent(ReadableMap event) {
         ReadableNativeMap castEvent = (ReadableNativeMap)event;
         if (event.hasKey("message")) {
-            AndroidEventBuilderHelper helper = new AndroidEventBuilderHelper(this.getReactApplicationContext());
             EventBuilder eventBuilder = new EventBuilder()
                     .withMessage(event.getString("message"))
                     .withLogger(event.getString("logger"))
@@ -144,34 +160,19 @@ public void captureEvent(ReadableMap event) {
                 eventBuilder.withSentryInterface(userInterface);
             }
 
-            helper.helpBuildingEvent(eventBuilder);
-
-            if (this.extra != null) {
-                for (Map.Entry<String, Object> entry : ((ReadableNativeMap)this.extra).toHashMap().entrySet()) {
-                    eventBuilder.withExtra(entry.getKey(), entry.getValue());
-                }
-            }
-
             if (castEvent.hasKey("extra")) {
                 for (Map.Entry<String, Object> entry : castEvent.getMap("extra").toHashMap().entrySet()) {
                     eventBuilder.withExtra(entry.getKey(), entry.getValue());
                 }
             }
 
-            if (this.tags != null) {
-                for (Map.Entry<String, Object> entry : ((ReadableNativeMap)this.tags).toHashMap().entrySet()) {
-                    eventBuilder.withExtra(entry.getKey(), entry.getValue());
-                }
-            }
-
             if (castEvent.hasKey("tags")) {
                 for (Map.Entry<String, Object> entry : castEvent.getMap("tags").toHashMap().entrySet()) {
                     eventBuilder.withTag(entry.getKey(), entry.getValue().toString());
                 }
             }
 
-            Event builtEvent = eventBuilder.build();
-            Sentry.capture(builtEvent);
+            Sentry.capture(buildEvent(eventBuilder));
         } else {
             RNSentryExceptionsManagerModule.lastReceivedException = event;
             if (this.getReactApplication().getReactNativeHost().getUseDeveloperSupport() == true) {
@@ -186,8 +187,8 @@ public void captureEvent(ReadableMap event) {
     @ReactMethod
     public void clearContext() {
         Sentry.clearContext();
-        this.extra = null;
-        this.tags = null;
+        RNSentryModule.extra = new WritableNativeMap();
+        RNSentryModule.tags = null;
     }
 
     @ReactMethod
@@ -197,6 +198,61 @@ public void activateStacktraceMerging(Promise promise) {
         promise.reject("Sentry", "Stacktrace merging not yet implemented");
     }
 
+    public static Event buildEvent(EventBuilder eventBuilder) {
+        androidHelper.helpBuildingEvent(eventBuilder);
+
+        setRelease(eventBuilder);
+        stripInternalSentry(eventBuilder);
+
+        if (extra != null) {
+            for (Map.Entry<String, Object> entry : extra.toHashMap().entrySet()) {
+                if (entry.getValue() != null) {
+                    eventBuilder.withExtra(entry.getKey(), entry.getValue());
+                    logger.info(String.format("addExtra '%s' '%s'", entry.getKey(), entry.getValue()));
+                }
+            }
+        }
+        if (tags != null) {
+            for (Map.Entry<String, Object> entry : ((ReadableNativeMap)tags).toHashMap().entrySet()) {
+                eventBuilder.withExtra(entry.getKey(), entry.getValue());
+            }
+        }
+
+        return eventBuilder.build();
+    }
+
+    private static void stripInternalSentry(EventBuilder eventBuilder) {
+        if (extra != null) {
+            for (Map.Entry<String, Object> entry : extra.toHashMap().entrySet()) {
+                if (entry.getKey().startsWith("__sentry")) {
+                    extra.putNull(entry.getKey());
+                }
+            }
+        }
+    }
+
+    private static void setRelease(EventBuilder eventBuilder) {
+        if (extra.hasKey("__sentry_version")) {
+            eventBuilder.withRelease(packageInfo.packageName + "-" + extra.getString("__sentry_version"));
+            eventBuilder.withDist(null);
+        }
+        if (extra.hasKey("__sentry_release")) {
+            eventBuilder.withRelease(extra.getString("__sentry_release"));
+        }
+        if (extra.hasKey("__sentry_dist")) {
+            eventBuilder.withDist(extra.getString("__sentry_dist"));
+        }
+    }
+
+    private static PackageInfo getPackageInfo(Context ctx) {
+        try {
+            return ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            logger.info("Error getting package info.");
+            return null;
+        }
+    }
+
     private Breadcrumb.Level breadcrumbLevel(String level) {
         switch (level) {
             case "critical":

docs/codepush.rst

@@ -15,3 +15,4 @@ If you want to use sentry together with codepush you have to send us the codepus
 
 Put this somewhere in you code where you already use codepush. This makes sure that we can
 associate crashes with the right sourcemaps.
+``Sentry.setVersion`` sets the the release to ``bundle_id-version`` this works for iOS aswell as Android.

examples/ReactNativeExample/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "react": "^16.0.0-alpha.6",
-    "react-native": "^0.44.1",
+    "react-native": "^0.44.2",
     "react-native-sentry": "file:../../"
   }
 }