From 9785a03ebde29251dde236c937f7fe5ddb39f6bf Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Wed, 2 Sep 2020 04:25:43 -0700 Subject: [PATCH] Summary: See D23051239 Since the crash reporter endpoint does not exist anymore, and no data was reported there, removing the corresponding code from Flipper as well. This also fixes the last remaining startup warning as well :) Reviewed By: priteshrnandgaonkar Differential Revision: D23472612 fbshipit-source-id: 7ce9f6a0261cdfe197a7da9b28a86407299effec --- desktop/app/src/init.tsx | 2 - .../app/src/utils/electronCrashReporter.tsx | 55 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 desktop/app/src/utils/electronCrashReporter.tsx diff --git a/desktop/app/src/init.tsx b/desktop/app/src/init.tsx index c9950ae47..5bf3ee075 100644 --- a/desktop/app/src/init.tsx +++ b/desktop/app/src/init.tsx @@ -22,7 +22,6 @@ import dispatcher from './dispatcher/index'; import TooltipProvider from './ui/components/TooltipProvider'; import config from './utils/processConfig'; import {initLauncherHooks} from './utils/launcher'; -import initCrashReporter from './utils/electronCrashReporter'; import fbConfig from './fb-stubs/config'; import {isFBEmployee} from './utils/fbEmployee'; import WarningEmployee from './chrome/WarningEmployee'; @@ -118,7 +117,6 @@ function init() { ReactDOM.render(, document.getElementById('root')); initLauncherHooks(config(), store); const sessionId = store.getState().application.sessionId; - initCrashReporter(sessionId || ''); registerRecordingHooks(store); enableConsoleHook(); window.flipperGlobalStoreDispatch = store.dispatch; diff --git a/desktop/app/src/utils/electronCrashReporter.tsx b/desktop/app/src/utils/electronCrashReporter.tsx deleted file mode 100644 index fc92e4673..000000000 --- a/desktop/app/src/utils/electronCrashReporter.tsx +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import {exists, mkdir} from 'fs'; -import {promisify} from 'util'; -import {crashReporter, remote} from 'electron'; -import isProduction from '../utils/isProduction'; -import constants from '../fb-stubs/constants'; -import {tmpName as tmpNameCallback, TmpNameOptions} from 'tmp'; -import {resolve} from 'path'; - -const tmpName = promisify(tmpNameCallback) as ( - options?: TmpNameOptions, -) => Promise; - -// Cross platform way to find the /tmp directory or equivalent. -// The tempPath set should be persistent across app restarts. -const tempPathPromise: Promise = tmpName({ - template: 'tmp-XXXXXX', -}).then((name) => resolve(name, '..', 'flipper')); - -export default function initCrashReporter(sessionId: string): Promise { - const flipperVersion = remote.app.getVersion(); - return tempPathPromise.then((tempPath) => { - return promisify(exists)(tempPath) - .then((pathExists) => { - if (!pathExists) { - return promisify(mkdir)(tempPath); - } - return Promise.resolve(); - }) - .then(() => { - remote.app.setPath('temp', tempPath); - const electronCrashReporterArgs = { - productName: 'Flipper', - companyName: 'Facebook', - submitURL: 'https://www.facebook.com/intern/flipper/crash_upload', - uploadToServer: isProduction() && !constants.IS_PUBLIC_BUILD, - ignoreSystemCrashHandler: true, - extra: { - flipper_version: flipperVersion, - session_id: sessionId, - }, - }; - remote.crashReporter.start(electronCrashReporterArgs); - crashReporter.start(electronCrashReporterArgs); - }); - }); -}