@nrwl/nx-cloud 13.0.0-beta.6 → 13.0.0

package/lib/utilities/metric-logger.d.ts

@@ -1,34 +1,22 @@
 import { CloudTaskRunnerOptions } from '../core/models/cloud-task-runner-options';
 export interface NxCloudPerfEntry {
     durationMs?: number;
+    entryType: string;
     success: boolean;
     statusCode: number;
-}
-export interface FileStoragePerfEntry extends NxCloudPerfEntry {
-    fileSize: number;
-}
-export interface NxCloudPerformanceMap {
-    storeFile: FileStoragePerfEntry[];
-    retrieveFile: FileStoragePerfEntry[];
-    startRun: NxCloudPerfEntry[];
-    endRun: NxCloudPerfEntry[];
-    createRunGroup: NxCloudPerfEntry[];
-    completeRunGroup: NxCloudPerfEntry[];
-    dtePollTasks: NxCloudPerfEntry[];
-    dteStatus: NxCloudPerfEntry[];
-    dteStart: NxCloudPerfEntry[];
+    payloadSize: number;
 }
 export interface MetricRecorder {
-    recordMetric: <T extends NxCloudPerfEntry>(metadata: T) => void;
+    recordMetric: (metadata: Partial<NxCloudPerfEntry>) => void;
 }
-export declare const createMetricRecorder: (type: string) => MetricRecorder;
+export declare const createMetricRecorder: (entryType: string) => MetricRecorder;
 /**
  * Handles creating metadata for metrics that only need an NxCloudPerfEntry
  * @param resp response from nx-api
  */
-export declare const mapRespToPerfEntry: (resp: any) => NxCloudPerfEntry;
+export declare const mapRespToPerfEntry: (resp: any) => Partial<NxCloudPerfEntry>;
 /**
  * Constant to represent metrics when something goes wrong on the runner side
  */
-export declare const RUNNER_FAILURE_PERF_ENTRY: NxCloudPerfEntry;
+export declare const RUNNER_FAILURE_PERF_ENTRY: Partial<NxCloudPerfEntry>;
 export declare const submitRunMetrics: (options: CloudTaskRunnerOptions) => any;

package/lib/utilities/metric-logger.js

@@ -5,24 +5,15 @@ const perf_hooks_1 = require("perf_hooks");
 const axios_1 = require("./axios");
 const environment_1 = require("./environment");
 const print_message_1 = require("./print-message");
-const performanceEntries = {
-    storeFile: [],
-    retrieveFile: [],
-    startRun: [],
-    endRun: [],
-    createRunGroup: [],
-    completeRunGroup: [],
-    dtePollTasks: [],
-    dteStatus: [],
-    dteStart: [],
-};
-const createMetricRecorder = (type) => {
+const performanceEntries = [];
+const createMetricRecorder = (entryType) => {
     const startTime = perf_hooks_1.performance.now();
     const recorder = {
         recordMetric: (metadata) => {
             const endTime = perf_hooks_1.performance.now();
             metadata.durationMs = endTime - startTime;
-            performanceEntries[type].push(metadata);
+            metadata.entryType = entryType;
+            performanceEntries.push(metadata);
         },
     };
     return recorder;
@@ -57,16 +48,23 @@ const submitRunMetrics = (options) => {
     else {
         sampleRate = NON_CI_SAMPLE_RATE;
     }
-    if (environment_1.NX_CLOUD_FORCE_METRICS || Math.random() < sampleRate) {
-        if (environment_1.VERBOSE_LOGGING) {
-            (0, print_message_1.printMessage)('Submitting runner metrics for this run.');
+    try {
+        if (environment_1.NX_CLOUD_FORCE_METRICS || Math.random() < sampleRate) {
+            if (environment_1.VERBOSE_LOGGING) {
+                (0, print_message_1.printMessage)('Submitting runner metrics for this run.');
+            }
+            const axiosInstance = (0, axios_1.createApiAxiosInstance)(options);
+            return axiosInstance
+                .post('/nx-cloud/save-metrics', {
+                entries: performanceEntries,
+            })
+                .catch((e) => { });
+        }
+        else {
+            return Promise.resolve();
         }
-        const axiosInstance = (0, axios_1.createApiAxiosInstance)(options);
-        return axiosInstance.post('/nx-cloud/save-metrics', Object.assign({ branch: (0, environment_1.getBranch)() }, performanceEntries));
-    }
-    else {
-        return Promise.resolve();
     }
+    catch (e) { }
 };
 exports.submitRunMetrics = submitRunMetrics;
 //# sourceMappingURL=metric-logger.js.map

package/lib/utilities/metric-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"metric-logger.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/src/lib/utilities/metric-logger.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AACzC,mCAAqE;AACrE,+CAKuB;AAEvB,mDAA+C;AAwB/C,MAAM,kBAAkB,GAA0B;IAChD,SAAS,EAAE,EAAE;IACb,YAAY,EAAE,EAAE;IAChB,QAAQ,EAAE,EAAE;IACZ,MAAM,EAAE,EAAE;IACV,cAAc,EAAE,EAAE;IAClB,gBAAgB,EAAE,EAAE;IACpB,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,EAAE;IACb,QAAQ,EAAE,EAAE;CACb,CAAC;AAMK,MAAM,oBAAoB,GAAG,CAAC,IAAY,EAAkB,EAAE;IACnE,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;IAEpC,MAAM,QAAQ,GAAmB;QAC/B,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;YACzB,MAAM,OAAO,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YAClC,QAAQ,CAAC,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;YAE1C,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;KACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAbW,QAAA,oBAAoB,wBAa/B;AAEF;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAS,EAAoB,EAAE;;IAAC,OAAA,CAAC;QAClE,OAAO,EAAE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,mCAAI,KAAK;QAC1D,UAAU,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,CAAC,CAAC;KAC/B,CAAC,CAAA;CAAA,CAAC;AAHU,QAAA,kBAAkB,sBAG5B;AAEH;;GAEG;AACU,QAAA,yBAAyB,GAAqB;IACzD,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,CAAC,CAAC;CACf,CAAC;AAEF,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,kCAAkC;AAC9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,sCAAsC;AAEhE,MAAM,gBAAgB,GAAG,CAAC,OAA+B,EAAE,EAAE;IAClE,IAAI,UAAU,CAAC;IACf,IAAI,IAAA,uBAAS,GAAE,EAAE;QACf,UAAU,GAAG,cAAc,CAAC;KAC7B;SAAM;QACL,UAAU,GAAG,kBAAkB,CAAC;KACjC;IAED,IAAI,oCAAsB,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE;QACxD,IAAI,6BAAe,EAAE;YACnB,IAAA,4BAAY,EAAC,yCAAyC,CAAC,CAAC;SACzD;QAED,MAAM,aAAa,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;QAEtD,OAAO,aAAa,CAAC,IAAI,CAAC,wBAAwB,kBAChD,MAAM,EAAE,IAAA,uBAAS,GAAE,IAChB,kBAAkB,EACrB,CAAC;KACJ;SAAM;QACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;KAC1B;AACH,CAAC,CAAC;AAtBW,QAAA,gBAAgB,oBAsB3B"}
+{"version":3,"file":"metric-logger.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/src/lib/utilities/metric-logger.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AACzC,mCAAqE;AACrE,+CAIuB;AAEvB,mDAA+C;AAU/C,MAAM,kBAAkB,GAAuB,EAAE,CAAC;AAM3C,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAkB,EAAE;IACxE,MAAM,SAAS,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;IAEpC,MAAM,QAAQ,GAAmB;QAC/B,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;YACzB,MAAM,OAAO,GAAG,wBAAW,CAAC,GAAG,EAAE,CAAC;YAClC,QAAQ,CAAC,UAAU,GAAG,OAAO,GAAG,SAAS,CAAC;YAC1C,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;YAE/B,kBAAkB,CAAC,IAAI,CAAC,QAA4B,CAAC,CAAC;QACxD,CAAC;KACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,oBAAoB,wBAc/B;AAEF;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAS,EAA6B,EAAE;;IAAC,OAAA,CAAC;QAC3E,OAAO,EAAE,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,mCAAI,KAAK;QAC1D,UAAU,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,CAAC,CAAC;KAC/B,CAAC,CAAA;CAAA,CAAC;AAHU,QAAA,kBAAkB,sBAG5B;AAEH;;GAEG;AACU,QAAA,yBAAyB,GAA8B;IAClE,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,CAAC,CAAC;CACf,CAAC;AAEF,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,kCAAkC;AAC9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,sCAAsC;AAEhE,MAAM,gBAAgB,GAAG,CAAC,OAA+B,EAAE,EAAE;IAClE,IAAI,UAAU,CAAC;IACf,IAAI,IAAA,uBAAS,GAAE,EAAE;QACf,UAAU,GAAG,cAAc,CAAC;KAC7B;SAAM;QACL,UAAU,GAAG,kBAAkB,CAAC;KACjC;IAED,IAAI;QACF,IAAI,oCAAsB,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,EAAE;YACxD,IAAI,6BAAe,EAAE;gBACnB,IAAA,4BAAY,EAAC,yCAAyC,CAAC,CAAC;aACzD;YAED,MAAM,aAAa,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC;YAEtD,OAAO,aAAa;iBACjB,IAAI,CAAC,wBAAwB,EAAE;gBAC9B,OAAO,EAAE,kBAAkB;aAC5B,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC,CAAC,CAAC;SACrB;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;KACF;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-cloud",
-  "version": "13.0.0-beta.6",
+  "version": "13.0.0",
   "description": "Nx Cloud plugin for Nx",
   "keywords": [
     "Monorepo",