@midwayjs/bull 4.0.0-beta.8 → 4.0.0

package/dist/framework.js

@@ -106,20 +106,55 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
                 from: processor,
             });
             try {
-                ctx.logger.info(`start process job ${job.id} from ${processor.name}`);
-                const isPassed = await this.app
-                    .getFramework()
-                    .runGuard(ctx, processor, 'execute');
-                if (!isPassed) {
-                    throw new core_1.MidwayInvokeForbiddenError('execute', processor);
-                }
-                const service = await ctx.requestContext.getAsync(processor);
-                const fn = await this.applyMiddleware(async (ctx) => {
-                    return await core_1.Utils.toAsyncFunction(service.execute.bind(service))(job.data, job);
+                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 carrierDefault = job?.data?.__midwayTraceCarrier ?? {};
+                const carrier = typeof traceExtractor === 'function'
+                    ? traceExtractor({
+                        ctx,
+                        carrier: carrierDefault,
+                        request: job,
+                        custom: {
+                            queueName: queue.getQueueName(),
+                        },
+                    })
+                    : carrierDefault;
+                return await traceService.runWithEntrySpan(`bull ${queue.getQueueName()}`, {
+                    enable: traceEnabled,
+                    carrier: carrier ?? carrierDefault,
+                    attributes: {
+                        'midway.protocol': 'bull',
+                        'midway.bull.queue': queue.getQueueName(),
+                    },
+                    meta: traceMetaResolver,
+                    metaArgs: {
+                        ctx,
+                        carrier: carrier ?? carrierDefault,
+                        request: job,
+                        custom: {
+                            queueName: queue.getQueueName(),
+                        },
+                    },
+                }, async () => {
+                    ctx.logger.info(`start process job ${job.id} from ${processor.name}`);
+                    const isPassed = await this.app
+                        .getFramework()
+                        .runGuard(ctx, processor, 'execute');
+                    if (!isPassed) {
+                        throw new core_1.MidwayInvokeForbiddenError('execute', processor);
+                    }
+                    const service = await ctx.requestContext.getAsync(processor);
+                    const fn = await this.applyMiddleware(async (ctx) => {
+                        return await core_1.Utils.toAsyncFunction(service.execute.bind(service))(job.data, job);
+                    });
+                    const result = await Promise.resolve(await fn(ctx));
+                    ctx.logger.info(`complete process job ${job.id} from ${processor.name}`);
+                    return result;
                 });
-                const result = await Promise.resolve(await fn(ctx));
-                ctx.logger.info(`complete process job ${job.id} from ${processor.name}`);
-                return result;
             }
             catch (err) {
                 ctx.logger.error(err);
@@ -130,7 +165,42 @@ let BullFramework = class BullFramework extends core_1.BaseFramework {
     async addJobToQueue(queueName, jobData, options) {
         const queue = this.queueMap.get(queueName);
         if (queue) {
-            return await queue.addJobToQueue(jobData, options);
+            const traceService = this.applicationContext.get(core_1.MidwayTraceService);
+            const traceMetaResolver = this.configurationOptions?.tracing
+                ?.meta;
+            const traceEnabled = this.configurationOptions?.tracing?.enable !== false;
+            const traceInjector = this.configurationOptions?.tracing
+                ?.injector;
+            const payload = {
+                ...(jobData ?? {}),
+            };
+            const rawCarrier = typeof traceInjector === 'function'
+                ? traceInjector({
+                    request: jobData,
+                    custom: {
+                        queueName,
+                    },
+                })
+                : {};
+            const exitCarrier = rawCarrier && typeof rawCarrier === 'object' ? rawCarrier : {};
+            payload.__midwayTraceCarrier = exitCarrier;
+            await traceService.runWithExitSpan(`bull.produce ${queueName}`, {
+                enable: traceEnabled,
+                carrier: exitCarrier,
+                attributes: {
+                    'midway.protocol': 'bull',
+                    'midway.bull.queue': queueName,
+                },
+                meta: traceMetaResolver,
+                metaArgs: {
+                    carrier: exitCarrier,
+                    request: jobData,
+                    custom: {
+                        queueName,
+                    },
+                },
+            }, async () => undefined);
+            return await queue.addJobToQueue(payload, options);
         }
     }
     /**

package/index.d.ts

@@ -3,7 +3,6 @@ export * from './dist/index';
 export { Job, JobId } from 'bull';
 
 declare module '@midwayjs/core/dist/interface' {
-  // eslint-disable-next-line
   interface MidwayConfig {
     bull?: {
       defaultQueueOptions?: bull.QueueOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/bull",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0",
   "description": "midway component for bull",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,8 +24,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-beta.8",
-    "@midwayjs/mock": "^4.0.0-beta.8"
+    "@midwayjs/core": "^4.0.0",
+    "@midwayjs/mock": "^4.0.0"
   },
   "dependencies": {
     "bull": "4.16.5"
@@ -33,5 +33,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "355e55949fdd132b0bdcb4830222a0a027e92ded"
+  "gitHead": "014f32c23ebc1d5ac21777c76be2fd373ce992d8"
 }