@midwayjs/faas 4.0.0-beta.10 → 4.0.0-beta.12

package/dist/framework.js

@@ -212,7 +212,47 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         if (this.configurationOptions.applicationAdapter?.runContextHook) {
             this.configurationOptions.applicationAdapter.runContextHook(context);
         }
-        const result = await (await this.applyMiddleware(async (ctx, next) => {
+        const traceService = this.applicationContext.get(core_1.MidwayTraceService);
+        const traceMetaResolver = this.configurationOptions?.tracing?.meta;
+        const traceEnabled = this.configurationOptions?.tracing?.enable !== false;
+        const traceExtractor = this.configurationOptions?.tracing
+            ?.extractor;
+        const entryCarrierDefault = isHttpFunction
+            ? context.headers || {}
+            : context.originEvent?.headers ||
+                context.originEvent?.properties ||
+                context.originEvent ||
+                {};
+        const entryCarrier = typeof traceExtractor === 'function'
+            ? traceExtractor({
+                ctx: context,
+                request: context.originEvent,
+                response: context.originContext,
+                custom: {
+                    handlerMapping,
+                    isHttpFunction,
+                },
+            })
+            : entryCarrierDefault;
+        const result = await traceService.runWithEntrySpan(`faas ${handlerMapping}`, {
+            enable: traceEnabled,
+            carrier: entryCarrier ?? entryCarrierDefault,
+            attributes: {
+                'midway.protocol': isHttpFunction ? 'faas-http' : 'faas-event',
+                'midway.faas.handler': handlerMapping,
+            },
+            meta: traceMetaResolver,
+            metaArgs: {
+                ctx: context,
+                carrier: entryCarrier ?? entryCarrierDefault,
+                request: context.originEvent,
+                response: context.originContext,
+                custom: {
+                    handlerMapping,
+                    isHttpFunction,
+                },
+            },
+        }, async () => await (await this.applyMiddleware(async (ctx, next) => {
             const fn = await this.middlewareService.compose([
                 ...(isHttpFunction
                     ? this.httpMiddlewareManager
@@ -245,7 +285,7 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 },
             ], this.app);
             return await fn(ctx, next);
-        }))(context);
+        }))(context));
         if (isHttpFunction) {
             if (options.isCustomHttpResponse) {
                 return context.body;

package/dist/starter.js

@@ -50,7 +50,8 @@ class AbstractBootstrapStarter {
     }
     async initFramework(bootstrapOptions = {}) {
         // init midway
-        this.applicationContext = await (0, core_1.initializeGlobalApplicationContext)(bootstrapOptions);
+        this.applicationContext =
+            await (0, core_1.initializeGlobalApplicationContext)(bootstrapOptions);
         const midwayFrameworkService = this.applicationContext.get(core_1.MidwayFrameworkService);
         this.framework = midwayFrameworkService.getMainFramework();
     }

package/index.d.ts

@@ -84,7 +84,7 @@ interface TableStoreRecord {
     {
       ColumnName: string;
       Value: any;
-    }
+    },
   ];
   Columns: [
     {
@@ -92,7 +92,7 @@ interface TableStoreRecord {
       ColumnName: string;
       Value: any;
       Timestamp: number;
-    }
+    },
   ];
 }
 

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@midwayjs/faas",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "description": "Midway Framework for FaaS (Function as a Service)",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^4.0.0-beta.10",
-    "@midwayjs/serverless-http-parser": "^4.0.0-beta.10",
+    "@midwayjs/core": "^4.0.0-beta.12",
+    "@midwayjs/serverless-http-parser": "^4.0.0-beta.12",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
     "@midwayjs/cookies": "^1.0.2",
     "@midwayjs/logger": "^4.0.0",
-    "@midwayjs/mock": "^4.0.0-beta.10",
+    "@midwayjs/mock": "^4.0.0-beta.12",
     "mm": "3.4.0"
   },
   "engines": {
@@ -44,5 +44,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "1b1856629913703f67304155aaf611ec936a81ac"
+  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
 }