Skip to content
This repository has been archived by the owner on Apr 25, 2023. It is now read-only.

Commit

Permalink
fix: Revert sentry changes (#904)
Browse files Browse the repository at this point in the history
  • Loading branch information
dpgraham authored Mar 27, 2019
1 parent f3cd338 commit 8e9adb6
Show file tree
Hide file tree
Showing 15 changed files with 2,953 additions and 4,005 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ main.map
Certificates.p12
.cache/
.idea/
sentry-version.js
4 changes: 0 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ Instructions will be given by the GitHub Bot when you make a pull request.
Just use the GitHub issue tracker to submit your bug reports and feature
requests. If you are submitting a bug report, please follow the [issue template](https://github.com/appium/appium-desktop/issues/new).

### Sentry

Appium Desktop has crash logs reported to it using [Sentry](https://sentry.io/appium/appiumdesktop/). This requires permission to access.

### Localization

Appium Desktop uses [i18next](https://www.i18next.com) library to manage its translations. All translatable resources are stored in `assets/locales/en/translation.json` file. The list of supported languages can be found (or altered) in `app/configs/app.config.js` module. Please read through i18next API documentation to get more information on how to manage the localized resources:
Expand Down
7 changes: 0 additions & 7 deletions app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { setSavedEnv } from './main/helpers';
import rebuildMenus from './main/menus';
import shellEnv from 'shell-env';
import fixPath from 'fix-path';
import { initSentry } from './shared/sentry';
import { promptUser } from './main/sentry-permission-prompt';
import settings from './shared/settings';

let mainWindow = null;
Expand All @@ -27,9 +25,6 @@ if (!isDev) {
}
setSavedEnv();

// Enable Sentry crash report logging
initSentry();

app.on('window-all-closed', () => {
app.quit();
});
Expand Down Expand Up @@ -100,7 +95,5 @@ app.on('ready', async () => {

rebuildMenus(mainWindow);

promptUser();

initializeIpc(mainWindow);
});
7 changes: 0 additions & 7 deletions app/main/appium.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,6 @@ function connectSaveEnv () {
});
}

function connectServerErrorBackdoor () {
ipcMain.on('appium-force-nodejs-error', () => {
throw new Error('A NodeJS error was intentionally thrown');
});
}

export function initializeIpc (win) {
// listen for 'start-server' from the renderer
connectStartServer(win);
Expand All @@ -403,7 +397,6 @@ export function initializeIpc (win) {
connectOpenConfig(win);
connectGetEnv();
connectSaveEnv();
connectServerErrorBackdoor();

setTimeout(checkNewUpdates, 10000);
}
21 changes: 0 additions & 21 deletions app/main/sentry-permission-prompt.js

This file was deleted.

2 changes: 1 addition & 1 deletion app/renderer/components/Session/CloudProviderSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default class CloudProviderSelector extends Component {
}

render () {
const {t, isAddingCloudProvider, stopAddCloudProvider, visibleProviders} = this.props;
const {t, isAddingCloudProvider, stopAddCloudProvider, visibleProviders = []} = this.props;
const providersGrid = _.chunk(_.keys(CloudProviders), 2); // Converts list of providers into list of pairs of providers
const footer = [<Button key="back" type="primary" onClick={stopAddCloudProvider}>{t('Done')}</Button>];

Expand Down
11 changes: 0 additions & 11 deletions app/renderer/components/StartServer/shared.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import PropTypes from 'prop-types';
import { ipcRenderer } from 'electron';
import { DEFAULT_ARGS } from '../../reducers/StartServer';

export const propTypes = {
Expand All @@ -17,16 +16,6 @@ export function updateArg (evt) {
const {updateArgs} = this.props;
let argName = evt.target.name;

// Backdoor for testing purposes only. This forces an error to occur so
// that we can test errors on sentry
if (evt.target.value) {
if (evt.target.value.toLowerCase() === 'force_browser_error') {
throw new Error(`Browser error intentionally thrown`);
} else if (evt.target.value && evt.target.value.toLowerCase() === 'force_nodejs_error') {
ipcRenderer.send('appium-force-nodejs-error');
}
}

let newVal;
switch (evt.target.type) {
case 'checkbox':
Expand Down
3 changes: 0 additions & 3 deletions app/renderer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ import { render } from 'react-dom';
import Root from './containers/Root';
import { AppContainer } from 'react-hot-loader';
import Store from './store/configureStore';
import { initSentry } from '../shared/sentry';

const { history, configureStore } = Store;

const store = configureStore();

initSentry();

render(
<AppContainer>
<Root store={store} history={history} />
Expand Down
13 changes: 0 additions & 13 deletions app/shared/sentry.js

This file was deleted.

2 changes: 0 additions & 2 deletions ci-jobs/templates/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
E2E_TIMEOUT: 600000
CI: true
CSC_IDENTITY_AUTO_DISCOVERY: true
SENTRY_ORG: appium
steps:
- task: NodeTool@0
inputs:
Expand All @@ -31,4 +30,3 @@ jobs:
GH_TOKEN: $(GH_TOKEN)
CSC_LINK: $(CSC_LINK)
CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD)
SENTRY_AUTH_TOKEN: $(SENTRY_AUTH_TOKEN)
Loading

0 comments on commit 8e9adb6

Please sign in to comment.