@rayondigital/nest-dapr 0.9.59 → 0.9.61

package/dist/actors/actor-proxy-builder.js

@@ -73,8 +73,9 @@ class ActorProxyBuilder {
             }
             const originalBody = args.length > 0 ? args : null;
             const correlationId = this.daprContextService.getCorrelationId(true);
+            const traceId = this.daprContextService.getTraceId(true);
             const body = yield this.prepareBody(this.daprContextService, args, originalBody);
-            return yield this.actorClient.actor.invoke(actorTypeClassName, actorId, methodName, body, correlationId);
+            return yield this.actorClient.actor.invoke(actorTypeClassName, actorId, methodName, body, correlationId, traceId);
         });
     }
     prepareBody(daprContextService, args, body) {

package/dist/actors/nest-actor-manager.js

@@ -70,15 +70,17 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
         }
     }
     setupReentrancy(options) {
-        ActorClientHTTP_1.default.prototype.invoke = function (actorType, actorId, methodName, body, reentrancyId) {
+        ActorClientHTTP_1.default.prototype.invoke = function (actorType, actorId, methodName, body, reentrancyId, traceParent) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const urlSafeId = actorId.getURLSafeId();
                 const result = yield this.client.execute(`/actors/${actorType}/${urlSafeId}/method/${methodName}`, {
                     method: 'POST',
                     body,
                     headers: {
-                        'Dapr-Reentrancy-Id': reentrancyId !== null && reentrancyId !== void 0 ? reentrancyId : (0, crypto_1.randomUUID)(),
+                        'Dapr-Reentrancy-Id': (_a = reentrancyId !== null && reentrancyId !== void 0 ? reentrancyId : traceParent) !== null && _a !== void 0 ? _a : (0, crypto_1.randomUUID)(),
                         'X-Correlation-ID': reentrancyId,
+                        traceparent: traceParent,
                     },
                 });
                 return result;
@@ -119,6 +121,10 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
                                 if (correlationId) {
                                     contextService.setCorrelationId(correlationId);
                                 }
+                                const traceId = context[dapr_context_service_1.DAPR_TRACE_ID_KEY];
+                                if (traceId) {
+                                    contextService.setTraceId(traceId);
+                                }
                             }
                             if (invokeWrapperFn) {
                                 return yield invokeWrapperFn(actorId, methodName, data, originalCallActor.bind(this));

package/dist/dapr-context-service.d.ts

@@ -1,6 +1,7 @@
 import { ClsService } from 'nestjs-cls';
 export declare const DAPR_CONTEXT_KEY = "context";
 export declare const DAPR_CORRELATION_ID_KEY = "correlationId";
+export declare const DAPR_TRACE_ID_KEY = "traceId";
 export declare class DaprContextService {
     private readonly cls;
     constructor(cls: ClsService);
@@ -8,11 +9,15 @@ export declare class DaprContextService {
     getId(): string;
     setIdIfNotDefined(id?: string): void;
     getCorrelationId(createIfNotDefined?: boolean): any;
+    getTraceId(createIfNotDefined?: boolean): any;
     setCorrelationId(value?: string): void;
     setCorrelationIdIfNotDefined(value?: string): string;
+    setTraceId(value: string): void;
+    setTraceIdIfNotDefined(value?: string): string;
     setByKey<T>(key: string | symbol, value: T): void;
     setByKeyIfNotDefined<T>(key: string | symbol, value: T): any;
     set<T>(value: T): void;
     getByKey<T>(key: string): T | undefined;
     get<T>(): T | undefined;
+    private randomTraceId;
 }

package/dist/dapr-context-service.js

@@ -9,12 +9,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DaprContextService = exports.DAPR_CORRELATION_ID_KEY = exports.DAPR_CONTEXT_KEY = void 0;
+exports.DaprContextService = exports.DAPR_TRACE_ID_KEY = exports.DAPR_CORRELATION_ID_KEY = exports.DAPR_CONTEXT_KEY = void 0;
 const crypto_1 = require("crypto");
 const common_1 = require("@nestjs/common");
 const nestjs_cls_1 = require("nestjs-cls");
 exports.DAPR_CONTEXT_KEY = 'context';
 exports.DAPR_CORRELATION_ID_KEY = 'correlationId';
+exports.DAPR_TRACE_ID_KEY = 'traceId';
 let DaprContextService = class DaprContextService {
     constructor(cls) {
         this.cls = cls;
@@ -46,6 +47,18 @@ let DaprContextService = class DaprContextService {
             return this.setCorrelationIdIfNotDefined();
         return undefined;
     }
+    getTraceId(createIfNotDefined = false) {
+        const byKey = this.getByKey(exports.DAPR_TRACE_ID_KEY);
+        if (byKey)
+            return byKey;
+        const context = this.get();
+        if (context && context[exports.DAPR_TRACE_ID_KEY]) {
+            return context[exports.DAPR_TRACE_ID_KEY];
+        }
+        if (createIfNotDefined)
+            return this.setTraceIdIfNotDefined();
+        return undefined;
+    }
     setCorrelationId(value) {
         this.setByKey(exports.DAPR_CORRELATION_ID_KEY, value !== null && value !== void 0 ? value : (0, crypto_1.randomUUID)().toString());
     }
@@ -55,6 +68,15 @@ let DaprContextService = class DaprContextService {
         this.setByKeyIfNotDefined(exports.DAPR_CORRELATION_ID_KEY, value);
         return value;
     }
+    setTraceId(value) {
+        this.setByKey(exports.DAPR_TRACE_ID_KEY, value !== null && value !== void 0 ? value : (0, crypto_1.randomUUID)().toString());
+    }
+    setTraceIdIfNotDefined(value) {
+        if (!value)
+            value = this.randomTraceId();
+        this.setByKeyIfNotDefined(exports.DAPR_TRACE_ID_KEY, value);
+        return value;
+    }
     setByKey(key, value) {
         this.getService().set(key, value);
     }
@@ -84,12 +106,22 @@ let DaprContextService = class DaprContextService {
             if (!contextObject[exports.DAPR_CORRELATION_ID_KEY]) {
                 contextObject[exports.DAPR_CORRELATION_ID_KEY] = this.getByKey(exports.DAPR_CORRELATION_ID_KEY);
             }
+            if (!contextObject[exports.DAPR_TRACE_ID_KEY]) {
+                contextObject[exports.DAPR_TRACE_ID_KEY] = this.getByKey(exports.DAPR_TRACE_ID_KEY);
+            }
             return contextObject;
         }
         catch (error) {
             return undefined;
         }
     }
+    randomTraceId() {
+        const version = '00';
+        const traceId = (0, crypto_1.randomBytes)(16).toString('hex');
+        const spanId = (0, crypto_1.randomBytes)(8).toString('hex');
+        const traceFlags = '01';
+        return `${version}-${traceId}-${spanId}-${traceFlags}`;
+    }
 };
 DaprContextService = __decorate([
     (0, common_1.Injectable)(),

package/dist/opentelemetry/trace.d.ts

@@ -0,0 +1,4 @@
+import { Attributes, SpanKind } from '@opentelemetry/api';
+import { ClsService } from 'nestjs-cls';
+import { DaprContextService } from '../dapr-context-service';
+export declare function withTracedContext<T>(contextService: ClsService | DaprContextService | undefined, operationName: string, operation: () => Promise<T>, spanKind?: SpanKind, spanAttributes?: Attributes, tracerName?: string): Promise<T>;

package/dist/opentelemetry/trace.js

@@ -0,0 +1,55 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withTracedContext = void 0;
+const api_1 = require("@opentelemetry/api");
+const nestjs_cls_1 = require("nestjs-cls");
+const dapr_context_service_1 = require("../dapr-context-service");
+function withTracedContext(contextService, operationName, operation, spanKind = api_1.SpanKind.INTERNAL, spanAttributes = undefined, tracerName = 'nest-dapr') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tracer = api_1.trace.getTracer(tracerName);
+        const activeContext = api_1.context.active();
+        if (!activeContext) {
+            return yield operation();
+        }
+        const currentSpan = api_1.trace.getSpan(api_1.context.active());
+        const span = currentSpan !== null && currentSpan !== void 0 ? currentSpan : tracer.startSpan(operationName, { attributes: spanAttributes, kind: spanKind !== null && spanKind !== void 0 ? spanKind : api_1.SpanKind.SERVER });
+        const isNewSpan = !currentSpan;
+        if (contextService === undefined) {
+            contextService = nestjs_cls_1.ClsServiceManager.getClsService();
+        }
+        const spanContext = span.spanContext();
+        const traceId = `00-${spanContext.traceId}-${spanContext.spanId}-0${spanContext.traceFlags.toString(16)}`;
+        if (contextService instanceof nestjs_cls_1.ClsService) {
+            contextService.set(dapr_context_service_1.DAPR_TRACE_ID_KEY, traceId);
+        }
+        else {
+            contextService.setTraceId(traceId);
+        }
+        return api_1.context.with(api_1.trace.setSpan(activeContext, span), () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const result = yield operation();
+                if (isNewSpan) {
+                    span.end();
+                }
+                return result;
+            }
+            catch (error) {
+                span.recordException(error);
+                if (isNewSpan) {
+                    span.end();
+                }
+                throw error;
+            }
+        }));
+    });
+}
+exports.withTracedContext = withTracedContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.59",
+  "version": "0.9.61",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,9 +24,12 @@
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
+    "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/core": "^1.0.0",
+    "@opentelemetry/sdk-trace-base": "^1.0.0",
+    "eventemitter2": "^6.0.0",
     "nestjs-cls": "^3.4.0",
-    "rxjs": "^7.1.0",
-    "eventemitter2": "^6.0.0"
+    "rxjs": "^7.1.0"
   },
   "dependencies": {
     "@dapr/dapr": "^3.3.1",
@@ -35,6 +38,9 @@
   "devDependencies": {
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.44.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
+    "@opentelemetry/sdk-trace-node": "^1.23.0",
     "@types/jest": "^29.5.12",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "eslint": "^8.4.1",