@midwayjs/commander 4.0.0-beta.11 → 4.0.0-beta.12

package/dist/framework.js

@@ -170,13 +170,48 @@ let MidwayCommanderFramework = class MidwayCommanderFramework extends core_1.Bas
                 ctx.args = actualArgs;
                 ctx.options = actualOptions;
                 ctx.commandName = metadata.name;
-                const fn = await this.applyMiddleware(async (ctx) => {
-                    const commandInstance = (await ctx.requestContext.getAsync(module));
-                    if (commandInstance.run) {
-                        return await commandInstance.run(actualArgs, actualOptions);
-                    }
+                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 entryCarrier = typeof traceExtractor === 'function'
+                    ? traceExtractor({
+                        ctx,
+                        custom: {
+                            commandName: metadata.name,
+                            args: actualArgs,
+                            options: actualOptions,
+                        },
+                    })
+                    : {};
+                const result = await traceService.runWithEntrySpan(`commander ${metadata.name}`, {
+                    enable: traceEnabled,
+                    carrier: entryCarrier,
+                    attributes: {
+                        'midway.protocol': 'commander',
+                        'midway.command.name': metadata.name,
+                    },
+                    meta: traceMetaResolver,
+                    metaArgs: {
+                        ctx,
+                        carrier: entryCarrier,
+                        custom: {
+                            commandName: metadata.name,
+                            args: actualArgs,
+                            options: actualOptions,
+                        },
+                    },
+                }, async () => {
+                    const fn = await this.applyMiddleware(async (ctx) => {
+                        const commandInstance = (await ctx.requestContext.getAsync(module));
+                        if (commandInstance.run) {
+                            return await commandInstance.run(actualArgs, actualOptions);
+                        }
+                    });
+                    return await fn(ctx);
                 });
-                const result = await fn(ctx);
                 await this.outputResult(result);
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/commander",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "Midway Commander Framework",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,16 +23,16 @@
     "lint": "mwts check"
   },
   "dependencies": {
-    "@midwayjs/core": "^4.0.0-beta.11",
-    "commander": "14.0.2",
+    "@midwayjs/core": "^4.0.0-beta.12",
+    "commander": "14.0.3",
     "enquirer": "2.4.1"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^4.0.0-beta.11"
+    "@midwayjs/mock": "^4.0.0-beta.12"
   },
   "engines": {
     "node": ">=20"
   },
   "license": "MIT",
-  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
+  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
 }