@rayondigital/nest-dapr 0.9.60 → 0.9.62

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

@@ -123,7 +123,7 @@ let NestActorManager = NestActorManager_1 = class NestActorManager {
                                 }
                                 const traceId = context[dapr_context_service_1.DAPR_TRACE_ID_KEY];
                                 if (traceId) {
-                                    contextService.setTraceId(correlationId);
+                                    contextService.setTraceId(traceId);
                                 }
                             }
                             if (invokeWrapperFn) {

package/dist/dapr-context-service.js

@@ -106,6 +106,9 @@ 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) {

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,58 @@
+"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* () {
+        if (!api_1.trace || !api_1.context) {
+            return yield operation();
+        }
+        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.60",
+  "version": "0.9.62",
   "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",