Clean up QPL integration

Summary: Removed the Flipper QPL integration, see: https://fb.workplace.com/groups/flippersupport/permalink/1200183003795689/ It complicates our build setup significantly, without actually being used anywhere for the past year. Apparently it doesn't solve a gap compared to the scuba logging we have already in place. Reviewed By: passy Differential Revision: D30911573 fbshipit-source-id: 836e2aba0c92c0eed9fed0dfb12bd8bdcb8c7d71
2021-09-14 02:54:03 -07:00
parent b658d70311
commit 75b5783fd0
6 changed files with 4 additions and 105 deletions
--- a/desktop/app/src/fb-stubs/QPL.tsx
+++ b/desktop/app/src/fb-stubs/QPL.tsx
@@ -1,59 +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
- */
-
-export enum QuickLogActionType {
-  START = 1,
-  SUCCESS = 2,
-  FAIL = 3,
-  CANCEL = 4,
-  CANCEL_UNLOAD = 706,
-  INTERRUPTED = 96,
-}
-
-export enum FLIPPER_QPL_EVENTS {
-  STARTUP = 52035585,
-}
-
-interface Annotations {
-  string: {[key: string]: string} | null | undefined;
-  int: {[key: string]: number} | null | undefined;
-  double: {[key: string]: number} | null | undefined;
-  bool: {[key: string]: boolean} | null | undefined;
-  string_array: {[key: string]: string[]} | null | undefined;
-  int_array: {[key: string]: number[]} | null | undefined;
-  double_array: {[key: string]: number[]} | null | undefined;
-  bool_array: {[key: string]: boolean[]} | null | undefined;
-}
-
-class QuickPerformanceLogger {
-  markerStart(
-    _markerId: number,
-    _instanceKey?: number,
-    _timestamp?: DOMHighResTimeStamp,
-  ): void {}
-
-  markerPoint(
-    _markerId: number,
-    _name: string,
-    _options?: {
-      instanceKey?: number;
-      data?: Annotations | null | undefined;
-      timestamp?: DOMHighResTimeStamp;
-    },
-  ): void {}
-
-  markerEnd(
-    _markerId: number,
-    _action: QuickLogActionType,
-    _instanceKey?: number,
-    _timestamp?: DOMHighResTimeStamp,
-  ): void {}
-}
-
-export default new QuickPerformanceLogger();
--- a/desktop/app/src/sandy-chrome/SandyApp.tsx
+++ b/desktop/app/src/sandy-chrome/SandyApp.tsx
@@ -32,7 +32,6 @@ import {hasNewChangesToShow} from '../chrome/ChangelogSheet';
 import {getVersionString} from '../utils/versionString';
 import config from '../fb-stubs/config';
 import {WelcomeScreenStaticView} from './WelcomeScreen';
-import QPL, {QuickLogActionType, FLIPPER_QPL_EVENTS} from '../fb-stubs/QPL';
 import fbConfig from '../fb-stubs/config';
 import {isFBEmployee} from '../utils/fbEmployee';
 import {notification} from 'antd';
@@ -213,14 +212,6 @@ function registerStartupTime(logger: Logger) {
  const launchEndTime = s * 1e3 + ns / 1e6;
  ipcRenderer.on('getLaunchTime', (_: any, launchStartTime: number) => {
    logger.track('performance', 'launchTime', launchEndTime - launchStartTime);
-
-    QPL.markerStart(FLIPPER_QPL_EVENTS.STARTUP, 0, launchStartTime);
-    QPL.markerEnd(
-      FLIPPER_QPL_EVENTS.STARTUP,
-      QuickLogActionType.SUCCESS,
-      0,
-      launchEndTime,
-    );
  });

  ipcRenderer.send('getLaunchTime');
--- a/desktop/scripts/get-app-watch-folders.ts
+++ b/desktop/scripts/get-app-watch-folders.ts
@@ -10,8 +10,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import {getWatchFolders} from 'flipper-pkg-lib';
-import {appDir, publicPluginsDir, fbPluginsDir, jsSharedDir} from './paths';
-import isFB from './isFB';
+import {appDir, publicPluginsDir, fbPluginsDir} from './paths';

 /**
 * Flipper references code from below plugins directly. Such directly referenced plugins
@@ -30,9 +29,6 @@ export default async function getAppWatchFolders() {
    ),
  );
  const watchFolders = ([] as string[]).concat(...getWatchFoldersResults);
-  if (isFB) {
-    watchFolders.push(jsSharedDir);
-  }
  return watchFolders
    .filter((value, index, self) => self.indexOf(value) === index)
    .filter(async (f) => fs.pathExists(f));
--- a/desktop/scripts/paths.ts
+++ b/desktop/scripts/paths.ts
@@ -8,7 +8,6 @@
 */

 import path from 'path';
-import isFB from './isFB';

 export const rootDir = path.resolve(__dirname, '..');
 export const appDir = path.join(rootDir, 'app');
@@ -23,4 +22,3 @@ export const babelTransformationsDir = path.resolve(
  'babel-transformer',
  'src',
 );
-export const jsSharedDir = isFB ? path.resolve(rootDir, '../../js-shared') : '';
--- a/desktop/tsconfig.base.json
+++ b/desktop/tsconfig.base.json
@@ -23,8 +23,7 @@
      "flipper": ["./app/src"],
      "flipper-plugin": ["./flipper-plugin/src"],
      "eslint-plugin-flipper": ["./eslint-plugin-flipper/src"],
-      "flipper-*": ["./*/src"],
-      "@js-shared/*": ["../../js-shared/*"]
+      "flipper-*": ["./*/src"]
    }
  },
  "exclude": ["**/lib/", "**/dist/", "**/node_modules/", "**/__tests__/"]
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -4948,13 +4948,6 @@ colors@^1.1.2:
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==

-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
 combined-stream@^1.0.8:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -6818,15 +6811,6 @@ form-data@*, form-data@^3.0.0:
    combined-stream "^1.0.8"
    mime-types "^2.1.12"

-form-data@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@~0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -9102,7 +9086,7 @@ lodash.clonedeep@^4.5.0:
  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=

-lodash.debounce@4.0.8, lodash.debounce@^4.0.8:
+lodash.debounce@^4.0.8:
  version "4.0.8"
  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
@@ -9850,7 +9834,7 @@ node-dir@^0.1.17:
  dependencies:
    minimatch "^3.0.2"

-node-fetch@1.6.3, node-fetch@2.6.0, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
+node-fetch@2.6.0, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1:
  version "2.6.1"
  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -10746,11 +10730,6 @@ qs@6.7.0:
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==

-querystring@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
-  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
-
 raf@^3.4.0:
  version "3.4.1"
  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
@@ -13333,11 +13312,6 @@ utils-merge@1.0.1:
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=

-uuid@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
-  integrity sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=
-
 uuid@^3.3.2:
  version "3.4.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"