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

package/dist/manager.d.ts

@@ -1,9 +1,14 @@
-import { ServiceFactory } from '@midwayjs/core';
+import { ServiceFactory, MidwayTraceService } from '@midwayjs/core';
 import { TableStoreClient } from './interface';
 export declare class TableStoreServiceFactory extends ServiceFactory<TableStoreClient> {
     tableStoreConfig: any;
+    protected traceService: MidwayTraceService;
+    protected traceMetaResolver: any;
+    protected traceEnabled: any;
+    protected traceInjector: any;
     init(): Promise<void>;
     createClient(config: any): Promise<TableStoreClient>;
+    protected bindTraceContext(client: any): void;
     getName(): string;
 }
 export declare class TableStoreService implements TableStoreClient {

package/dist/manager.js

@@ -14,13 +14,61 @@ const core_1 = require("@midwayjs/core");
 const TableStore = require("tablestore");
 let TableStoreServiceFactory = class TableStoreServiceFactory extends core_1.ServiceFactory {
     tableStoreConfig;
+    traceService;
+    traceMetaResolver;
+    traceEnabled;
+    traceInjector;
     async init() {
         await this.initClients(this.tableStoreConfig, {
             concurrent: true,
         });
     }
     async createClient(config) {
-        return new TableStore.Client(config);
+        const client = new TableStore.Client(config);
+        this.bindTraceContext(client);
+        return client;
+    }
+    bindTraceContext(client) {
+        if (!client || !this.traceService) {
+            return;
+        }
+        const rawMakeRequest = client.makeRequest?.bind(client);
+        if (!rawMakeRequest) {
+            return;
+        }
+        client.makeRequest = (...args) => {
+            if (typeof args[1] === 'function' || typeof args[2] === 'function') {
+                return rawMakeRequest(...args);
+            }
+            const operation = args?.[0] || 'request';
+            const rawCarrier = typeof this.traceInjector === 'function'
+                ? this.traceInjector({
+                    request: args,
+                    custom: {
+                        operation: String(operation),
+                    },
+                })
+                : {};
+            const carrier = rawCarrier && typeof rawCarrier === 'object' ? rawCarrier : {};
+            return this.traceService.runWithExitSpan(`tablestore.${String(operation).toLowerCase()}`, {
+                enable: this.traceEnabled !== false,
+                carrier,
+                attributes: {
+                    'midway.protocol': 'tablestore',
+                    'midway.tablestore.operation': String(operation),
+                },
+                meta: this.traceMetaResolver,
+                metaArgs: {
+                    carrier,
+                    request: args,
+                    custom: {
+                        operation: String(operation),
+                    },
+                },
+            }, async () => {
+                return rawMakeRequest(...args);
+            });
+        };
     }
     getName() {
         return 'tableStore';
@@ -31,6 +79,22 @@ __decorate([
     (0, core_1.Config)('tableStore'),
     __metadata("design:type", Object)
 ], TableStoreServiceFactory.prototype, "tableStoreConfig", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayTraceService)
+], TableStoreServiceFactory.prototype, "traceService", void 0);
+__decorate([
+    (0, core_1.Config)('tableStore.tracing.meta'),
+    __metadata("design:type", Object)
+], TableStoreServiceFactory.prototype, "traceMetaResolver", void 0);
+__decorate([
+    (0, core_1.Config)('tableStore.tracing.enable'),
+    __metadata("design:type", Object)
+], TableStoreServiceFactory.prototype, "traceEnabled", void 0);
+__decorate([
+    (0, core_1.Config)('tableStore.tracing.injector'),
+    __metadata("design:type", Object)
+], TableStoreServiceFactory.prototype, "traceInjector", void 0);
 __decorate([
     (0, core_1.Init)(),
     __metadata("design:type", Function),

package/dist/util.js

@@ -10,18 +10,20 @@ const formatToString = value => {
 const formatRow = (row, filterColumn) => {
     filterColumn = filterColumn || {};
     const rowData = {};
-    row.primaryKey &&
+    if (row.primaryKey) {
         row.primaryKey.map(pk => {
             if (filterColumn[pk.name])
                 return;
             rowData[pk.name] = formatToString(pk.value);
         });
-    row.attributes &&
+    }
+    if (row.attributes) {
         row.attributes.map(item => {
             if (filterColumn[item.columnName])
                 return;
             rowData[item.columnName] = formatToString(item.columnValue);
         });
+    }
     return rowData;
 };
 exports.formatRow = formatRow;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/tablestore",
   "description": "midway tablestore 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": {
     "int64-buffer": "1.0.1",
@@ -37,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
+  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
 }