@rayondigital/nest-dapr 0.9.58 → 0.9.60

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(correlationId);
+                                }
                             }
                             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);
     }
@@ -90,6 +112,13 @@ let DaprContextService = class DaprContextService {
             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/index.d.ts

@@ -5,6 +5,7 @@ import { SerializableError } from './actors/serializable-error';
 import { StatefulActorOf } from './actors/stateful-actor-of';
 import { IState, StatefulActor } from './actors/stateful.actor';
 import { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA } from './constants';
+import { DaprActorOnEvent } from './dapr-actor-on-event.decorator';
 import { State } from './dapr-actor-state.decorator';
 import { DaprActor, DaprActorMetadata } from './dapr-actor.decorator';
 import { DaprBinding, DaprBindingMetadata } from './dapr-binding.decorator';
@@ -15,4 +16,4 @@ import { DaprPubSub, DaprPubSubMetadata } from './dapr-pubsub.decorator';
 import { DaprLoader } from './dapr.loader';
 import { DaprContextProvider, DaprModule } from './dapr.module';
 import { DaprPubSubClient } from './pubsub/dapr-pubsub-client.service';
-export { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA, DaprMetadataAccessor, DaprBindingMetadata, DaprBinding, DaprPubSubMetadata, DaprPubSub, DaprActorMetadata, State, DaprActor, DaprLoader, DaprModule, DaprActorClient, DaprContextService, DaprContextProvider, ActorRuntimeService, DaprPubSubClient, DaprClientCache, DaprEventEmitter, StatefulActor, StatefulActorOf, IState, SerializableError, };
+export { DAPR_BINDING_METADATA, DAPR_PUBSUB_METADATA, DAPR_ACTOR_METADATA, DAPR_ACTOR_STATE_METADATA, DaprMetadataAccessor, DaprBindingMetadata, DaprBinding, DaprPubSubMetadata, DaprPubSub, DaprActorMetadata, State, DaprActor, DaprLoader, DaprModule, DaprActorClient, DaprContextService, DaprContextProvider, ActorRuntimeService, DaprPubSubClient, DaprClientCache, DaprEventEmitter, StatefulActor, StatefulActorOf, IState, SerializableError, DaprActorOnEvent, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SerializableError = exports.StatefulActorOf = exports.StatefulActor = exports.DaprEventEmitter = exports.DaprClientCache = exports.DaprPubSubClient = exports.ActorRuntimeService = exports.DaprContextProvider = exports.DaprContextService = exports.DaprActorClient = exports.DaprModule = exports.DaprLoader = exports.DaprActor = exports.State = exports.DaprPubSub = exports.DaprBinding = exports.DaprMetadataAccessor = exports.DAPR_ACTOR_STATE_METADATA = exports.DAPR_ACTOR_METADATA = exports.DAPR_PUBSUB_METADATA = exports.DAPR_BINDING_METADATA = void 0;
+exports.DaprActorOnEvent = exports.SerializableError = exports.StatefulActorOf = exports.StatefulActor = exports.DaprEventEmitter = exports.DaprClientCache = exports.DaprPubSubClient = exports.ActorRuntimeService = exports.DaprContextProvider = exports.DaprContextService = exports.DaprActorClient = exports.DaprModule = exports.DaprLoader = exports.DaprActor = exports.State = exports.DaprPubSub = exports.DaprBinding = exports.DaprMetadataAccessor = exports.DAPR_ACTOR_STATE_METADATA = exports.DAPR_ACTOR_METADATA = exports.DAPR_PUBSUB_METADATA = exports.DAPR_BINDING_METADATA = void 0;
 const actor_runtime_service_1 = require("./actors/actor-runtime.service");
 Object.defineProperty(exports, "ActorRuntimeService", { enumerable: true, get: function () { return actor_runtime_service_1.ActorRuntimeService; } });
 const client_cache_1 = require("./actors/client-cache");
@@ -18,6 +18,8 @@ Object.defineProperty(exports, "DAPR_BINDING_METADATA", { enumerable: true, get:
 Object.defineProperty(exports, "DAPR_PUBSUB_METADATA", { enumerable: true, get: function () { return constants_1.DAPR_PUBSUB_METADATA; } });
 Object.defineProperty(exports, "DAPR_ACTOR_METADATA", { enumerable: true, get: function () { return constants_1.DAPR_ACTOR_METADATA; } });
 Object.defineProperty(exports, "DAPR_ACTOR_STATE_METADATA", { enumerable: true, get: function () { return constants_1.DAPR_ACTOR_STATE_METADATA; } });
+const dapr_actor_on_event_decorator_1 = require("./dapr-actor-on-event.decorator");
+Object.defineProperty(exports, "DaprActorOnEvent", { enumerable: true, get: function () { return dapr_actor_on_event_decorator_1.DaprActorOnEvent; } });
 const dapr_actor_state_decorator_1 = require("./dapr-actor-state.decorator");
 Object.defineProperty(exports, "State", { enumerable: true, get: function () { return dapr_actor_state_decorator_1.State; } });
 const dapr_actor_decorator_1 = require("./dapr-actor.decorator");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayondigital/nest-dapr",
-  "version": "0.9.58",
+  "version": "0.9.60",
   "description": "Develop NestJs microservices using Dapr pubsub, actors and other bindings",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",