@midwayjs/etcd 4.0.0-beta.11 → 4.0.0-beta.13

package/dist/manager.d.ts

@@ -1,10 +1,15 @@
-import { ServiceFactory } from '@midwayjs/core';
+import { ServiceFactory, MidwayTraceService } from '@midwayjs/core';
 import { Etcd3, IOptions } from 'etcd3';
 export declare class ETCDServiceFactory extends ServiceFactory<Etcd3> {
     etcdConfig: any;
     init(): Promise<void>;
     logger: any;
+    protected traceService: MidwayTraceService;
+    protected traceMetaResolver: any;
+    protected traceEnabled: any;
+    protected traceInjector: any;
     createClient(config: IOptions): Promise<Etcd3>;
+    protected bindTraceContext(client: Etcd3): void;
     getName(): string;
     destroyClient(client: Etcd3): Promise<void>;
 }

package/dist/manager.js

@@ -20,9 +20,57 @@ let ETCDServiceFactory = class ETCDServiceFactory extends core_1.ServiceFactory
         });
     }
     logger;
+    traceService;
+    traceMetaResolver;
+    traceEnabled;
+    traceInjector;
     async createClient(config) {
         this.logger.info('[midway:etcd] init %s', config.hosts);
-        return new etcd3_1.Etcd3(config);
+        const client = new etcd3_1.Etcd3(config);
+        this.bindTraceContext(client);
+        return client;
+    }
+    bindTraceContext(client) {
+        if (!client || !this.traceService) {
+            return;
+        }
+        const pool = client.pool;
+        const rawExec = pool?.exec?.bind(pool);
+        if (!rawExec) {
+            return;
+        }
+        pool.exec = (serviceName, method, payload, options) => {
+            const rawCarrier = typeof this.traceInjector === 'function'
+                ? this.traceInjector({
+                    request: payload,
+                    custom: {
+                        serviceName: String(serviceName),
+                        method: String(method),
+                    },
+                })
+                : {};
+            const carrier = rawCarrier && typeof rawCarrier === 'object' ? rawCarrier : {};
+            return this.traceService.runWithExitSpan(`etcd.${String(method).toLowerCase()}`, {
+                enable: this.traceEnabled !== false,
+                carrier,
+                attributes: {
+                    'midway.protocol': 'etcd',
+                    'midway.etcd.service': String(serviceName),
+                    'midway.etcd.method': String(method),
+                },
+                meta: this.traceMetaResolver,
+                metaArgs: {
+                    carrier,
+                    request: payload,
+                    custom: {
+                        serviceName: String(serviceName),
+                        method: String(method),
+                    },
+                },
+            }, async () => {
+                return rawExec(serviceName, method, payload, options);
+            });
+        };
     }
     getName() {
         return 'etcd';
@@ -46,6 +94,22 @@ __decorate([
     (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], ETCDServiceFactory.prototype, "logger", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayTraceService)
+], ETCDServiceFactory.prototype, "traceService", void 0);
+__decorate([
+    (0, core_1.Config)('etcd.tracing.meta'),
+    __metadata("design:type", Object)
+], ETCDServiceFactory.prototype, "traceMetaResolver", void 0);
+__decorate([
+    (0, core_1.Config)('etcd.tracing.enable'),
+    __metadata("design:type", Object)
+], ETCDServiceFactory.prototype, "traceEnabled", void 0);
+__decorate([
+    (0, core_1.Config)('etcd.tracing.injector'),
+    __metadata("design:type", Object)
+], ETCDServiceFactory.prototype, "traceInjector", void 0);
 exports.ETCDServiceFactory = ETCDServiceFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/etcd",
   "description": "midway etcd component",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.13",
   "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.13",
+    "@midwayjs/mock": "^4.0.0-beta.13"
   },
   "dependencies": {
     "etcd3": "1.1.2"
@@ -36,5 +36,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
+  "gitHead": "9a38b66a84a6880370cac90d737f94f9c5f2f256"
 }