@forge/tunnel 0.0.0-experimental-7c72fec → 0.0.0-experimental-c3d0263

package/CHANGELOG.md

@@ -1,13 +1,314 @@
 # @forge/tunnel
 
-## 0.0.0-experimental-7c72fec
+## 0.0.0-experimental-c3d0263
+
+### Minor Changes
+
+- cee5eea1: Observability improvements
+
+### Patch Changes
+
+- ca79652: Improve observability
+- Updated dependencies [cee5eea1]
+- Updated dependencies [e95919f]
+- Updated dependencies [56164fe]
+- Updated dependencies [949bd40]
+- Updated dependencies [ca79652]
+  - @forge/runtime@0.0.0-experimental-c3d0263
+  - @forge/csp@0.0.0-experimental-c3d0263
+  - @forge/cli-shared@0.0.0-experimental-c3d0263
+  - @forge/bundler@0.0.0-experimental-c3d0263
+
+## 1.6.0-next.9
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.8
+- @forge/bundler@3.0.1-next.9
+
+## 1.6.0-next.8
+
+### Patch Changes
+
+- ca79652: Improve observability
+- Updated dependencies [ca79652]
+  - @forge/runtime@1.15.0-next.2
+  - @forge/cli-shared@2.3.0-next.7
+  - @forge/bundler@3.0.1-next.8
+
+## 1.6.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [e95919f]
+  - @forge/csp@1.10.0-next.1
+  - @forge/cli-shared@2.3.0-next.6
+  - @forge/bundler@3.0.1-next.7
+
+## 1.6.0-next.6
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.5
+- @forge/bundler@3.0.1-next.6
+
+## 1.6.0-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.4
+- @forge/bundler@3.0.1-next.5
+
+## 1.6.0-next.4
+
+### Minor Changes
+
+- cee5eea: Observability improvements
+
+### Patch Changes
+
+- Updated dependencies [cee5eea]
+  - @forge/runtime@1.15.0-next.1
+  - @forge/cli-shared@2.3.0-next.3
+  - @forge/bundler@3.0.1-next.4
+
+## 1.5.3-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.2
+- @forge/bundler@3.0.1-next.3
+
+## 1.5.3-next.2
+
+### Patch Changes
+
+- Updated dependencies [56164fe]
+  - @forge/csp@1.10.0-next.0
+  - @forge/runtime@1.14.1-next.0
+  - @forge/bundler@3.0.1-next.2
+
+## 1.5.3-next.1
+
+### Patch Changes
+
+- @forge/cli-shared@2.3.0-next.1
+- @forge/bundler@3.0.1-next.1
+
+## 1.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies [949bd40]
+  - @forge/cli-shared@2.3.0-next.0
+  - @forge/bundler@3.0.1-next.0
+
+## 1.5.2
+
+### Patch Changes
+
+- Updated dependencies [1f6cf08]
+- Updated dependencies [f27cbfc]
+- Updated dependencies [04fcd8c]
+- Updated dependencies [3103a29]
+- Updated dependencies [60fcb01]
+- Updated dependencies [66f17fe]
+- Updated dependencies [25bcf54]
+- Updated dependencies [057cdfc]
+  - @forge/bundler@3.0.0
+  - @forge/runtime@1.14.0
+  - @forge/cli-shared@2.2.2
+
+## 1.5.2-next.11
+
+### Patch Changes
+
+- Updated dependencies [04fcd8c7]
+  - @forge/bundler@3.0.0-next.10
+
+## 1.5.2-next.10
+
+### Patch Changes
+
+- Updated dependencies [057cdfcc]
+  - @forge/bundler@3.0.0-next.9
+  - @forge/cli-shared@2.2.2-next.6
+
+## 1.5.2-next.9
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.5
+- @forge/bundler@3.0.0-next.8
+
+## 1.5.2-next.8
+
+### Patch Changes
+
+- Updated dependencies [3103a290]
+  - @forge/bundler@3.0.0-next.7
+  - @forge/cli-shared@2.2.2-next.4
+
+## 1.5.2-next.7
+
+### Patch Changes
+
+- Updated dependencies [66f17fe]
+  - @forge/runtime@1.14.0-next.1
+
+## 1.5.2-next.6
+
+### Patch Changes
+
+- Updated dependencies [60fcb01]
+  - @forge/bundler@3.0.0-next.6
+
+## 1.5.2-next.5
+
+### Patch Changes
+
+- Updated dependencies [1f6cf083]
+  - @forge/bundler@2.1.0-next.5
+
+## 1.5.2-next.4
+
+### Patch Changes
+
+- Updated dependencies [25bcf54e]
+  - @forge/runtime@1.14.0-next.0
+  - @forge/cli-shared@2.2.2-next.3
+  - @forge/bundler@2.0.1-next.4
+
+## 1.5.2-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.2
+- @forge/bundler@2.0.1-next.3
+
+## 1.5.2-next.2
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.1
+- @forge/bundler@2.0.1-next.2
+
+## 1.5.2-next.1
+
+### Patch Changes
+
+- Updated dependencies [f27cbfc]
+  - @forge/bundler@2.0.1-next.1
+
+## 1.5.2-next.0
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.2-next.0
+- @forge/bundler@2.0.1-next.0
+
+## 1.5.1
+
+### Patch Changes
+
+- Updated dependencies [37f9898]
+- Updated dependencies [037c31a5]
+- Updated dependencies [7d0ef8b]
+  - @forge/bundler@2.0.0
+  - @forge/runtime@1.13.0
+  - @forge/cli-shared@2.2.1
+
+## 1.5.1-next.13
+
+### Patch Changes
+
+- Updated dependencies [7d0ef8b]
+  - @forge/bundler@2.0.0-next.13
+
+## 1.5.1-next.12
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.9
+- @forge/bundler@2.0.0-next.12
+
+## 1.5.1-next.11
+
+### Patch Changes
+
+- Updated dependencies [37f9898]
+  - @forge/bundler@2.0.0-next.11
+
+## 1.5.1-next.10
+
+### Patch Changes
+
+- @forge/bundler@2.0.0-next.10
+- @forge/cli-shared@2.2.1-next.8
+
+## 1.5.1-next.9
+
+### Patch Changes
+
+- Updated dependencies [037c31a]
+  - @forge/bundler@2.0.0-next.9
+  - @forge/runtime@1.13.0-next.1
+  - @forge/cli-shared@2.2.1-next.7
+
+## 1.5.1-next.8
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.8
+
+## 1.5.1-next.7
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.6
+- @forge/bundler@1.1.1-next.7
+
+## 1.5.1-next.6
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.6
+
+## 1.5.1-next.5
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.5
+- @forge/bundler@1.1.1-next.5
+
+## 1.5.1-next.4
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.4
+- @forge/cli-shared@2.2.1-next.4
+
+## 1.5.1-next.3
+
+### Patch Changes
+
+- @forge/cli-shared@2.2.1-next.3
+- @forge/bundler@1.1.1-next.3
+
+## 1.5.1-next.2
+
+### Patch Changes
+
+- @forge/bundler@1.1.1-next.2
+- @forge/cli-shared@2.2.1-next.2
+
+## 1.5.1-next.1
 
 ### Patch Changes
 
-- @forge/cli-shared@0.0.0-experimental-7c72fec
-- @forge/csp@0.0.0-experimental-7c72fec
-- @forge/runtime@0.0.0-experimental-7c72fec
-- @forge/bundler@0.0.0-experimental-7c72fec
+- @forge/runtime@1.12.1-next.0
+- @forge/cli-shared@2.2.1-next.1
+- @forge/bundler@1.1.1-next.1
 
 ## 1.5.1-next.0
 

package/out/tunnelling/servers/dev-server.js

@@ -27,8 +27,8 @@ class LocalDevelopmentServer {
             }).filter((item) => typeof item === 'string')) !== null && _f !== void 0 ? _f : undefined;
             request._meta = Object.assign(Object.assign({}, request._meta), { fetchAllowList: allowList });
             try {
-                const body = await this.invocationService.invoke(request.handler, request);
-                res.json(body);
+                const invokeResults = await this.invocationService.invoke(request.handler, request);
+                res.json(invokeResults);
             }
             catch (error) {
                 try {

package/out/tunnelling/services/local-invocation-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAE9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;CA+CjF"}
+{"version":3,"file":"local-invocation-service.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/services/local-invocation-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,EACL,mBAAmB,EACnB,SAAS,EAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAyB,MAAM,mBAAmB,CAAC;AAG9E,qBAAa,sBAAuB,YAAW,iBAAiB;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS;IAG1B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;CAsDjF"}

package/out/tunnelling/services/local-invocation-service.js

@@ -8,6 +8,7 @@ const v4_1 = tslib_1.__importDefault(require("uuid/v4"));
 const runtime_1 = require("@forge/runtime");
 const cli_shared_1 = require("@forge/cli-shared");
 const interactors_1 = require("../command/interactors");
+const feature_flag_1 = require("@forge/runtime/out/feature-flag");
 class LocalInvocationService {
     constructor(configFile, logger, inspector) {
         this.configFile = configFile;
@@ -43,13 +44,17 @@ class LocalInvocationService {
             ctx: { requestId, traceId: requestId, timeout: interactors_1.INVOCATION_TIMEOUT }
         });
         const invocationLimits = runtime_1.perInvocationLimitsTrackerFactory(xenInvocationRequest);
-        const { body } = await runtime_1.invoke({
+        const { body, metrics } = await runtime_1.invoke({
             sandbox,
             xenInvocationRequest,
             invocationLimits,
             inspector: inspect ? this.inspector : undefined
         });
-        return body;
+        const reportMetrics = xenInvocationRequest.isFeatureFlagEnabled(feature_flag_1.XEN_RUNTIME_SHOULD_REPORT_METRICS);
+        if (reportMetrics && metrics) {
+            this.logger.debug(`Metrics: ${JSON.stringify(metrics, null, 2)}`);
+        }
+        return reportMetrics ? { body, metrics } : body;
     }
 }
 exports.LocalInvocationService = LocalInvocationService;

package/out/tunnelling/util/invocation-utils.d.ts

@@ -5,9 +5,15 @@ interface LambdaError {
     errorMessage: string;
     stack: string[];
     serviceKey?: string;
+    metrics?: {
+        [key: string]: any;
+    }[];
 }
 interface InvokeFunctionErrors extends Error {
     serviceKey?: string;
+    metrics?: {
+        [key: string]: any;
+    }[];
 }
 export declare const toLambdaError: (error: InvokeFunctionErrors) => LambdaError;
 export declare const getRequestId: (request: any, value?: string) => string;

package/out/tunnelling/util/invocation-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/util/invocation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAK3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAO3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,0BAY3C,CAAC"}
+{"version":3,"file":"invocation-utils.d.ts","sourceRoot":"","sources":["../../../src/tunnelling/util/invocation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAK3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;CACpC;AAED,UAAU,oBAAqB,SAAQ,KAAK;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,CAAC;CACpC;AAED,eAAO,MAAM,aAAa,UAAW,oBAAoB,KAAG,WAQ3D,CAAC;AAEF,eAAO,MAAM,YAAY,YAAa,GAAG,qBAAsB,MAU9D,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAa,MAAM,WAAW,GAAG,KAAG,MAGhE,CAAC;AAMF,eAAO,MAAM,eAAe,QAAO,MAOlC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,UAAU,KAAG,MAUpD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,MAAM,KAAG,0BAY3C,CAAC"}

package/out/tunnelling/util/invocation-utils.js

@@ -7,7 +7,8 @@ exports.toLambdaError = (error) => {
         errorMessage: error.message,
         errorType: error.name,
         stack: (error.stack || '').split('\n'),
-        serviceKey: error.serviceKey
+        serviceKey: error.serviceKey,
+        metrics: error.metrics
     };
 };
 exports.getRequestId = (request, value = 'unknown') => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/tunnel",
-  "version": "0.0.0-experimental-7c72fec",
+  "version": "0.0.0-experimental-c3d0263",
   "description": "Tunnel functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,11 +16,11 @@
     "postbuild": "chmod +x out/*.js"
   },
   "dependencies": {
-    "@forge/bundler": "0.0.0-experimental-7c72fec",
-    "@forge/cli-shared": "0.0.0-experimental-7c72fec",
-    "@forge/csp": "^0.0.0-experimental-7c72fec",
+    "@forge/bundler": "0.0.0-experimental-c3d0263",
+    "@forge/cli-shared": "0.0.0-experimental-c3d0263",
+    "@forge/csp": "^0.0.0-experimental-c3d0263",
     "@forge/isolated-vm": "3.3.10",
-    "@forge/runtime": "0.0.0-experimental-7c72fec",
+    "@forge/runtime": "0.0.0-experimental-c3d0263",
     "express": "^4.17.1",
     "express-mung": "^0.5.1",
     "http-proxy-middleware": "^1.0.6",
@@ -31,7 +31,7 @@
     "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@forge/manifest": "^0.0.0-experimental-7c72fec",
+    "@forge/manifest": "^0.0.0-experimental-c3d0263",
     "@types/express": "^4.17.2",
     "@types/express-mung": "^0.5.2",
     "@types/jest": "^26.0.0",
@@ -40,7 +40,7 @@
     "@types/supertest": "^2.0.10",
     "@types/tmp": "^0.1.0",
     "@types/uuid": "^3.4.7",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2.6.1",
     "supertest": "^6.1.3"
   },
   "optionalDependencies": {