fix: update to latest SDK

Author: farfromrefug

plugin/package.json

@@ -29,14 +29,14 @@
     },
     "homepage": "https://github.com/Akylas/nativescript-akylas-sentry#readme",
     "dependencies": {
-        "@sentry/browser": "^5.15.4",
-        "@sentry/core": "^5.15.4",
-        "@sentry/hub": "^5.15.4",
-        "@sentry/integrations": "^5.15.4",
-        "@sentry/minimal": "^5.15.4",
-        "@sentry/types": "^5.15.4",
-        "@sentry/utils": "^5.15.4",
-        "@sentry/wizard": "^1.1.1",
-        "stacktrace-parser": "0.1.9"
+        "@sentry/browser": "^5.19.2",
+        "@sentry/core": "^5.19.2",
+        "@sentry/hub": "^5.19.2",
+        "@sentry/integrations": "^5.19.2",
+        "@sentry/minimal": "^5.19.2",
+        "@sentry/types": "^5.19.2",
+        "@sentry/utils": "^5.19.2",
+        "@sentry/wizard": "^1.1.4",
+        "stacktrace-parser": "0.1.10"
     }
 }

plugin/platforms/android/buildscript.gradle

@@ -0,0 +1,8 @@
+
+repositories {
+    jcenter()
+    google()
+}
+dependencies {
+    classpath 'io.sentry:sentry-android-gradle-plugin:1.7.28'
+}

plugin/platforms/android/include.gradle

@@ -1,4 +1,12 @@
-
+// Add compatibility options to be comptible with Java 1.8
+apply plugin: 'io.sentry.android.gradle'
+android {
+    compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
 dependencies {
-    api 'io.sentry:sentry-android:2.1.0-alpha.1'
+    def sentryVersion =  project.hasProperty("sentryVersion") ? project.sentryVersion : "2.2.1"
+    implementation "io.sentry:sentry-android:$sentryVersion"
 }

plugin/platforms/ios/Podfile

@@ -1 +1 @@
-pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '4.5.0'
+pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '5.1.9'

src/backend.ts

@@ -1,4 +1,3 @@
-
 import { BrowserOptions, Transports } from '@sentry/browser';
 import { BrowserBackend } from '@sentry/browser/dist/backend';
 import { BaseBackend, NoopTransport } from '@sentry/core';
@@ -23,6 +22,8 @@ export interface NativescriptOptions extends BrowserOptions {
      */
     enableNative?: boolean;
 
+    enableAutoSessionTracking?: boolean;
+
     /**
      * Enables native crashHandling. This only works if `enableNative` is `true`.
      * Defaults to `true`.
@@ -77,7 +78,7 @@ export class NativescriptBackend extends BaseBackend<BrowserOptions> {
 
         const transportOptions = {
             ...this._options.transportOptions,
-            dsn: this._options.dsn
+            dsn: this._options.dsn,
         };
 
         if (this._options.transport) {

src/index.ts

@@ -20,7 +20,6 @@ export {
     setTag,
     setTags,
     setUser,
-    // Span,
     withScope
 } from '@sentry/core';
 

src/nssentry.android.ts

@@ -14,7 +14,7 @@ export namespace NSSentry {
         return {
             id: packageInfo.packageName,
             version: packageInfo.versionName,
-            build: packageInfo.versionCode
+            build: packageInfo.versionCode,
         };
     }
     function eventLevel(event) {
@@ -37,7 +37,7 @@ export namespace NSSentry {
             return null;
         }
         const map = new java.util.HashMap<string, string>();
-        Object.keys(obj).forEach(k => {
+        Object.keys(obj).forEach((k) => {
             map.put(k, obj[k]);
         });
         return map;
@@ -150,7 +150,7 @@ export namespace NSSentry {
         nEvent.setExceptions(exceptions);
     }
     export function sendEvent(event: Event): Promise<Response> {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             const nEvent = new io.sentry.core.SentryEvent();
             if (event.event_id) {
                 nEvent.setEventId(new io.sentry.core.protocol.SentryId(event.event_id));
@@ -181,7 +181,7 @@ export namespace NSSentry {
 
                     try {
                         if (breadcrumb.data) {
-                            Object.keys(breadcrumb.data).forEach(k => {
+                            Object.keys(breadcrumb.data).forEach((k) => {
                                 const value = breadcrumb.data[k];
                                 // in case a `status_code` entry got accidentally stringified as a float
                                 if (k === 'status_code') {
@@ -222,7 +222,7 @@ export namespace NSSentry {
             }
 
             if (event.extra) {
-                Object.keys(event.extra).forEach(k => {
+                Object.keys(event.extra).forEach((k) => {
                     const value = event.extra[k];
                     nEvent.setExtra(k, typeof value === 'string' ? value : JSON.stringify(value));
                 });
@@ -238,7 +238,7 @@ export namespace NSSentry {
             }
 
             if (event.tags) {
-                Object.keys(event.tags).forEach(k => {
+                Object.keys(event.tags).forEach((k) => {
                     const value = event.tags[k];
                     nEvent.setTag(k, value || 'INVALID_TAG');
                 });
@@ -278,7 +278,7 @@ export namespace NSSentry {
                 nEvent.setLevel(eventLevel(event.level));
             }
             if (event.contexts) {
-                Object.keys(event.contexts).forEach(k => {
+                Object.keys(event.contexts).forEach((k) => {
                     // const value = event.contexts[k];
                     // const context = new io.sentry.core.protocol.Contexts();
                     // nEvent.setTag(k, value || 'INVALID_TAG');
@@ -300,7 +300,7 @@ export namespace NSSentry {
             const id = io.sentry.core.Sentry.captureEvent(nEvent);
             // io.sentry.core.Sentry.flush(0);
             resolve({ status: Status.Success, id });
-        }).catch(err => {
+        }).catch((err) => {
             console.error('error sending sentry event', err, err.stack);
             return Promise.reject(err);
         }) as any;
@@ -324,18 +324,15 @@ export namespace NSSentry {
                     appAndroid.context,
                     new io.sentry.core.Sentry.OptionsConfiguration({
                         configure(config) {
+                            config.setLogger(new io.sentry.core.SystemOutLogger());
+
+                            // config.setDiagnosticLevel(io.sentry.core.SentryLevel.DEBUG);
+                            // io.sentry.core.Sentry.setLevel(io.sentry.core.SentryLevel.DEBUG);
                             config.setDsn(dsnString);
                             config.setEnvironment('javascript');
                             if (!!options.environment) {
                                 config.setEnvironment(options.environment);
                             }
-                            config.setLogger(
-                                new io.sentry.core.ILogger({
-                                    log(param0: io.sentry.core.SentryLevel, param1: any, param2: any, param3?: native.Array<any>) {
-                                        console.log('sentry', param0, param1, param2, param3);
-                                    }
-                                })
-                            );
                             if (!!options.debug) {
                                 config.setDebug(options.debug);
                             }
@@ -345,26 +342,35 @@ export namespace NSSentry {
                             if (!!options.dist) {
                                 config.setDist(options.dist);
                             }
+                            if (options.enableAutoSessionTracking !== undefined) {
+                                config.setEnableSessionTracking(options.enableAutoSessionTracking);
+                            }
 
                             config.setEnableNdk(true);
-
                             const integrations = config.getIntegrations();
                             const size = integrations.size();
                             if (options.enableNativeCrashHandling === false) {
-                                let indexToRemove = -1;
-                                for (let index = 0; index < size; index++) {
+                                for (let index = size - 1; index >= 0; index--) {
                                     const inte = integrations.get(index);
-                                    if (inte instanceof io.sentry.core.UncaughtExceptionHandlerIntegration) {
-                                        indexToRemove = index;
+                                    if (
+                                        inte instanceof io.sentry.core.UncaughtExceptionHandlerIntegration ||
+                                        inte instanceof io.sentry.android.core.AnrIntegration ||
+                                        inte instanceof io.sentry.android.core.NdkIntegration
+                                    ) {
+                                        integrations.remove(index);
                                     }
                                 }
-                                if (indexToRemove > -1) {
-                                    integrations.remove(indexToRemove);
-                                }
                             }
                             config.setBeforeSend(
                                 new io.sentry.core.SentryOptions.BeforeSendCallback({
                                     execute(event, hint) {
+                                        if (options.beforeSend) {
+                                            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+                                            options.beforeSend(event as any, hint);
+                                        }
+                                        const map = new java.util.HashMap();
+                                        map.put('X-Forwarded-Protocol', 'https');
+                                        event.getRequest().setHeaders(map);
                                         // we use this callback to actually try and get the JS stack when a native error is catched
                                         try {
                                             const ex: io.sentry.core.protocol.SentryException = event.getExceptions().get(0);
@@ -380,18 +386,18 @@ export namespace NSSentry {
                                                             const stack = parseErrorStack({ stack: jsStackTrace } as any);
 
                                                             const convertedFrames = convertNativescriptFramesToSentryFrames(stack as any);
-                                                            convertedFrames.forEach(frame => rewriteFrameIntegration._iteratee(frame));
+                                                            convertedFrames.forEach((frame) => rewriteFrameIntegration._iteratee(frame));
                                                             addExceptionInterface(event, 'Error', throwable.getMessage(), convertedFrames.reverse());
                                                         }
                                                     }
                                                 }
                                             }
                                         } catch (e) {}
                                         return event;
-                                    }
+                                    },
                                 })
                             );
-                        }
+                        },
                     })
                 );
                 initialized = true;
@@ -426,14 +432,11 @@ export namespace NSSentry {
         throw new java.lang.RuntimeException('TEST - Sentry Client Crash');
     }
     export function deviceContexts(): Promise<any> {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
             const nEvent = new io.sentry.core.SentryEvent();
 
             const params = {};
-            const it = nEvent
-                .getContexts()
-                .entrySet()
-                .iterator();
+            const it = nEvent.getContexts().entrySet().iterator();
             let value, pair, key;
             while (it.hasNext()) {
                 pair = it.next();