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

package/dist/manager.d.ts

@@ -1,11 +1,16 @@
-import { ServiceFactory, ServiceFactoryConfigOption, ILogger } from '@midwayjs/core';
+import { MidwayTraceService, ServiceFactory, ServiceFactoryConfigOption, ILogger } from '@midwayjs/core';
 import Redis from 'ioredis';
 import { RedisConfigOptions } from './interface';
 export declare class RedisServiceFactory extends ServiceFactory<Redis> {
     protected redisConfig: ServiceFactoryConfigOption<RedisConfigOptions>;
     protected init(): Promise<void>;
     protected logger: ILogger;
+    protected traceService: MidwayTraceService;
+    protected traceMetaResolver: any;
+    protected traceEnabled: any;
+    protected traceInjector: any;
     protected createClient(config: any, name: string): Promise<Redis>;
+    protected bindTraceContext(client: Redis, clientName: string): void;
     getName(): string;
     protected destroyClient(redisInstance: Redis, name: string): Promise<void>;
 }

package/dist/manager.js

@@ -21,6 +21,10 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
         });
     }
     logger;
+    traceService;
+    traceMetaResolver;
+    traceEnabled;
+    traceInjector;
     async createClient(config, name) {
         let client;
         if (config.cluster === true) {
@@ -54,8 +58,51 @@ let RedisServiceFactory = class RedisServiceFactory extends core_1.ServiceFactor
                 reject(err);
             });
         });
+        this.bindTraceContext(client, name);
         return client;
     }
+    bindTraceContext(client, clientName) {
+        if (!client || !this.traceService) {
+            return;
+        }
+        const rawSendCommand = client.sendCommand?.bind(client);
+        if (!rawSendCommand) {
+            return;
+        }
+        client.sendCommand = (command, stream) => {
+            const commandName = command?.name?.toLowerCase?.() || command?.name || 'unknown';
+            const rawCarrier = typeof this.traceInjector === 'function'
+                ? this.traceInjector({
+                    request: command,
+                    custom: {
+                        clientName,
+                        commandName,
+                    },
+                })
+                : {};
+            const carrier = rawCarrier && typeof rawCarrier === 'object' ? rawCarrier : {};
+            return this.traceService.runWithExitSpan(`redis.${commandName}`, {
+                enable: this.traceEnabled !== false,
+                carrier,
+                attributes: {
+                    'midway.protocol': 'redis',
+                    'midway.redis.command': commandName,
+                    'midway.redis.client': clientName,
+                },
+                meta: this.traceMetaResolver,
+                metaArgs: {
+                    carrier,
+                    request: command,
+                    custom: {
+                        clientName,
+                        commandName,
+                    },
+                },
+            }, async () => {
+                return rawSendCommand(command, stream);
+            });
+        };
+    }
     getName() {
         return 'redis';
     }
@@ -89,6 +136,22 @@ __decorate([
     (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], RedisServiceFactory.prototype, "logger", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayTraceService)
+], RedisServiceFactory.prototype, "traceService", void 0);
+__decorate([
+    (0, core_1.Config)('redis.tracing.meta'),
+    __metadata("design:type", Object)
+], RedisServiceFactory.prototype, "traceMetaResolver", void 0);
+__decorate([
+    (0, core_1.Config)('redis.tracing.enable'),
+    __metadata("design:type", Object)
+], RedisServiceFactory.prototype, "traceEnabled", void 0);
+__decorate([
+    (0, core_1.Config)('redis.tracing.injector'),
+    __metadata("design:type", Object)
+], RedisServiceFactory.prototype, "traceInjector", void 0);
 exports.RedisServiceFactory = RedisServiceFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/redis",
   "description": "midway redis component",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-beta.11",
-    "@midwayjs/mock": "^4.0.0-beta.11"
+    "@midwayjs/core": "^4.0.0-beta.12",
+    "@midwayjs/mock": "^4.0.0-beta.12"
   },
   "dependencies": {
     "ioredis": "5.4.2"
@@ -35,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
+  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
 }