fix: fix graph curviness bugs by upgrading apex (#204)

* fix: fix graph curviness bugs by upgrading apex * chore(aws): upgrade to node18 on aws
bamlab · Mar 1, 2024 · 0223202 · 0223202
1 parent b1fd23f
commit 0223202
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/packages/core/shell/src/unzip.ts b/packages/core/shell/src/unzip.ts
@@ -7,6 +7,8 @@ export const unzip = (path: string, destinationFolder: string) => {
   const zipEntries = zip.getEntries();
 
   for (const zipEntry of zipEntries) {
+    if (zipEntry.isDirectory) continue;
+
     const parts = zipEntry.entryName.split("/");
 
     fs.writeFileSync(`${destinationFolder}/${parts[parts.length - 1]}`, zipEntry.getData());

diff --git a/packages/core/web-reporter-ui/package.json b/packages/core/web-reporter-ui/package.json
@@ -10,7 +10,7 @@
     "@mui/utils": "^5.4.4",
     "@perf-profiler/reporter": "^0.7.0",
     "@perf-profiler/types": "^0.6.0",
-    "apexcharts": "^3.44.0",
+    "apexcharts": "^3.46.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",

diff --git a/packages/platforms/android/src/commands/cppProfiler.ts b/packages/platforms/android/src/commands/cppProfiler.ts
@@ -1,5 +1,5 @@
 import { Logger } from "@perf-profiler/logger";
-import { executeLongRunningProcess } from "./shell";
+import { canIgnoreAwsTerminationError, executeLongRunningProcess } from "./shell";
 import { POLLING_INTERVAL } from "@perf-profiler/types";
 import { profiler } from "./platforms/platformProfiler";
 
@@ -81,7 +81,7 @@ export const pollPerformanceMeasures = (
     } else if (log.includes("CPP_ERROR_MAIN_PID_CLOSED")) {
       onPidChanged?.(pid);
     } else {
-      Logger.error(log);
+      if (!canIgnoreAwsTerminationError(log)) Logger.error(log);
     }
   });
 

diff --git a/packages/platforms/android/src/commands/shell.ts b/packages/platforms/android/src/commands/shell.ts
@@ -41,6 +41,12 @@ if (!global.Flipper) {
 
 class AsyncExecutionError extends Error {}
 
+/**
+ * In AWS when we properly kill the process termination gets logged in stderr with a weird log
+ */
+export const canIgnoreAwsTerminationError = (log: string) =>
+  log.includes("Terminated              LD_LIBRARY_PATH");
+
 export const executeAsync = (
   command: string,
   { logStderr } = {
@@ -56,7 +62,8 @@ export const executeAsync = (
   });
 
   childProcess.stderr?.on("data", (data) => {
-    if (logStderr) Logger.error(`Process for ${command} errored with ${data.toString()}`);
+    if (logStderr && !canIgnoreAwsTerminationError(data.toString()))
+      Logger.error(`Process for ${command} errored with ${data.toString()}`);
   });
 
   childProcess.on("close", (code) => {

diff --git a/packages/plugins/aws-device-farm/src/__tests__/__snapshots__/createTestSpecFile.ts.snap b/packages/plugins/aws-device-farm/src/__tests__/__snapshots__/createTestSpecFile.ts.snap
@@ -2,12 +2,12 @@
 
 exports[`createTestSpecFile creates a test spec for a given test command 1`] = `
 "version: 0.1
+android_test_host: amazon_linux_2
 phases:
   install:
     commands:
-      - export NVM_DIR=$HOME/.nvm
-      - . $NVM_DIR/nvm.sh
-      - nvm install 16
+      - devicefarm-cli use node 18
+      - node -v
       - echo "Navigate to test package directory"
       - cd $DEVICEFARM_TEST_PACKAGE_PATH
       - npm install *.tgz
@@ -63,12 +63,12 @@ artifacts:
 
 exports[`createTestSpecFile creates a test spec for a single TS file 1`] = `
 "version: 0.1
+android_test_host: amazon_linux_2
 phases:
   install:
     commands:
-      - export NVM_DIR=$HOME/.nvm
-      - . $NVM_DIR/nvm.sh
-      - nvm install 16
+      - devicefarm-cli use node 18
+      - node -v
       - echo "Navigate to test package directory"
       - cd $DEVICEFARM_TEST_PACKAGE_PATH
       - npm install *.tgz

diff --git a/packages/plugins/aws-device-farm/src/buildYmlSpec.ts b/packages/plugins/aws-device-farm/src/buildYmlSpec.ts
@@ -1,6 +1,6 @@
 import yaml from "js-yaml";
 export const Commands = {
-  INSTALL_NVM: ["export NVM_DIR=$HOME/.nvm", ". $NVM_DIR/nvm.sh", "nvm install 16"],
+  INSTALL_NODE: ["devicefarm-cli use node 18", "node -v"],
   UNPACKAGE_TEST_PACKAGE: [
     'echo "Navigate to test package directory"',
     "cd $DEVICEFARM_TEST_PACKAGE_PATH",
@@ -56,10 +56,11 @@ export const buildYmlSpec = ({
 }) => {
   const testJsonSpec = {
     version: 0.1,
+    android_test_host: "amazon_linux_2",
     phases: {
       install: {
         commands: [
-          ...Commands.INSTALL_NVM,
+          ...Commands.INSTALL_NODE,
           ...Commands.UNPACKAGE_TEST_PACKAGE,
           ...(installCommands || []),
         ],

diff --git a/yarn.lock b/yarn.lock
@@ -5011,10 +5011,10 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@^3.44.0:
-  version "3.44.0"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.44.0.tgz#b52f95b0d0c2a5357b4614fa42faac956b69a4a9"
-  integrity sha512-u7Xzrbcxc2yWznN78Jh5NMCYVAsWDfBjRl5ea++rVzFAqjU2hLz4RgKIFwYOBDRQtW1e/Qz8azJTqIJ1+Vu9Qg==
+apexcharts@^3.46.0:
+  version "3.46.0"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.46.0.tgz#ee0afd44a7df94e038c4cc0160ece21a0da387f5"
+  integrity sha512-ELAY6vj8JQD7QLktKasTzwm9Wt0qxqfQSo+3QWS7G7I774iK8HCkG1toGsqJH0mkK6PtYBtnSIe66uUcwoCw1w==
   dependencies:
     "@yr/monotone-cubic-spline" "^1.0.3"
     svg.draggable.js "^2.2.2"