@vtvlive/interactive-apm 0.0.13 → 0.0.15

package/dist/interfaces/tracing-provider.interface.d.ts

@@ -1,4 +1,4 @@
-import { ISpan, SpanKind } from "../types/apm.types";
+import { ISpan, SpanAttributes, SpanAttributeValue, SpanKind } from "../types/apm.types";
 /**
  * Interface chung cho APM Tracing Provider
  * Cho phép switch giữa OpenTelemetry và Elastic APM thông qua DI
@@ -16,7 +16,7 @@ export interface ITracingProvider {
      * @param spanKind Loại span (INTERNAL, SERVER, CLIENT, PRODUCER, CONSUMER, WEBSOCKET, OTHER)
      * @returns Span object - cần gọi end() khi hoàn thành
      */
-    startSpan(name: string, attributes?: Record<string, string | number>, spanKind?: SpanKind): ISpan | null;
+    startSpan(name: string, attributes?: SpanAttributes, spanKind?: SpanKind): ISpan | null;
     /**
      * Thực thi function với context tracing (auto-close span)
      * @param name Tên của span
@@ -24,7 +24,7 @@ export interface ITracingProvider {
      * @param attributes Các attributes metadata
      * @returns Kết quả của function
      */
-    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: Record<string, string | number>): Promise<T>;
+    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: SpanAttributes): Promise<T>;
     /**
      * Capture error vào active span hiện tại
      * @param error Error object
@@ -35,7 +35,13 @@ export interface ITracingProvider {
      * @param key Tên attribute
      * @param value Giá trị attribute
      */
-    setAttribute(key: string, value: string | number): void;
+    setAttribute(key: string, value: SpanAttributeValue): void;
+    /**
+     * Set label/attribute cho active transaction hiện tại
+     * @param key Tên label
+     * @param value Giá trị label
+     */
+    setTransactionLabel(key: string, value: SpanAttributeValue): void;
     /**
      * Force flush all pending spans
      */

package/dist/interfaces/tracing-provider.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracing-provider.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/tracing-provider.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;;;;OAMG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,QAAQ,CAAC,EAAE,QAAQ,GAClB,KAAK,GAAG,IAAI,CAAC;IAEhB;;;;;;OAMG;IACH,mBAAmB,CAAC,CAAC,EACnB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEjC;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAExD;;OAEG;IACH,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;OAGG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAErD;;OAEG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}
+{"version":3,"file":"tracing-provider.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/tracing-provider.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEzF;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC;IAExF;;;;;;OAMG;IACH,mBAAmB,CAAC,CAAC,EACnB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAEjC;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAE3D;;;;OAIG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAElE;;OAEG;IACH,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B;;;OAGG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAErD;;OAEG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B"}

package/dist/providers/elastic-apm.tracing-provider.d.ts

@@ -1,12 +1,12 @@
 import { SpanKind } from "../types/apm-provider.type";
 import { ITracingProvider } from "../interfaces/tracing-provider.interface";
-import { ISpan } from "../types/apm.types";
+import { ISpan, SpanAttributes, SpanAttributeValue } from "../types/apm.types";
 /**
  * Elastic APM specific span interface
  */
 export interface IElasticApmSpan extends ISpan {
     /** Set a label on the span */
-    setLabel(key: string, value: string): void;
+    setLabel(key: string, value: string | number | boolean, stringify?: boolean): void;
     /** Set the span type */
     setType(type: string): void;
     /** Set the outcome (success, failure) */
@@ -22,6 +22,8 @@ export declare class ElasticApmTracingProvider implements ITracingProvider {
     private apm;
     private readonly serviceName;
     private readonly environment;
+    private static isElasticLabelValue;
+    private static setElasticLabel;
     constructor(config?: {
         serviceName?: string;
         environment?: string;
@@ -43,19 +45,23 @@ export declare class ElasticApmTracingProvider implements ITracingProvider {
     /**
      * Bắt đầu một span mới
      */
-    startSpan(name: string, attributes?: Record<string, string | number>, spanKind?: SpanKind): IElasticApmSpan | null;
+    startSpan(name: string, attributes?: SpanAttributes, spanKind?: SpanKind): IElasticApmSpan | null;
     /**
      * Thực thi function với tracing context
      */
-    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: Record<string, string | number>): Promise<T>;
+    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: SpanAttributes): Promise<T>;
     /**
      * Capture error vào APM
      */
     captureError(error: Error): void;
     /**
-     * Set label cho current transaction/span
+     * Set label cho current span
      */
-    setAttribute(key: string, value: string | number): void;
+    setAttribute(key: string, value: SpanAttributeValue): void;
+    /**
+     * Set label cho current transaction
+     */
+    setTransactionLabel(key: string, value: SpanAttributeValue): void;
     /**
      * End span manually
      */

package/dist/providers/elastic-apm.tracing-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"elastic-apm.tracing-provider.d.ts","sourceRoot":"","sources":["../../src/providers/elastic-apm.tracing-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAU3C;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,KAAK;IAC5C,8BAA8B;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3C,wBAAwB;IACxB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,mBAAmB;IACnB,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC7B;AA0BD;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,gBAAgB;IAChE,OAAO,CAAC,GAAG,CAAiC;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGnC,MAAM,GAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACpB;IAOR;;;OAGG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDjB;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,QAAQ,GAAE,QAA4B,GACrC,eAAe,GAAG,IAAI;IAiHzB;;OAEG;IACG,mBAAmB,CAAC,CAAC,EACzB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC;IAsBb;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAMhC;;OAEG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAOvD;;OAEG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAOpD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAe5B"}
+{"version":3,"file":"elastic-apm.tracing-provider.d.ts","sourceRoot":"","sources":["../../src/providers/elastic-apm.tracing-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAU/E;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,KAAK;IAC5C,8BAA8B;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnF,wBAAwB;IACxB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,mBAAmB;IACnB,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC7B;AA2BD;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,gBAAgB;IAChE,OAAO,CAAC,GAAG,CAAiC;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC,OAAO,CAAC,MAAM,CAAC,eAAe;gBAkB5B,MAAM,GAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACpB;IAOR;;;OAGG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDjB;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,cAAc,EAC3B,QAAQ,GAAE,QAA4B,GACrC,eAAe,GAAG,IAAI;IAoHzB;;OAEG;IACG,mBAAmB,CAAC,CAAC,EACzB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,CAAC,CAAC;IAsBb;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAMhC;;OAEG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAO1D;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAOjE;;OAEG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAOpD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAe5B"}

package/dist/providers/elastic-apm.tracing-provider.js

@@ -9,6 +9,19 @@ const elastic_apm_compat_1 = require("../utils/elastic-apm-compat");
  * Sử dụng elastic-apm-node agent để gửi traces về Elastic APM server
  */
 class ElasticApmTracingProvider {
+    static isElasticLabelValue(value) {
+        return value !== undefined && !Array.isArray(value);
+    }
+    static setElasticLabel(target, key, value) {
+        if (!ElasticApmTracingProvider.isElasticLabelValue(value)) {
+            return;
+        }
+        if (typeof value === "number" || typeof value === "boolean") {
+            target.setLabel(key, value, false);
+            return;
+        }
+        target.setLabel(key, value);
+    }
     constructor(config = {}) {
         this.apm = null;
         this.serviceName =
@@ -93,7 +106,7 @@ class ElasticApmTracingProvider {
         // Set labels từ attributes
         if (attributes) {
             for (const [key, value] of Object.entries(attributes)) {
-                span.setLabel(key, String(value));
+                ElasticApmTracingProvider.setElasticLabel(span, key, value);
             }
         }
         // Set span type dựa trên kind
@@ -112,7 +125,10 @@ class ElasticApmTracingProvider {
                 }
                 return;
             }
-            originalSetLabel(key, value);
+            if (!ElasticApmTracingProvider.isElasticLabelValue(value)) {
+                return;
+            }
+            ElasticApmTracingProvider.setElasticLabel({ setLabel: originalSetLabel }, key, value);
         };
         // Override setAttribute (if it exists, maps to setLabel)
         if (typeof span.setAttribute === "function") {
@@ -188,12 +204,21 @@ class ElasticApmTracingProvider {
         }
     }
     /**
-     * Set label cho current transaction/span
+     * Set label cho current span
      */
     setAttribute(key, value) {
         const span = this.apm?.currentSpan;
         if (span) {
-            span.setLabel(key, String(value));
+            ElasticApmTracingProvider.setElasticLabel(span, key, value);
+        }
+    }
+    /**
+     * Set label cho current transaction
+     */
+    setTransactionLabel(key, value) {
+        const transaction = this.apm?.currentTransaction;
+        if (transaction) {
+            ElasticApmTracingProvider.setElasticLabel(transaction, key, value);
         }
     }
     /**

package/dist/providers/opentelemetry.tracing-provider.d.ts

@@ -1,6 +1,6 @@
 import { ITracingProvider } from "../interfaces/tracing-provider.interface";
 import { OtlpTransport } from "../types/otlp-transport.type";
-import { ISpan, SpanKind } from "../types/apm.types";
+import { ISpan, SpanAttributes, SpanAttributeValue, SpanKind } from "../types/apm.types";
 /**
  * OpenTelemetry Tracing Provider Implementation
  * Sử dụng OpenTelemetry SDK với OTLP exporter để gửi traces về Elastic APM
@@ -40,14 +40,15 @@ export declare class OpenTelemetryTracingProvider implements ITracingProvider {
         enableConsoleExporter?: boolean;
         environment?: string;
     }): Promise<void>;
+    private getTransactionSpanFromContext;
     /**
      * Bắt đầu một span mới
      */
-    startSpan(name: string, attributes?: Record<string, string | number>, spanKind?: SpanKind): ISpan | null;
+    startSpan(name: string, attributes?: SpanAttributes, spanKind?: SpanKind): ISpan | null;
     /**
      * Thực thi function với tracing context
      */
-    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: Record<string, string | number>): Promise<T>;
+    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: SpanAttributes): Promise<T>;
     /**
      * Capture error vào active span
      */
@@ -55,7 +56,11 @@ export declare class OpenTelemetryTracingProvider implements ITracingProvider {
     /**
      * Set attribute cho active span
      */
-    setAttribute(key: string, value: string | number): void;
+    setAttribute(key: string, value: SpanAttributeValue): void;
+    /**
+     * Set transaction label on the root request span when available
+     */
+    setTransactionLabel(key: string, value: SpanAttributeValue): void;
     /**
      * Force flush all pending spans
      */

package/dist/providers/opentelemetry.tracing-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opentelemetry.tracing-provider.d.ts","sourceRoot":"","sources":["../../src/providers/opentelemetry.tracing-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAyGrD;;;GAGG;AACH,qBAAa,4BAA6B,YAAW,gBAAgB;IACnE,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAU;IAChD,OAAO,CAAC,WAAW,CAAS;gBAG1B,MAAM,GAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;QACvC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;KAC5B;IA6BR;;;OAGG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+NjB;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,QAAQ,GAAE,QAA4B,GACrC,KAAK,GAAG,IAAI;IA+Gf;;OAEG;IACG,mBAAmB,CAAC,CAAC,EACzB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC;IAmCb;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAiBhC;;OAEG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAavD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAajC;;OAEG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAapD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B;;OAEG;IACH,OAAO,CAAC,WAAW;CAmBpB"}
+{"version":3,"file":"opentelemetry.tracing-provider.d.ts","sourceRoot":"","sources":["../../src/providers/opentelemetry.tracing-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AA8GzF;;;GAGG;AACH,qBAAa,4BAA6B,YAAW,gBAAgB;IACnE,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAU;IAChD,OAAO,CAAC,WAAW,CAAS;gBAG1B,MAAM,GAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;QACvC,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;KAC5B;IA6BR;;;OAGG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+NjB,OAAO,CAAC,6BAA6B;IAuBrC;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,cAAc,EAC3B,QAAQ,GAAE,QAA4B,GACrC,KAAK,GAAG,IAAI;IA4If;;OAEG;IACG,mBAAmB,CAAC,CAAC,EACzB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,CAAC,CAAC;IA4Cb;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAiBhC;;OAEG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAa1D;;OAEG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAWjE;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAajC;;OAEG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAapD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B;;OAEG;IACH,OAAO,CAAC,WAAW;CAmBpB"}

package/dist/providers/opentelemetry.tracing-provider.js

@@ -38,6 +38,7 @@ const otlp_transport_type_1 = require("../types/otlp-transport.type");
 const apm_types_1 = require("../types/apm.types");
 const debug_logger_1 = require("../utils/debug-logger");
 const debug_exporter_wrapper_1 = require("../utils/debug-exporter-wrapper");
+const opentelemetry_transaction_context_1 = require("../utils/opentelemetry-transaction-context");
 /**
  * Transaction Name Processor for OpenTelemetry
  * Sets transaction names to format: "GET /api/healthcheck/ping"
@@ -339,6 +340,20 @@ class OpenTelemetryTracingProvider {
             throw error;
         }
     }
+    getTransactionSpanFromContext() {
+        // @ts-ignore - Optional peer dependency
+        const { context, trace } = require("@opentelemetry/api");
+        const activeContext = context.active();
+        const transactionSpan = activeContext?.getValue?.(opentelemetry_transaction_context_1.transactionSpanContextKey);
+        if (transactionSpan) {
+            return transactionSpan;
+        }
+        const activeSpan = trace.getActiveSpan();
+        if (activeSpan?.[opentelemetry_transaction_context_1.transactionSpanRef]) {
+            return activeSpan[opentelemetry_transaction_context_1.transactionSpanRef] ?? null;
+        }
+        return null;
+    }
     /**
      * Bắt đầu một span mới
      */
@@ -350,8 +365,10 @@ class OpenTelemetryTracingProvider {
             return null;
         }
         // @ts-ignore - Optional peer dependency
-        const { context } = require("@opentelemetry/api");
+        const { context, trace } = require("@opentelemetry/api");
         const tracer = this.tracer;
+        const activeContext = context.active();
+        const activeTransactionSpan = this.getTransactionSpanFromContext();
         const span = tracer.startSpan(name, {
             attributes,
             kind: this.mapSpanKind(spanKind),
@@ -360,6 +377,21 @@ class OpenTelemetryTracingProvider {
         if (span) {
             const spanForLog = { name, kind: this.mapSpanKind(spanKind) };
             (0, debug_logger_1.logSpan)("OpenTelemetry", spanForLog);
+            const transactionSpan = spanKind === apm_types_1.SpanKind.SERVER ? span : activeTransactionSpan;
+            if (transactionSpan) {
+                span[opentelemetry_transaction_context_1.transactionSpanRef] = transactionSpan;
+                let transactionContext;
+                if (typeof activeContext.setValue === "function") {
+                    transactionContext = activeContext.setValue(opentelemetry_transaction_context_1.transactionSpanContextKey, transactionSpan);
+                }
+                else {
+                    if ((0, debug_logger_1.isDebugEnabled)()) {
+                        console.warn("[OpenTelemetry] activeContext.setValue is unavailable; falling back to trace.setSpan for transaction span propagation");
+                    }
+                    transactionContext = trace.setSpan(context.active(), transactionSpan);
+                }
+                span[opentelemetry_transaction_context_1.spanExecutionContextRef] = transactionContext;
+            }
         }
         // Add end protection to prevent operations on ended span
         if (span) {
@@ -412,7 +444,7 @@ class OpenTelemetryTracingProvider {
             // Override end to prevent duplicate ends
             if (typeof span.end === "function") {
                 const originalEnd = span.end.bind(span);
-                span.end = () => {
+                span.end = (result) => {
                     if (isEnded) {
                         if ((0, debug_logger_1.isDebugEnabled)()) {
                             console.warn(`[OpenTelemetry] Span "${name}" has already been ended. Ignoring duplicate end().`);
@@ -420,7 +452,7 @@ class OpenTelemetryTracingProvider {
                         return;
                     }
                     isEnded = true;
-                    originalEnd();
+                    originalEnd(result);
                 };
             }
         }
@@ -432,16 +464,21 @@ class OpenTelemetryTracingProvider {
     async startSpanWithParent(name, fn, attributes) {
         // @ts-ignore - Optional peer dependency
         const { context, trace, SpanStatusCode } = require("@opentelemetry/api");
-        return context.with(trace.setSpan(context.active(), this.startSpan(name, attributes)), async () => {
-            const span = trace.getActiveSpan();
+        const span = this.startSpan(name, attributes);
+        const spanContext = span?.[opentelemetry_transaction_context_1.spanExecutionContextRef] ??
+            context.active();
+        const executionContext = span ? trace.setSpan(spanContext, span) : spanContext;
+        return context.with(executionContext, async () => {
+            const activeSpan = trace.getActiveSpan();
+            const currentSpan = activeSpan ?? span;
             try {
-                const result = await fn(span);
+                const result = await fn(currentSpan);
                 return result;
             }
             catch (error) {
-                if (span) {
-                    span.recordException(error);
-                    span.setStatus({
+                if (currentSpan) {
+                    currentSpan.recordException(error);
+                    currentSpan.setStatus({
                         code: SpanStatusCode.ERROR,
                         message: error.message,
                     });
@@ -452,7 +489,7 @@ class OpenTelemetryTracingProvider {
                 throw error;
             }
             finally {
-                span?.end();
+                currentSpan?.end();
             }
         });
     }
@@ -478,7 +515,7 @@ class OpenTelemetryTracingProvider {
      * Set attribute cho active span
      */
     setAttribute(key, value) {
-        if (!this.initialized) {
+        if (!this.initialized || value === undefined) {
             return;
         }
         // @ts-ignore - Optional peer dependency
@@ -488,6 +525,18 @@ class OpenTelemetryTracingProvider {
             span.setAttribute(key, value);
         }
     }
+    /**
+     * Set transaction label on the root request span when available
+     */
+    setTransactionLabel(key, value) {
+        if (!this.initialized || value === undefined || Array.isArray(value)) {
+            return;
+        }
+        const transactionSpan = this.getTransactionSpanFromContext();
+        if (transactionSpan) {
+            transactionSpan.setAttribute(key, value);
+        }
+    }
     /**
      * Force flush all pending spans
      */

package/dist/services/tracing.service.d.ts

@@ -1,5 +1,5 @@
 import { ITracingProvider } from "../interfaces/tracing-provider.interface";
-import { ISpan, SpanKind } from "../types/apm.types";
+import { ISpan, SpanAttributes, SpanAttributeValue, SpanKind } from "../types/apm.types";
 /**
  * Tracing Service - Wrapper cho ITracingProvider
  * Service này được inject vào controllers/services để sử dụng tracing
@@ -47,7 +47,7 @@ export declare class TracingService {
      *   span.end();
      * }
      */
-    startSpan(name: string, attributes?: Record<string, string | number>, spanKind?: SpanKind): ISpan | null;
+    startSpan(name: string, attributes?: SpanAttributes, spanKind?: SpanKind): ISpan | null;
     /**
      * Thực thi function với context tracing (auto-close span)
      * @param name Tên của span
@@ -64,7 +64,7 @@ export declare class TracingService {
      *   }
      * );
      */
-    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: Record<string, string | number>): Promise<T>;
+    startSpanWithParent<T>(name: string, fn: (span: ISpan | null) => Promise<T>, attributes?: SpanAttributes): Promise<T>;
     /**
      * Capture error vào active span hiện tại
      * @param error Error object
@@ -75,7 +75,13 @@ export declare class TracingService {
      * @param key Tên attribute
      * @param value Giá trị attribute
      */
-    setAttribute(key: string, value: string | number): void;
+    setAttribute(key: string, value: SpanAttributeValue): void;
+    /**
+     * Set label/attribute cho active transaction hiện tại
+     * @param key Tên label
+     * @param value Giá trị label
+     */
+    setTransactionLabel(key: string, value: SpanAttributeValue): void;
     /**
      * Kết thúc span manually
      * @param span Span cần end (nếu không truyền, sẽ end active span)

package/dist/services/tracing.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.service.d.ts","sourceRoot":"","sources":["../../src/services/tracing.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAErD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,gBAAgB;IAEvD;;;;;;;;;;;;;;;;;;;OAmBG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,QAAQ,GAAE,QAA4B,GACrC,KAAK,GAAG,IAAI;IAIf;;;;;;;;;;;;;;;OAeG;IACH,mBAAmB,CAAC,CAAC,EACnB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC;IAIb;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIhC;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIvD;;;OAGG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAI7C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC"}
+{"version":3,"file":"tracing.service.d.ts","sourceRoot":"","sources":["../../src/services/tracing.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEzF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,gBAAgB;IAEvD;;;;;;;;;;;;;;;;;;;OAmBG;IACH,SAAS,CACP,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,cAAc,EAC3B,QAAQ,GAAE,QAA4B,GACrC,KAAK,GAAG,IAAI;IAIf;;;;;;;;;;;;;;;OAeG;IACH,mBAAmB,CAAC,CAAC,EACnB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACtC,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,CAAC,CAAC;IAIb;;;OAGG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIhC;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAI1D;;;;OAIG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAIjE;;;OAGG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAI7C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC"}

package/dist/services/tracing.service.js

@@ -87,6 +87,14 @@ class TracingService {
     setAttribute(key, value) {
         this.provider.setAttribute(key, value);
     }
+    /**
+     * Set label/attribute cho active transaction hiện tại
+     * @param key Tên label
+     * @param value Giá trị label
+     */
+    setTransactionLabel(key, value) {
+        this.provider.setTransactionLabel(key, value);
+    }
     /**
      * Kết thúc span manually
      * @param span Span cần end (nếu không truyền, sẽ end active span)

package/dist/types/apm.types.d.ts

@@ -10,13 +10,15 @@ export { ApmProvider, type ApmProviderType, SpanKind, OtlpTransport, type OtlpTr
 /**
  * Common Span interface - works with both Elastic APM and OpenTelemetry
  */
+export type SpanAttributeValue = string | number | boolean | string[] | undefined;
+export type SpanAttributes = Record<string, SpanAttributeValue>;
 export interface ISpan {
     /** Span name */
     name: string;
     /** End the span */
     end(result?: unknown): void;
     /** Set an attribute on the span */
-    setAttribute(key: string, value: string | number | boolean | string[] | undefined): void;
+    setAttribute(key: string, value: SpanAttributeValue): void;
     /** Add an event to the span */
     addEvent?(name: string, attributes?: Record<string, unknown>): void;
     /** Set the span status */
@@ -47,7 +49,7 @@ export interface ITracer {
  */
 export interface SpanOptions {
     /** Span attributes */
-    attributes?: Record<string, string | number | boolean>;
+    attributes?: SpanAttributes;
     /** Span kind (server, client, internal, etc.) */
     kind?: SpanKind;
     /** Parent span context */

package/dist/types/apm.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apm.types.d.ts","sourceRoot":"","sources":["../../src/types/apm.types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG9E,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,iBAAiB,EAAE,CAAC;AAE9F;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,mBAAmB;IACnB,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE5B,mCAAmC;IACnC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC;IAEzF,+BAA+B;IAC/B,QAAQ,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEpE,0BAA0B;IAC1B,SAAS,CAAC,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IAErC,sCAAsC;IACtC,eAAe,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,GAAG,IAAI,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,uBAAuB;IACvB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC;IAEtD,oCAAoC;IACpC,aAAa,CAAC,IAAI,KAAK,GAAG,SAAS,CAAC;IAEpC,yCAAyC;IACzC,mBAAmB,CAAC,CAAC,CAAC,EACpB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACnC,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAEvD,iDAAiD;IACjD,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEhB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qDAAqD;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,kBAAkB;IAC3D,qBAAqB;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,cAAc;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qCAAqC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,+BAA+B;IAC/B,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,wBAAwB;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,aAAa,GAAG,MAAM,CAAC;IAEvC,sBAAsB;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,8BAA8B;IAC9B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IAEb,6BAA6B;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEpD,kCAAkC;IAClC,KAAK,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;IAEzB,oCAAoC;IACpC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,6BAA6B;IAC7B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI,CAAC;IAExE,4BAA4B;IAC5B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,6BAA6B;IAC7B,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B"}
+{"version":3,"file":"apm.types.d.ts","sourceRoot":"","sources":["../../src/types/apm.types.ts"],"names":[],"mappings":"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"}

package/dist/utils/opentelemetry-transaction-context.d.ts

@@ -0,0 +1,4 @@
+export declare const transactionSpanContextKey: symbol;
+export declare const transactionSpanRef: unique symbol;
+export declare const spanExecutionContextRef: unique symbol;
+//# sourceMappingURL=opentelemetry-transaction-context.d.ts.map

package/dist/utils/opentelemetry-transaction-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opentelemetry-transaction-context.d.ts","sourceRoot":"","sources":["../../src/utils/opentelemetry-transaction-context.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,yBAAyB,QAErC,CAAC;AAEF,eAAO,MAAM,kBAAkB,eAAiD,CAAC;AACjF,eAAO,MAAM,uBAAuB,eAA8C,CAAC"}

package/dist/utils/opentelemetry-transaction-context.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spanExecutionContextRef = exports.transactionSpanRef = exports.transactionSpanContextKey = void 0;
+const resolveCreateContextKey = () => {
+    try {
+        // @ts-ignore - Optional peer dependency
+        const { createContextKey } = require("@opentelemetry/api");
+        if (typeof createContextKey === "function") {
+            return createContextKey;
+        }
+    }
+    catch {
+        // Ignore when optional dependency is unavailable
+    }
+    return (description) => Symbol(description);
+};
+exports.transactionSpanContextKey = resolveCreateContextKey()("interactive-apm.transaction-span");
+exports.transactionSpanRef = Symbol("interactive-apm.transaction-span-ref");
+exports.spanExecutionContextRef = Symbol("interactive-apm.execution-context");

package/dist/utils/tracing.helper.d.ts

@@ -1,4 +1,4 @@
-import { Span } from "@opentelemetry/api";
+import { ISpan, SpanAttributes, SpanAttributeValue } from "../types/apm.types";
 import { SpanKind } from "../types/apm-provider.type";
 /**
  * TracingHelper - Static utility class for unified APM usage
@@ -19,10 +19,13 @@ import { SpanKind } from "../types/apm-provider.type";
 export declare class TracingHelper {
     private static tracer;
     private static apmProvider;
+    private static isElasticLabelValue;
+    private static setElasticLabel;
     /**
      * Get the current APM provider (cached)
      */
     private static getProvider;
+    private static getTransactionSpanFromContext;
     /**
      * Reset cached provider (useful for testing)
      */
@@ -34,7 +37,7 @@ export declare class TracingHelper {
      * @param spanKind Loại span (mặc định: INTERNAL). Dùng SERVER cho API endpoints
      * @returns Span object
      */
-    static startSpan(name: string, attributes?: Record<string, string | number>, spanKind?: SpanKind): Span;
+    static startSpan(name: string, attributes?: SpanAttributes, spanKind?: SpanKind): ISpan;
     private static mapSpanKindToOtlpSpanKind;
     /**
      * Start span using OpenTelemetry API
@@ -63,7 +66,7 @@ export declare class TracingHelper {
      * @param attributes Các attributes metadata
      * @returns Kết quả của function
      */
-    static startSpanWithParent<T>(name: string, fn: (span: Span | undefined) => Promise<T>, attributes?: Record<string, string | number>): Promise<T>;
+    static startSpanWithParent<T>(name: string, fn: (span: ISpan | undefined) => Promise<T>, attributes?: SpanAttributes): Promise<T>;
     /**
      * Capture error vào active span hiện tại
      * @param error Error object
@@ -74,17 +77,21 @@ export declare class TracingHelper {
      * @param key Tên attribute
      * @param value Giá trị attribute
      */
-    static setAttribute(key: string, value: string | number): void;
+    static setAttribute(key: string, value: SpanAttributeValue): void;
+    /**
+     * Set label/attribute cho active transaction hiện tại
+     */
+    static setTransactionLabel(key: string, value: SpanAttributeValue): void;
     /**
      * Kết thúc span manually
      * @param span Span cần end
      */
-    static endSpan(span?: Span, result?: unknown): void;
+    static endSpan(span?: ISpan, result?: unknown): void;
     /**
      * Get the current active span
      * @returns The active span or undefined
      */
-    static getActiveSpan(): Span | undefined;
+    static getActiveSpan(): ISpan | undefined;
     /**
      * Get the current trace ID
      * @returns The trace ID or undefined

package/dist/utils/tracing.helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.helper.d.ts","sourceRoot":"","sources":["../../src/utils/tracing.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,IAAI,EAA4C,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAwCtD;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAsC;IAC3D,OAAO,CAAC,MAAM,CAAC,WAAW,CAAoD;IAE9E;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAO1B;;OAEG;IACH,MAAM,CAAC,kBAAkB,IAAI,IAAI;IAIjC;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CACd,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAC5C,QAAQ,GAAE,QAA4B,GACrC,IAAI;IAWP,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiBxC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAiBrC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IA2FlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAqB3C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAsBpC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAe7B;;;;;;OAMG;WACU,mBAAmB,CAAC,CAAC,EAChC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,EAC1C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAC3C,OAAO,CAAC,CAAC,CAAC;IA2Cb;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAsBvC;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAwB9D;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IA2BnD;;;OAGG;IACH,MAAM,CAAC,aAAa,IAAI,IAAI,GAAG,SAAS;IAqBxC;;;OAGG;IACH,MAAM,CAAC,UAAU,IAAI,MAAM,GAAG,SAAS;CAqBxC"}
+{"version":3,"file":"tracing.helper.d.ts","sourceRoot":"","sources":["../../src/utils/tracing.helper.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAkDtD;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAsC;IAC3D,OAAO,CAAC,MAAM,CAAC,WAAW,CAAoD;IAE9E,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAMlC,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAO1B,OAAO,CAAC,MAAM,CAAC,6BAA6B;IAqB5C;;OAEG;IACH,MAAM,CAAC,kBAAkB,IAAI,IAAI;IAIjC;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CACd,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,cAAc,EAC3B,QAAQ,GAAE,QAA4B,GACrC,KAAK;IAWR,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiBxC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAmCrC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAgGlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAqB3C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAsBpC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAoB7B;;;;;;OAMG;WACU,mBAAmB,CAAC,CAAC,EAChC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,EAC3C,UAAU,CAAC,EAAE,cAAc,GAC1B,OAAO,CAAC,CAAC,CAAC;IAyDb;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAsBvC;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAwBjE;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IA2BxE;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IA2BpD;;;OAGG;IACH,MAAM,CAAC,aAAa,IAAI,KAAK,GAAG,SAAS;IAqBzC;;;OAGG;IACH,MAAM,CAAC,UAAU,IAAI,MAAM,GAAG,SAAS;CAqBxC"}

package/dist/utils/tracing.helper.js

@@ -4,6 +4,7 @@ exports.TracingHelper = void 0;
 // @ts-ignore - Optional peer dependency
 const api_1 = require("@opentelemetry/api");
 const apm_provider_type_1 = require("../types/apm-provider.type");
+const opentelemetry_transaction_context_1 = require("./opentelemetry-transaction-context");
 /**
  * Get the current APM provider type
  */
@@ -52,6 +53,19 @@ function getApmProvider() {
  * }
  */
 class TracingHelper {
+    static isElasticLabelValue(value) {
+        return value !== undefined && !Array.isArray(value);
+    }
+    static setElasticLabel(target, key, value) {
+        if (!TracingHelper.isElasticLabelValue(value)) {
+            return;
+        }
+        if (typeof value === "number" || typeof value === "boolean") {
+            target.setLabel(key, value, false);
+            return;
+        }
+        target.setLabel(key, value);
+    }
     /**
      * Get the current APM provider (cached)
      */
@@ -61,6 +75,18 @@ class TracingHelper {
         }
         return this.apmProvider;
     }
+    static getTransactionSpanFromContext() {
+        const activeContext = api_1.context.active();
+        const transactionSpan = activeContext?.getValue?.(opentelemetry_transaction_context_1.transactionSpanContextKey);
+        if (transactionSpan) {
+            return transactionSpan;
+        }
+        const activeSpan = api_1.trace.getActiveSpan();
+        if (activeSpan?.[opentelemetry_transaction_context_1.transactionSpanRef]) {
+            return activeSpan[opentelemetry_transaction_context_1.transactionSpanRef] ?? null;
+        }
+        return activeSpan ?? null;
+    }
     /**
      * Reset cached provider (useful for testing)
      */
@@ -102,10 +128,18 @@ class TracingHelper {
      * Start span using OpenTelemetry API
      */
     static startSpanOpenTelemetry(name, attributes, spanKind = apm_provider_type_1.SpanKind.INTERNAL) {
+        const activeContext = api_1.context.active();
+        const activeTransactionSpan = this.getTransactionSpanFromContext();
         const span = this.tracer.startSpan(name, {
             attributes,
             kind: this.mapSpanKindToOtlpSpanKind(spanKind),
         }, api_1.context.active());
+        const transactionSpan = spanKind === apm_provider_type_1.SpanKind.SERVER ? span : activeTransactionSpan;
+        if (transactionSpan) {
+            span[opentelemetry_transaction_context_1.transactionSpanRef] = transactionSpan;
+            const transactionContext = activeContext.setValue?.(opentelemetry_transaction_context_1.transactionSpanContextKey, transactionSpan);
+            span[opentelemetry_transaction_context_1.spanExecutionContextRef] = transactionContext ?? api_1.context.active();
+        }
         return span;
     }
     /**
@@ -139,7 +173,7 @@ class TracingHelper {
             // Set attributes as labels
             if (attributes) {
                 for (const [key, value] of Object.entries(attributes)) {
-                    apmSpan.setLabel(key, String(value));
+                    TracingHelper.setElasticLabel(apmSpan, key, value);
                 }
             }
             // Set span type
@@ -153,14 +187,14 @@ class TracingHelper {
                 // Add setAttribute method that maps to setLabel
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 span.setAttribute = (key, value) => {
-                    originalSetLabel(key, String(value));
+                    TracingHelper.setElasticLabel({ setLabel: originalSetLabel }, key, value);
                     return span; // Return span for chaining
                 };
                 // Add setAttributes method for batch setting
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 span.setAttributes = (attrs) => {
                     for (const [k, v] of Object.entries(attrs)) {
-                        originalSetLabel(k, String(v));
+                        TracingHelper.setElasticLabel({ setLabel: originalSetLabel }, k, v);
                     }
                     return span; // Return span for chaining
                 };
@@ -235,18 +269,23 @@ class TracingHelper {
      * Create a no-op span that does nothing
      */
     static createNoOpSpan(name) {
-        return {
+        const noOpSpan = {
             name,
-            kind: apm_provider_type_1.SpanKind.INTERNAL,
-            spanContext: () => ({ traceId: "noop", spanId: "noop" }),
-            setAttribute: () => ({}),
-            setAttributes: () => ({}),
-            addEvent: () => ({}),
-            recordException: () => ({}),
-            setStatus: () => ({}),
-            end: () => ({}),
-            isRecording: () => false,
+            setAttribute: function () {
+                return this;
+            },
+            addEvent: function () {
+                return this;
+            },
+            recordException: function () {
+                return this;
+            },
+            setStatus: function () {
+                return this;
+            },
+            end: () => { },
         };
+        return noOpSpan;
     }
     /**
      * Thực thi function với context tracing (auto-close span)
@@ -271,23 +310,33 @@ class TracingHelper {
             }
         }
         // OpenTelemetry with context propagation
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), TracingHelper.startSpan(name, attributes)), async () => {
-            const span = api_1.trace.getActiveSpan();
+        const span = TracingHelper.startSpan(name, attributes);
+        const spanContext = span?.[opentelemetry_transaction_context_1.spanExecutionContextRef] ??
+            api_1.context.active();
+        const executionContext = span
+            ? api_1.trace.setSpan(spanContext, span)
+            : api_1.context.active();
+        return api_1.context.with(executionContext, async () => {
+            const activeSpan = api_1.trace.getActiveSpan();
+            const currentSpan = activeSpan ?? span;
             // If no active span, throw an error - this should not happen if the span was just started
-            if (!span) {
+            if (!currentSpan) {
                 throw new Error(`Failed to get active span for "${name}". The OpenTelemetry context may not be properly initialized.`);
             }
             try {
-                const result = await fn(span);
+                const result = await fn(currentSpan);
                 return result;
             }
             catch (error) {
-                span.recordException(error);
-                span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: error.message });
+                currentSpan.recordException(error);
+                currentSpan.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
                 throw error;
             }
             finally {
-                span.end();
+                currentSpan.end();
             }
         });
     }
@@ -328,7 +377,7 @@ class TracingHelper {
                 const apm = require("elastic-apm-node");
                 const span = apm.currentSpan;
                 if (span) {
-                    span.setLabel(key, String(value));
+                    TracingHelper.setElasticLabel(span, key, value);
                 }
             }
             catch {
@@ -338,10 +387,37 @@ class TracingHelper {
         }
         // OpenTelemetry
         const span = api_1.trace.getActiveSpan();
-        if (span) {
+        if (span && value !== undefined) {
             span.setAttribute(key, value);
         }
     }
+    /**
+     * Set label/attribute cho active transaction hiện tại
+     */
+    static setTransactionLabel(key, value) {
+        const provider = this.getProvider();
+        if (provider === "elastic-apm") {
+            try {
+                // @ts-ignore - Optional dependency
+                const apm = require("elastic-apm-node");
+                const transaction = apm.currentTransaction;
+                if (transaction) {
+                    TracingHelper.setElasticLabel(transaction, key, value);
+                }
+            }
+            catch {
+                // Ignore if elastic-apm is not available
+            }
+            return;
+        }
+        if (value === undefined || Array.isArray(value)) {
+            return;
+        }
+        const transactionSpan = this.getTransactionSpanFromContext();
+        if (transactionSpan) {
+            transactionSpan.setAttribute(key, value);
+        }
+    }
     /**
      * Kết thúc span manually
      * @param span Span cần end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtvlive/interactive-apm",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "APM integration package supporting both Elastic APM and OpenTelemetry with NestJS integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",