@midwayjs/otel 3.10.4 → 3.10.6

package/dist/configuration.d.ts

@@ -1,8 +1,9 @@
-import { MidwayDecoratorService } from '@midwayjs/core';
+import { MidwayApplicationManager, MidwayDecoratorService } from '@midwayjs/core';
 import { TraceService } from './service';
 export declare class OtelConfiguration {
     decoratorService: MidwayDecoratorService;
     traceService: TraceService;
+    applicationManager: MidwayApplicationManager;
     onReady(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -43,6 +43,16 @@ let OtelConfiguration = class OtelConfiguration {
                 },
             };
         });
+        const apps = this.applicationManager.getApplications(['egg', 'koa']);
+        for (const app of apps) {
+            Object.defineProperties(app.context, {
+                traceId: {
+                    get: () => {
+                        return this.traceService.getTraceId();
+                    },
+                },
+            });
+        }
     }
 };
 __decorate([
@@ -53,6 +63,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", service_1.TraceService)
 ], OtelConfiguration.prototype, "traceService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", core_1.MidwayApplicationManager)
+], OtelConfiguration.prototype, "applicationManager", void 0);
 OtelConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'otel',

package/dist/service.js

@@ -21,7 +21,8 @@ let TraceService = class TraceService {
         return api_1.trace.getSpan(api_1.context.active());
     }
     getTraceId() {
-        return this.getCurrentSpan().spanContext().traceId;
+        var _a;
+        return (_a = this.getCurrentSpan()) === null || _a === void 0 ? void 0 : _a.spanContext().traceId;
     }
     createSpan(name, callback) {
         return api_1.trace.getTracer(this.currentTracerName).startActiveSpan(name, {

package/index.d.ts

@@ -5,3 +5,15 @@ declare module '@midwayjs/core/dist/interface' {
     otel?: Record<string, any>;
   }
 }
+
+declare module '@midwayjs/koa/dist/interface' {
+  interface Context {
+    traceId: string;
+  }
+}
+
+declare module '@midwayjs/web/dist/interface' {
+  interface Context {
+    traceId: string;
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/otel",
   "description": "midway open telemetry component",
-  "version": "3.10.4",
+  "version": "3.10.6",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -10,9 +10,9 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.10.4",
-    "@midwayjs/koa": "^3.10.4",
-    "@midwayjs/mock": "^3.10.4",
+    "@midwayjs/core": "^3.10.6",
+    "@midwayjs/koa": "^3.10.6",
+    "@midwayjs/mock": "^3.10.6",
     "@opentelemetry/core": "^1.0.1",
     "@opentelemetry/sdk-trace-base": "^1.0.1",
     "@opentelemetry/sdk-trace-node": "^1.0.1"
@@ -41,5 +41,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "fb3b02bfe884e3477f81d34fc9941f2701e826f3"
+  "gitHead": "9d5babd57efe4c24415fcb3511bc4ca7c1bcb1b2"
 }