iOS/Gekidou/Package.resolved

Update config.yml

Update Fastfile

Update Fastfile

Update Fastfile

trying out gradle build scans

Revert "trying out gradle build scans"

This reverts commit 4a0f412025.

maxWorker 2

Update Fastfile

Update Fastfile

removes gradle cache step

revert changes

Update Fastfile

test

Update Fastfile

Update config.yml

Update Fastfile

Update @sentry+react-native+4.6.0.patch

Create @sentry+react-native+4.6.0.patch

update patch package

.circleci/config.yml

@@ -562,14 +562,18 @@ workflows:
                 - /^build-ios-beta-\d+$/
 
       - build-android-pr:
-          context: mattermost-mobile-android-pr
+          context:
+            - mattermost-mobile-android-pr
+            - mattermost-mobile-sentry
           requires:
             - test
           filters:
             branches:
               only: /^(build|android)-pr-.*/
       - build-ios-pr:
-          context: mattermost-mobile-ios-pr
+          context:
+            - mattermost-mobile-ios-pr
+            - mattermost-mobile-sentry
           requires:
             - test
           filters:
@@ -605,7 +609,7 @@ workflows:
           #       - /^build-ios-\d+$/
           #       - /^build-ios-beta-\d+$/
           #       - /^build-ios-sim-\d+$/
-                
+
       # - github-release:
       #     context: mattermost-mobile-unsigned
       #     requires:

android/app/build.gradle

@@ -85,15 +85,6 @@ project.ext.react = [
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
-if (System.getenv("SENTRY_ENABLED") == "true") {
-    project.ext.sentryCli = [
-        logLevel: "error",
-        flavorAware: false
-    ]
-
-    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
-}
-
 /**
  * Set this to true to create two separate APKs instead of one:
  *   - An APK that only works on ARM devices
@@ -145,7 +136,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 430
+        versionCode 431
         versionName "2.0.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -378,6 +369,15 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
+if (System.getenv("SENTRY_ENABLED") == "true") {
+    project.ext.sentryCli = [
+        logLevel: "error",
+        flavorAware: false
+    ]
+
+    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+}
+
 apply plugin: 'com.google.gms.google-services'
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 

app/screens/home/channel_list/channel_list.tsx

@@ -3,6 +3,7 @@
 
 import {useManagedConfig} from '@mattermost/react-native-emm';
 import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
+import * as Sentry from '@sentry/react-native';
 import React, {useCallback, useEffect} from 'react';
 import {useIntl} from 'react-intl';
 import {BackHandler, DeviceEventEmitter, StyleSheet, ToastAndroid} from 'react-native';
@@ -13,9 +14,13 @@ import FreezeScreen from '@components/freeze_screen';
 import TeamSidebar from '@components/team_sidebar';
 import {Navigation as NavigationConstants, Screens} from '@constants';
 import {useTheme} from '@context/theme';
+import DatabaseManager from '@database/manager';
+import {subscribeActiveServers} from '@database/subscription/servers';
 import {useIsTablet} from '@hooks/device';
 import {resetToTeams} from '@screens/navigation';
 import NavigationStore from '@store/navigation_store';
+import ServersModel from '@typings/database/models/app/servers';
+import {getBuildTags, getExtraContext, getUserContext} from '@utils/sentry';
 
 import AdditionalTabletView from './additional_tablet_view';
 import CategoriesList from './categories_list';
@@ -111,6 +116,32 @@ const ChannelListScreen = (props: ChannelProps) => {
         return () => back.remove();
     }, [handleBackPress]);
 
+    useEffect(() => {
+        const activeServerUrlObserver = async (servers: ServersModel[]) => {
+            const server = servers?.length ? servers.reduce((a, b) => (b.lastActiveAt > a.lastActiveAt ? b : a)) : undefined;
+
+            if (server) {
+                const database = DatabaseManager.serverDatabases[server.url]?.database;
+                if (database) {
+                    const userContext = await getUserContext(database);
+                    Sentry.setContext('User-Information', userContext);
+
+                    const buildContext = await getBuildTags(database);
+                    Sentry.setContext('App-Build Information', buildContext);
+
+                    const extraContext = await getExtraContext(database);
+                    Sentry.setContext('Server-Information', extraContext);
+                }
+            }
+        };
+
+        const subscription = subscribeActiveServers(activeServerUrlObserver);
+
+        return () => {
+            subscription?.unsubscribe();
+        };
+    }, []);
+
     return (
         <FreezeScreen freeze={!isFocused}>
             {<Animated.View style={top}/>}

app/utils/error_handling.ts

@@ -1,26 +1,22 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {Database} from '@nozbe/watermelondb';
 import {Alert} from 'react-native';
-import {
-    setJSExceptionHandler,
-
-    // setNativeExceptionHandler
-} from 'react-native-exception-handler';
+import {setJSExceptionHandler} from 'react-native-exception-handler';
 
 import {DEFAULT_LOCALE, getTranslations, t} from '@i18n';
 import {dismissAllModals} from '@screens/navigation';
 import {ClientError} from '@utils/client_error';
-import {
-    captureException,
-    captureJSException,
-    initializeSentry,
-    LOGGER_NATIVE,
-} from '@utils/sentry';
+import {captureException, captureJSException, initializeSentry, LOGGER_NATIVE} from '@utils/sentry';
 
 import {logWarning} from './log';
 
 class JavascriptAndNativeErrorHandler {
+    private activeServerDatabase: Database | undefined;
+
+    private errorContext: any;
+
     initializeErrorHandling = () => {
         initializeSentry();
         setJSExceptionHandler(this.errorHandler, false);
@@ -30,7 +26,7 @@ class JavascriptAndNativeErrorHandler {
 
     nativeErrorHandler = (e: string) => {
         logWarning('Handling native error ' + e);
-        captureException(e, LOGGER_NATIVE);
+        captureException(e, {logger: LOGGER_NATIVE, ...this.errorContext});
     };
 
     errorHandler = (e: Error | ClientError, isFatal: boolean) => {
@@ -42,7 +38,8 @@ class JavascriptAndNativeErrorHandler {
         }
 
         logWarning('Handling Javascript error', e, isFatal);
-        captureJSException(e, isFatal);
+
+        captureJSException(e, isFatal, {logger: LOGGER_NATIVE, ...this.errorContext});
 
         if (isFatal && e instanceof Error) {
             const translations = getTranslations(DEFAULT_LOCALE);

app/utils/sentry.ts

@@ -1,13 +1,21 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
+import {Database, Q} from '@nozbe/watermelondb';
 import {Breadcrumb} from '@sentry/types';
 import {Platform} from 'react-native';
+import {Navigation} from 'react-native-navigation';
 
 import Config from '@assets/config.json';
+import {MM_TABLES} from '@constants/database';
+import {getCurrentChannel} from '@queries/servers/channel';
+import {getConfig, getCurrentTeamId} from '@queries/servers/system';
+import {getCurrentUser} from '@queries/servers/user';
+import MyChannelModel from '@typings/database/models/servers/my_channel';
+import MyTeamModel from '@typings/database/models/servers/my_team';
 
 import {ClientError} from './client_error';
-import {logError, logWarning} from './log';
+import {logWarning} from './log';
 
 export const BREADCRUMB_UNCAUGHT_APP_ERROR = 'uncaught-app-error';
 export const BREADCRUMB_UNCAUGHT_NON_ERROR = 'uncaught-non-error';
@@ -17,6 +25,7 @@ export const LOGGER_JAVASCRIPT_WARNING = 'javascript_warning';
 export const LOGGER_NATIVE = 'native';
 
 let Sentry: any;
+
 export function initializeSentry() {
     if (!Config.SentryEnabled) {
         return;
@@ -33,7 +42,21 @@ export function initializeSentry() {
         return;
     }
 
-    Sentry.init({dsn, ...Config.SentryOptions});
+    Sentry.init({
+        dsn,
+        tracesSampleRate: 0.2,
+        integrations: [
+            new Sentry.ReactNativeTracing({
+
+                // Pass instrumentation to be used as `routingInstrumentation`
+                routingInstrumentation: new Sentry.ReactNativeNavigationInstrumentation(
+                    Navigation,
+                ),
+            }),
+        ],
+        sendDefaultPii: false,
+        ...Config.SentryOptions,
+    });
 }
 
 function getDsn() {
@@ -46,24 +69,20 @@ function getDsn() {
     return '';
 }
 
-export function captureException(error: Error | string, logger: string) {
+export function captureException(error: Error | string, errorContext: any) {
     if (!Config.SentryEnabled) {
         return;
     }
 
-    if (!error || !logger) {
-        logWarning('captureException called with missing arguments', error, logger);
+    if (!error || !errorContext) {
+        logWarning('captureException called with missing arguments', error, errorContext);
         return;
     }
 
-    // TODO: Get current server config and other relevant data
-
-    capture(() => {
-        Sentry.captureException(error, {logger});
-    });
+    Sentry.captureException(error, {...errorContext});
 }
 
-export function captureJSException(error: Error | ClientError, isFatal: boolean) {
+export function captureJSException(error: Error | ClientError, isFatal: boolean, errorContext: any) {
     if (!Config.SentryEnabled) {
         return;
     }
@@ -76,7 +95,10 @@ export function captureJSException(error: Error | ClientError, isFatal: boolean)
     if (error instanceof ClientError) {
         captureClientErrorAsBreadcrumb(error, isFatal);
     } else {
-        captureException(error, LOGGER_JAVASCRIPT);
+        captureException(error, {
+            logger: LOGGER_JAVASCRIPT,
+            ...errorContext,
+        });
     }
 }
 
@@ -120,128 +142,83 @@ function captureClientErrorAsBreadcrumb(error: ClientError, isFatal: boolean) {
     }
 }
 
-// Wrapper function to any calls to Sentry so that we can gather any necessary extra data
-// before sending.
-function capture(captureFunc: () => void, config?: ClientConfig) {
-    if (config?.EnableDiagnostics !== 'true') {
-        return;
-    }
-
-    try {
-        let hasUserContext = false;
-        const userContext = getUserContext();
-        if (userContext) {
-            hasUserContext = true;
-            Sentry.setUserContext(userContext);
-        }
-
-        const extraContext = getExtraContext();
-        if (Object.keys(extraContext).length) {
-            Sentry.setExtraContext(extraContext);
-        }
-
-        const buildTags = getBuildTags();
-        if (buildTags) {
-            Sentry.setTagsContext(buildTags);
-        }
-
-        if (hasUserContext) {
-            logWarning('Capturing with Sentry at ' + getDsn() + '...');
-
-            captureFunc();
-        } else {
-            logWarning('No user context, skipping capture');
-        }
-    } catch (e) {
-        // Don't want this to get into an infinite loop again...
-        logError('Exception occurred while sending to Sentry');
-        logError(e);
-    }
-}
-
-function getUserContext() {
-    // TODO: Get current user data from active database
+export const getUserContext = async (database: Database) => {
     const currentUser = {
         id: 'currentUserId',
         locale: 'en',
         roles: 'multi-server-test-role',
     };
 
-    if (!currentUser) {
-        return null;
+    const user = await getCurrentUser(database);
+    if (user) {
+        currentUser.id = user.id;
+        currentUser.locale = user.locale;
+        currentUser.roles = user.roles;
     }
 
     return {
-        userID: currentUser.id, // This can be changed to id after we upgrade to Sentry >= 0.14.10,
+        userID: currentUser.id,
         email: '',
         username: '',
-        extra: {
-            locale: currentUser.locale,
-            roles: currentUser.roles,
-        },
+
+        locale: currentUser.locale,
+        roles: currentUser.roles,
+
     };
-}
+};
 
-function getExtraContext() {
-    const context = {};
+export const getExtraContext = async (database: Database) => {
+    const context = {
+        config: {},
+        currentChannel: {},
+        currentTeam: {},
+    };
 
-    // TODO: Add context based on the active database
+    const config = await getConfig(database);
+    if (config) {
+        context.config = {
+            BuildDate: config.BuildDate,
+            BuildEnterpriseReady: config.BuildEnterpriseReady,
+            BuildHash: config.BuildHash,
+            BuildHashEnterprise: config.BuildHashEnterprise,
+            BuildNumber: config.BuildNumber,
+        };
+    }
+    const currentTeamId = await getCurrentTeamId(database);
+    const myTeam = await database.get<MyTeamModel>(MM_TABLES.SERVER.MY_TEAM).query(Q.where('id', currentTeamId)).fetch();
+    const teamRoles = myTeam?.[0]?.roles;
+    context.currentTeam = {
+        TeamId: currentTeamId,
+        TeamRoles: teamRoles,
+    };
 
-    // const currentTeam = getCurrentTeam(state);
-    // if (currentTeam) {
-    //     context.currentTeam = {
-    //         id: currentTeam.id,
-    //     };
-    // }
-
-    // const currentTeamMember = getCurrentTeamMembership(state);
-    // if (currentTeamMember) {
-    //     context.currentTeamMember = {
-    //         roles: currentTeamMember.roles,
-    //     };
-    // }
-
-    // const currentChannel = getCurrentChannel(state);
-    // if (currentChannel) {
-    //     context.currentChannel = {
-    //         id: currentChannel.id,
-    //         type: currentChannel.type,
-    //     };
-    // }
-
-    // const currentChannelMember = getMyCurrentChannelMembership(state);
-    // if (currentChannelMember) {
-    //     context.currentChannelMember = {
-    //         roles: currentChannelMember.roles,
-    //     };
-    // }
-
-    // const config = getConfig(state);
-    // if (config) {
-    //     context.config = {
-    //         BuildDate: config.BuildDate,
-    //         BuildEnterpriseReady: config.BuildEnterpriseReady,
-    //         BuildHash: config.BuildHash,
-    //         BuildHashEnterprise: config.BuildHashEnterprise,
-    //         BuildNumber: config.BuildNumber,
-    //     };
-    // }
+    const channel = await getCurrentChannel(database);
+    let channelRoles;
+    if (channel) {
+        const myChannel = await database.get<MyChannelModel>(MM_TABLES.SERVER.MY_CHANNEL).query(Q.where('id', channel.id)).fetch();
+        channelRoles = myChannel?.[0]?.roles;
+        context.currentChannel = {
+            ChannelId: channel?.id,
+            ChannelRoles: channelRoles,
+            ChannelType: channel?.type,
+        };
+    }
 
     return context;
-}
+};
 
-function getBuildTags() {
-    let tags;
+export const getBuildTags = async (database: Database) => {
+    const tags = {
+        serverBuildHash: '',
+        serverBuildNumber: '',
+    };
 
-    // TODO: Add context based on the active database
-
-    // const config = getConfig(state);
-    // if (config) {
-    //     tags = {
-    //         serverBuildHash: config.BuildHash,
-    //         serverBuildNumber: config.BuildNumber,
-    //     };
-    // }
+    const config = await getConfig(database);
+    if (config) {
+        tags.serverBuildHash = config.BuildHash;
+        tags.serverBuildNumber = config.BuildNumber;
+    }
 
     return tags;
-}
+};
+

fastlane/Fastfile

@@ -177,7 +177,7 @@ lane :upload_file_to_s3 do |options|
   extension = os_type == "android" ? "*.apk" : "*.ipa"
   build_folder_path = Dir[File.expand_path('..')].first
   files = []
-  
+
   unless options[:file].nil? || options[:file].empty?
     files.push("#{build_folder_path}/#{options[:file]}")
   else
@@ -194,7 +194,7 @@ lane :upload_file_to_s3 do |options|
       pr_file = File.basename(files.first)
       plist_file = "#{File.basename(files.first, '.*')}.plist"
     else
-      version_number = os_type == "android" ? 
+      version_number = os_type == "android" ?
         android_get_version_name(gradle_file: './android/app/build.gradle') :
         get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost')
       build_number = os_type == "android" ?
@@ -207,7 +207,7 @@ lane :upload_file_to_s3 do |options|
     s3_folder = is_build_pr ?
       "#{ENV['AWS_FOLDER_NAME']}/#{ENV['BRANCH_TO_BUILD']}" :
       "#{ENV['AWS_FOLDER_NAME']}/#{version_number}/#{build_number}"
-    
+
     s3 = Aws::S3::Resource.new(region: s3_region)
     s3_bucket = s3.bucket(s3_bucket_name)
     mutex = Mutex.new
@@ -254,7 +254,7 @@ lane :upload_file_to_s3 do |options|
                             :install_url => install_url
                         })
     end
-  
+
     if options[:file] == 'Mattermost-simulator-x86_64.app.zip'
       pretext = '#### New iOS build for VM/Simulator'
       msg = "Download link: #{links.first}"
@@ -741,7 +741,7 @@ platform :android do
         properties: {
           'separateApk' => ENV["SEPARATE_APKS"] || false,
           'universalApk' => ENV["SEPARATE_APKS"] || false,
-        }
+        },
     )
   end
 
@@ -850,14 +850,14 @@ def get_apple_api_key
           f.write("\n") unless index == p8_array.length - 1
         end
       end
-    
+
       api_key = app_store_connect_api_key(
         key_id: ENV['IOS_API_KEY_ID'],
         issuer_id: ENV['IOS_API_ISSUER_ID'],
         key_filepath: "./#{api_key_path}",
         in_house: ENV['IOS_IN_HOUSE'] == 'true', # optional but may be required if using match/sigh
       )
-    
+
       File.delete("../#{api_key_path}")
     end
 

ios/Gekidou/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/stephencelis/SQLite.swift.git",
         "state": {
           "branch": null,
-          "revision": "9af51e2edf491c0ea632e369a6566e09b65aa333",
-          "version": "0.13.0"
+          "revision": "2c4af8526e112e3a23df141e988d08a28e475ecd",
+          "version": "0.14.0"
         }
       }
     ]

ios/bundleReactNative.sh

@@ -12,7 +12,8 @@ if [[ "${SENTRY_ENABLED}" = "true" ]]; then
 	./makeSentryProperties.sh
 
 	export SENTRY_PROPERTIES=sentry.properties
-	../node_modules/@sentry/cli/bin/sentry-cli react-native xcode ./react-native-xcode.sh
+	../node_modules/@sentry/cli/bin/sentry-cli react-native xcode \
+    ../node_modules/react-native/scripts/react-native-xcode.sh
 else
 	echo "Sentry native integration is not enabled"
 	../node_modules/react-native/scripts/react-native-xcode.sh

ios/uploadDebugSymbols.sh

@@ -6,7 +6,8 @@ if [[ "${SENTRY_ENABLED}" = "true" ]]; then
 	./makeSentryProperties.sh
 
 	export SENTRY_PROPERTIES=sentry.properties
-	../node_modules/@sentry/cli/bin/sentry-cli upload-dsym
+../node_modules/@sentry/cli/bin/sentry-cli upload-dif "$DWARF_DSYM_FOLDER_PATH"
+
 else
 	echo "Not uploading debugging symbols to Sentry because Sentry is disabled"
 fi

metro.config.js

@@ -21,5 +21,6 @@ module.exports = (async () => {
             assetExts: assetExts.filter((ext) => ext !== 'svg'),
             sourceExts: [...sourceExts, 'svg'],
         },
+        maxWorkers: 2,
     };
 })();