@eqxjs/nest-opentelemetry 3.1.2 → 3.2.0

package/EXAMPLES.md

@@ -0,0 +1,392 @@
+# Custom OpenTelemetry — Traces, Metrics & Logs in NestJS
+
+All examples use the standard `@opentelemetry/api` and `@opentelemetry/api-logs` packages that are already pulled in transitively by `@eqxjs/nest-opentelemetry`. No extra dependencies are required.
+
+> **Prerequisite** — register the SDK *before* your app loads (see README).  
+> All `trace`, `metrics`, and `logs` API calls are no-ops until the SDK is started.
+
+---
+
+## 1 — Custom Traces
+
+### 1.1 Simple span in a service method
+
+```typescript
+// order.service.ts
+import { Injectable } from '@nestjs/common';
+import { trace, SpanStatusCode, context } from '@opentelemetry/api';
+
+const tracer = trace.getTracer('order-service');
+
+@Injectable()
+export class OrderService {
+  async createOrder(dto: CreateOrderDto): Promise<Order> {
+    return tracer.startActiveSpan('order.create', async (span) => {
+      try {
+        span.setAttributes({
+          'order.user_id': dto.userId,
+          'order.item_count': dto.items.length,
+        });
+
+        const order = await this.repo.save(dto);
+
+        span.setStatus({ code: SpanStatusCode.OK });
+        return order;
+      } catch (err) {
+        span.setStatus({ code: SpanStatusCode.ERROR, message: (err as Error).message });
+        span.recordException(err as Error);
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
+  }
+}
+```
+
+### 1.2 Child span inside an active span
+
+```typescript
+import { trace, context } from '@opentelemetry/api';
+
+const tracer = trace.getTracer('payment-service');
+
+async function chargeCard(orderId: string, amount: number) {
+  // Inherits the active context automatically
+  return tracer.startActiveSpan('payment.charge', async (span) => {
+    span.setAttributes({ 'payment.order_id': orderId, 'payment.amount': amount });
+    try {
+      const result = await gateway.charge(amount);
+      return result;
+    } finally {
+      span.end();
+    }
+  });
+}
+```
+
+### 1.3 Span decorator (reusable)
+
+```typescript
+// otel-span.decorator.ts
+import { trace, SpanStatusCode } from '@opentelemetry/api';
+
+export function OtelSpan(name?: string) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+    const original = descriptor.value;
+    const spanName = name ?? `${target.constructor.name}.${propertyKey}`;
+    const tracer = trace.getTracer(target.constructor.name);
+
+    descriptor.value = async function (...args: any[]) {
+      return tracer.startActiveSpan(spanName, async (span) => {
+        try {
+          const result = await original.apply(this, args);
+          span.setStatus({ code: SpanStatusCode.OK });
+          return result;
+        } catch (err) {
+          span.setStatus({ code: SpanStatusCode.ERROR, message: (err as Error).message });
+          span.recordException(err as Error);
+          throw err;
+        } finally {
+          span.end();
+        }
+      });
+    };
+
+    return descriptor;
+  };
+}
+```
+
+```typescript
+// notification.service.ts
+@Injectable()
+export class NotificationService {
+  @OtelSpan('notification.send_email')
+  async sendEmail(to: string, subject: string) {
+    // ...
+  }
+}
+```
+
+### 1.4 Trace interceptor (applies to every controller handler)
+
+```typescript
+// trace.interceptor.ts
+import {
+  Injectable,
+  NestInterceptor,
+  ExecutionContext,
+  CallHandler,
+} from '@nestjs/common';
+import { Observable, throwError } from 'rxjs';
+import { catchError, tap } from 'rxjs/operators';
+import { trace, SpanStatusCode } from '@opentelemetry/api';
+import { Request } from 'express';
+
+@Injectable()
+export class TraceInterceptor implements NestInterceptor {
+  intercept(ctx: ExecutionContext, next: CallHandler): Observable<any> {
+    const req: Request = ctx.switchToHttp().getRequest();
+    const tracer = trace.getTracer('http-interceptor');
+    const spanName = `${ctx.getClass().name}.${ctx.getHandler().name}`;
+
+    const span = tracer.startSpan(spanName, {
+      attributes: {
+        'http.method': req.method,
+        'http.url': req.url,
+        'http.route': req.route?.path,
+      },
+    });
+
+    return next.handle().pipe(
+      tap(() => {
+        span.setStatus({ code: SpanStatusCode.OK });
+        span.end();
+      }),
+      catchError((err) => {
+        span.setStatus({ code: SpanStatusCode.ERROR, message: err.message });
+        span.recordException(err);
+        span.end();
+        return throwError(() => err);
+      }),
+    );
+  }
+}
+```
+
+---
+
+## 2 — Custom Metrics
+
+### 2.1 Counter
+
+```typescript
+// order.metrics.ts
+import { Injectable, OnModuleInit } from '@nestjs/common';
+import { metrics, Counter } from '@opentelemetry/api';
+
+@Injectable()
+export class OrderMetrics implements OnModuleInit {
+  private ordersCreated: Counter;
+
+  onModuleInit() {
+    const meter = metrics.getMeter('order-service');
+    this.ordersCreated = meter.createCounter('orders.created', {
+      description: 'Total number of orders created',
+    });
+  }
+
+  recordOrderCreated(status: string) {
+    this.ordersCreated.add(1, { 'order.status': status });
+  }
+}
+```
+
+### 2.2 Histogram (latency / duration)
+
+```typescript
+// db.metrics.ts
+import { Injectable, OnModuleInit } from '@nestjs/common';
+import { metrics, Histogram } from '@opentelemetry/api';
+
+@Injectable()
+export class DbMetrics implements OnModuleInit {
+  private queryDuration: Histogram;
+
+  onModuleInit() {
+    const meter = metrics.getMeter('database');
+    this.queryDuration = meter.createHistogram('db.query.duration', {
+      description: 'Database query duration in milliseconds',
+      unit: 'ms',
+    });
+  }
+
+  async measureQuery<T>(table: string, fn: () => Promise<T>): Promise<T> {
+    const start = Date.now();
+    try {
+      return await fn();
+    } finally {
+      this.queryDuration.record(Date.now() - start, { 'db.table': table });
+    }
+  }
+}
+```
+
+### 2.3 Observable gauge (active sessions)
+
+```typescript
+// session.metrics.ts
+import { Injectable, OnModuleInit } from '@nestjs/common';
+import { metrics } from '@opentelemetry/api';
+
+@Injectable()
+export class SessionMetrics implements OnModuleInit {
+  private activeSessions = 0;
+
+  onModuleInit() {
+    const meter = metrics.getMeter('session-service');
+    meter.createObservableGauge('sessions.active', {
+      description: 'Number of currently active sessions',
+    }).addCallback((result) => {
+      result.observe(this.activeSessions);
+    });
+  }
+
+  increment() { this.activeSessions++; }
+  decrement() { this.activeSessions--; }
+}
+```
+
+### 2.4 Metrics module (centralised)
+
+```typescript
+// telemetry.module.ts
+import { Module, Global } from '@nestjs/common';
+import { OrderMetrics } from './order.metrics';
+import { DbMetrics } from './db.metrics';
+import { SessionMetrics } from './session.metrics';
+
+@Global()
+@Module({
+  providers: [OrderMetrics, DbMetrics, SessionMetrics],
+  exports: [OrderMetrics, DbMetrics, SessionMetrics],
+})
+export class TelemetryModule {}
+```
+
+---
+
+## 3 — Custom Logs
+
+### 3.1 OtelLogger service
+
+```typescript
+// otel-logger.service.ts
+import { Injectable } from '@nestjs/common';
+import { logs, SeverityNumber } from '@opentelemetry/api-logs';
+
+@Injectable()
+export class OtelLoggerService {
+  private readonly logger = logs.getLogger('app');
+
+  info(body: string, attributes?: Record<string, any>) {
+    this.logger.emit({
+      severityNumber: SeverityNumber.INFO,
+      severityText: 'INFO',
+      body,
+      attributes,
+    });
+  }
+
+  warn(body: string, attributes?: Record<string, any>) {
+    this.logger.emit({
+      severityNumber: SeverityNumber.WARN,
+      severityText: 'WARN',
+      body,
+      attributes,
+    });
+  }
+
+  error(body: string, err?: Error, attributes?: Record<string, any>) {
+    this.logger.emit({
+      severityNumber: SeverityNumber.ERROR,
+      severityText: 'ERROR',
+      body,
+      attributes: {
+        ...attributes,
+        'exception.message': err?.message,
+        'exception.stacktrace': err?.stack,
+      },
+    });
+  }
+}
+```
+
+### 3.2 Using OtelLoggerService in a service
+
+```typescript
+// auth.service.ts
+@Injectable()
+export class AuthService {
+  constructor(private readonly otelLogger: OtelLoggerService) {}
+
+  async login(dto: LoginDto) {
+    try {
+      const token = await this.issueToken(dto);
+      this.otelLogger.info('User login succeeded', { 'user.id': dto.userId });
+      return token;
+    } catch (err) {
+      this.otelLogger.error('User login failed', err as Error, { 'user.id': dto.userId });
+      throw err;
+    }
+  }
+}
+```
+
+### 3.3 Correlating logs with the active trace
+
+Log records emitted while an active span exists are automatically correlated by the SDK via `traceId` / `spanId`. To add them explicitly:
+
+```typescript
+import { logs, SeverityNumber } from '@opentelemetry/api-logs';
+import { trace, context } from '@opentelemetry/api';
+
+function emitCorrelatedLog(body: string) {
+  const span = trace.getActiveSpan();
+  const spanCtx = span?.spanContext();
+
+  logs.getLogger('app').emit({
+    severityNumber: SeverityNumber.INFO,
+    severityText: 'INFO',
+    body,
+    attributes: {
+      'trace.id': spanCtx?.traceId,
+      'span.id': spanCtx?.spanId,
+    },
+  });
+}
+```
+
+---
+
+## 4 — Putting It All Together
+
+```typescript
+// order.service.ts
+import { Injectable } from '@nestjs/common';
+import { trace, SpanStatusCode } from '@opentelemetry/api';
+import { OrderMetrics } from './order.metrics';
+import { OtelLoggerService } from './otel-logger.service';
+
+const tracer = trace.getTracer('order-service');
+
+@Injectable()
+export class OrderService {
+  constructor(
+    private readonly metrics: OrderMetrics,
+    private readonly logger: OtelLoggerService,
+  ) {}
+
+  async createOrder(dto: CreateOrderDto): Promise<Order> {
+    return tracer.startActiveSpan('order.create', async (span) => {
+      span.setAttributes({ 'order.user_id': dto.userId });
+      try {
+        const order = await this.repo.save(dto);
+        this.metrics.recordOrderCreated('success');
+        this.logger.info('Order created', { 'order.id': order.id });
+        span.setStatus({ code: SpanStatusCode.OK });
+        return order;
+      } catch (err) {
+        this.metrics.recordOrderCreated('error');
+        this.logger.error('Order creation failed', err as Error, { 'order.user_id': dto.userId });
+        span.setStatus({ code: SpanStatusCode.ERROR, message: (err as Error).message });
+        span.recordException(err as Error);
+        throw err;
+      } finally {
+        span.end();
+      }
+    });
+  }
+}
+```

package/README.md

@@ -1,6 +1,6 @@
 # @eqxjs/nest-opentelemetry
 
-**Version: 3.1.0** (stable)
+**Version: 3.2.0** (stable)
 
 OpenTelemetry auto-instrumentation for NestJS applications. Wraps `@opentelemetry/sdk-node` with a pre-configured set of instrumentations, exporters, and resource detectors — all driven by environment variables.
 
@@ -11,7 +11,7 @@ OpenTelemetry auto-instrumentation for NestJS applications. Wraps `@opentelemetr
 - **Custom Kafka span enrichment** — supports KafkaJS, `eqxjs-kafkajs`, and Confluent Kafka with M1/M2/M3 message protocol parsing
 - **Custom Socket.IO span enrichment** — captures socket ID, key, and M1 protocol attributes
 - **Cloud resource detection** — automatic detection for AWS, Azure, GCP, Alibaba, container, and more
-- **Graceful shutdown** — listens for `SIGTERM` and flushes telemetry before exit
+- **Graceful shutdown** — listens for `SIGTERM` and `beforeExit` and flushes telemetry before exit
 
 ## Installation
 
@@ -64,6 +64,7 @@ Use `getNodeAutoInstrumentations(config?)` to build the instrumentation list wit
 | `APPLICATIONINSIGHTS_CONNECTION_STRING_METRIC` | Azure Monitor connection string for metrics (takes priority over `METRICS_URL`) |
 | `APPLICATIONINSIGHTS_CONNECTION_STRING_LOG` | Azure Monitor connection string for logs (takes priority over `LOGGER_URL`) |
 | `METRIC_EXPORT_INTERVAL` | Metrics export interval in milliseconds (default: `60000`) |
+| `METRIC_PROMETHEUS_PORT` | Expose a Prometheus scrape endpoint on this port (e.g. `8081`). Takes effect only when neither `APPLICATIONINSIGHTS_CONNECTION_STRING_METRIC` nor `METRICS_URL` is set. |
 
 ### Instrumentation
 
@@ -88,6 +89,7 @@ Valid values for `OTEL_NODE_ENABLED_INSTRUMENTATIONS`:
 | `dns` | DNS |
 | `eqxjs-ioredis` | EqxJS IORedis |
 | `eqxjs-kafkajs` | EqxJS KafkaJS |
+| `mongodb2` | MongoDB (legacy v2 driver) |
 | `express` | Express |
 | `fastify` | Fastify |
 | `fs` | File System (fs) |
@@ -167,7 +169,8 @@ Available detector values:
 | EqxJS KafkaJS | `opentelemetry-instrumentation-eqxjs-kafkajs` |
 | Confluent Kafka | `opentelemetry-instrumentation-confluent-kafka` |
 | AMQP (RabbitMQ) | `@opentelemetry/instrumentation-amqplib` |
-| MongoDB | `@opentelemetry/instrumentation-mongodb` + `opentelemetry-instrumentation-mongodb2` |
+| MongoDB | `@opentelemetry/instrumentation-mongodb` (enhanced reporting enabled) |
+| MongoDB v2 driver | `opentelemetry-instrumentation-mongodb2` (enhanced reporting enabled) |
 | Mongoose | `@opentelemetry/instrumentation-mongoose` |
 | PostgreSQL | `@opentelemetry/instrumentation-pg` |
 | MySQL / MySQL2 | `@opentelemetry/instrumentation-mysql`, `@opentelemetry/instrumentation-mysql2` |

package/dist/extend/common/m1.common.js

@@ -3,21 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSpanToM1 = setSpanToM1;
 const m2_common_1 = require("./m2.common");
 function setSpanToM1(span, m1Message) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    if ((_a = m1Message.protocol) === null || _a === void 0 ? void 0 : _a.version) {
-        span.setAttribute("M1.protocol.version", (_b = m1Message.protocol) === null || _b === void 0 ? void 0 : _b.version);
+    if (m1Message.protocol?.version) {
+        span.setAttribute("M1.protocol.version", m1Message.protocol?.version);
     }
-    if ((_c = m1Message.protocol) === null || _c === void 0 ? void 0 : _c.command) {
-        span.setAttribute("M1.protocol.command", (_d = m1Message.protocol) === null || _d === void 0 ? void 0 : _d.command);
+    if (m1Message.protocol?.command) {
+        span.setAttribute("M1.protocol.command", m1Message.protocol?.command);
     }
-    if ((_e = m1Message.protocol) === null || _e === void 0 ? void 0 : _e.subCommand) {
-        span.setAttribute("M1.protocol.sub_command", (_f = m1Message.protocol) === null || _f === void 0 ? void 0 : _f.subCommand);
+    if (m1Message.protocol?.subCommand) {
+        span.setAttribute("M1.protocol.sub_command", m1Message.protocol?.subCommand);
     }
-    if ((_g = m1Message.protocol) === null || _g === void 0 ? void 0 : _g.invoke) {
-        span.setAttribute("M1.protocol.invoke", (_h = m1Message.protocol) === null || _h === void 0 ? void 0 : _h.invoke);
+    if (m1Message.protocol?.invoke) {
+        span.setAttribute("M1.protocol.invoke", m1Message.protocol?.invoke);
     }
-    if ((_j = m1Message.protocol) === null || _j === void 0 ? void 0 : _j.topic) {
-        span.setAttribute("M1.protocol.topic", (_k = m1Message.protocol) === null || _k === void 0 ? void 0 : _k.topic);
+    if (m1Message.protocol?.topic) {
+        span.setAttribute("M1.protocol.topic", m1Message.protocol?.topic);
     }
     (0, m2_common_1.setSpanToM2)(span, m1Message);
 }

package/dist/extend/common/m1.common.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.common.js","sourceRoot":"","sources":["../../../src/extend/common/m1.common.ts"],"names":[],"mappings":";;AAIA,kCAoBC;AAtBD,2CAA0C;AAE1C,SAAgB,WAAW,CAAC,IAAU,EAAE,SAAkB;;IACxD,IAAI,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CACf,yBAAyB,EACzB,MAAA,SAAS,CAAC,QAAQ,0CAAE,UAAU,CAC/B,CAAC;IACJ,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,QAAQ,0CAAE,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAA,SAAS,CAAC,QAAQ,0CAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IACD,IAAA,uBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"m1.common.js","sourceRoot":"","sources":["../../../src/extend/common/m1.common.ts"],"names":[],"mappings":";;AAIA,kCAoBC;AAtBD,2CAA0C;AAE1C,SAAgB,WAAW,CAAC,IAAU,EAAE,SAAkB;IACxD,IAAI,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CACf,yBAAyB,EACzB,SAAS,CAAC,QAAQ,EAAE,UAAU,CAC/B,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IACD,IAAA,uBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/B,CAAC"}

package/dist/extend/common/m2.common.js

@@ -3,46 +3,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSpanToM2 = setSpanToM2;
 const generic_common_1 = require("./generic.common");
 function setSpanToM2(span, m2Message) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
     (0, generic_common_1.setSpanHookGeneric)(span);
-    if ((_b = (_a = m2Message.header) === null || _a === void 0 ? void 0 : _a.identity) === null || _b === void 0 ? void 0 : _b.user) {
-        span.setAttribute("enduser.id", (_d = (_c = m2Message.header) === null || _c === void 0 ? void 0 : _c.identity) === null || _d === void 0 ? void 0 : _d.user);
+    if (m2Message.header?.identity?.user) {
+        span.setAttribute("enduser.id", m2Message.header?.identity?.user);
     }
-    if ((_e = m2Message.header) === null || _e === void 0 ? void 0 : _e.version) {
-        span.setAttribute("M2.header.version", (_f = m2Message.header) === null || _f === void 0 ? void 0 : _f.version);
+    if (m2Message.header?.version) {
+        span.setAttribute("M2.header.version", m2Message.header?.version);
     }
-    if ((_g = m2Message.header) === null || _g === void 0 ? void 0 : _g.orgService) {
-        span.setAttribute("M2.header.org_service", (_h = m2Message.header) === null || _h === void 0 ? void 0 : _h.orgService);
+    if (m2Message.header?.orgService) {
+        span.setAttribute("M2.header.org_service", m2Message.header?.orgService);
     }
-    if ((_j = m2Message.header) === null || _j === void 0 ? void 0 : _j.from) {
-        span.setAttribute("M2.header.from", (_k = m2Message.header) === null || _k === void 0 ? void 0 : _k.from);
+    if (m2Message.header?.from) {
+        span.setAttribute("M2.header.from", m2Message.header?.from);
     }
-    if ((_l = m2Message.header) === null || _l === void 0 ? void 0 : _l.channel) {
-        span.setAttribute("M2.header.channel", (_m = m2Message.header) === null || _m === void 0 ? void 0 : _m.channel);
+    if (m2Message.header?.channel) {
+        span.setAttribute("M2.header.channel", m2Message.header?.channel);
     }
-    if ((_o = m2Message.header) === null || _o === void 0 ? void 0 : _o.broker) {
-        span.setAttribute("M2.header.broker", (_p = m2Message.header) === null || _p === void 0 ? void 0 : _p.broker);
+    if (m2Message.header?.broker) {
+        span.setAttribute("M2.header.broker", m2Message.header?.broker);
     }
-    if ((_q = m2Message.header) === null || _q === void 0 ? void 0 : _q.agent) {
-        span.setAttribute("M2.header.agent", (_r = m2Message.header) === null || _r === void 0 ? void 0 : _r.agent);
+    if (m2Message.header?.agent) {
+        span.setAttribute("M2.header.agent", m2Message.header?.agent);
     }
-    if ((_s = m2Message.header) === null || _s === void 0 ? void 0 : _s.useCase) {
-        span.setAttribute("M2.header.useCase", (_t = m2Message.header) === null || _t === void 0 ? void 0 : _t.useCase);
+    if (m2Message.header?.useCase) {
+        span.setAttribute("M2.header.useCase", m2Message.header?.useCase);
     }
-    if ((_u = m2Message.header) === null || _u === void 0 ? void 0 : _u.useCaseStep) {
-        span.setAttribute("M2.header.use_case_step", (_v = m2Message.header) === null || _v === void 0 ? void 0 : _v.useCaseStep);
+    if (m2Message.header?.useCaseStep) {
+        span.setAttribute("M2.header.use_case_step", m2Message.header?.useCaseStep);
     }
-    if ((_w = m2Message.header) === null || _w === void 0 ? void 0 : _w.useCaseAge) {
-        span.setAttribute("M2.header.use_case_age", (_x = m2Message.header) === null || _x === void 0 ? void 0 : _x.useCaseAge);
+    if (m2Message.header?.useCaseAge) {
+        span.setAttribute("M2.header.use_case_age", m2Message.header?.useCaseAge);
     }
-    if ((_y = m2Message.header) === null || _y === void 0 ? void 0 : _y.functionName) {
-        span.setAttribute("M2.header.function_name", (_z = m2Message.header) === null || _z === void 0 ? void 0 : _z.functionName);
+    if (m2Message.header?.functionName) {
+        span.setAttribute("M2.header.function_name", m2Message.header?.functionName);
     }
-    if ((_0 = m2Message.header) === null || _0 === void 0 ? void 0 : _0.session) {
-        span.setAttribute("M2.header.session", (_1 = m2Message.header) === null || _1 === void 0 ? void 0 : _1.session);
+    if (m2Message.header?.session) {
+        span.setAttribute("M2.header.session", m2Message.header?.session);
     }
-    if ((_2 = m2Message.header) === null || _2 === void 0 ? void 0 : _2.transaction) {
-        span.setAttribute("M2.header.transaction", (_3 = m2Message.header) === null || _3 === void 0 ? void 0 : _3.transaction);
+    if (m2Message.header?.transaction) {
+        span.setAttribute("M2.header.transaction", m2Message.header?.transaction);
     }
 }
 //# sourceMappingURL=m2.common.js.map

package/dist/extend/common/m2.common.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.common.js","sourceRoot":"","sources":["../../../src/extend/common/m2.common.ts"],"names":[],"mappings":";;AAIA,kCA4CC;AA9CD,qDAAsD;AAEtD,SAAgB,WAAW,CAAC,IAAU,EAAE,SAAkB;;IACxD,IAAA,mCAAkB,EAAC,IAAI,CAAC,CAAC;IACzB,IAAI,MAAA,MAAA,SAAS,CAAC,MAAM,0CAAE,QAAQ,0CAAE,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,MAAA,MAAA,SAAS,CAAC,MAAM,0CAAE,QAAQ,0CAAE,IAAI,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,WAAW,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,YAAY,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CACf,yBAAyB,EACzB,MAAA,SAAS,CAAC,MAAM,0CAAE,YAAY,CAC/B,CAAC;IACJ,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,MAAA,SAAS,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,MAAA,SAAS,CAAC,MAAM,0CAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC"}
+{"version":3,"file":"m2.common.js","sourceRoot":"","sources":["../../../src/extend/common/m2.common.ts"],"names":[],"mappings":";;AAIA,kCA4CC;AA9CD,qDAAsD;AAEtD,SAAgB,WAAW,CAAC,IAAU,EAAE,SAAkB;IACxD,IAAA,mCAAkB,EAAC,IAAI,CAAC,CAAC;IACzB,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CACf,yBAAyB,EACzB,SAAS,CAAC,MAAM,EAAE,YAAY,CAC/B,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC"}

package/dist/extend/common/m3.common.js

@@ -3,49 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSpanToM3 = setSpanToM3;
 const generic_common_1 = require("./generic.common");
 function setSpanToM3(span, m3Message) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
     (0, generic_common_1.setSpanHookGeneric)(span);
-    if ((_b = (_a = m3Message.service) === null || _a === void 0 ? void 0 : _a.identity) === null || _b === void 0 ? void 0 : _b.user) {
-        span.setAttribute("enduser.id", (_d = (_c = m3Message.service) === null || _c === void 0 ? void 0 : _c.identity) === null || _d === void 0 ? void 0 : _d.user);
+    if (m3Message.service?.identity?.user) {
+        span.setAttribute("enduser.id", m3Message.service?.identity?.user);
     }
-    if ((_e = m3Message.service) === null || _e === void 0 ? void 0 : _e.version) {
-        span.setAttribute("M3.service.version", (_f = m3Message.service) === null || _f === void 0 ? void 0 : _f.version);
+    if (m3Message.service?.version) {
+        span.setAttribute("M3.service.version", m3Message.service?.version);
     }
-    if ((_g = m3Message.service) === null || _g === void 0 ? void 0 : _g.version) {
-        span.setAttribute("M3.service.version", (_h = m3Message.service) === null || _h === void 0 ? void 0 : _h.version);
+    if (m3Message.service?.version) {
+        span.setAttribute("M3.service.version", m3Message.service?.version);
     }
-    if ((_j = m3Message.service) === null || _j === void 0 ? void 0 : _j.orgService) {
-        span.setAttribute("M3.service.org_service", (_k = m3Message.service) === null || _k === void 0 ? void 0 : _k.orgService);
+    if (m3Message.service?.orgService) {
+        span.setAttribute("M3.service.org_service", m3Message.service?.orgService);
     }
-    if ((_l = m3Message.service) === null || _l === void 0 ? void 0 : _l.from) {
-        span.setAttribute("M3.service.from", (_m = m3Message.service) === null || _m === void 0 ? void 0 : _m.from);
+    if (m3Message.service?.from) {
+        span.setAttribute("M3.service.from", m3Message.service?.from);
     }
-    if ((_o = m3Message.service) === null || _o === void 0 ? void 0 : _o.channel) {
-        span.setAttribute("M3.service.channel", (_p = m3Message.service) === null || _p === void 0 ? void 0 : _p.channel);
+    if (m3Message.service?.channel) {
+        span.setAttribute("M3.service.channel", m3Message.service?.channel);
     }
-    if ((_q = m3Message.service) === null || _q === void 0 ? void 0 : _q.broker) {
-        span.setAttribute("M3.service.broker", (_r = m3Message.service) === null || _r === void 0 ? void 0 : _r.broker);
+    if (m3Message.service?.broker) {
+        span.setAttribute("M3.service.broker", m3Message.service?.broker);
     }
-    if ((_s = m3Message.service) === null || _s === void 0 ? void 0 : _s.agent) {
-        span.setAttribute("M3.service.agent", (_t = m3Message.service) === null || _t === void 0 ? void 0 : _t.agent);
+    if (m3Message.service?.agent) {
+        span.setAttribute("M3.service.agent", m3Message.service?.agent);
     }
-    if ((_u = m3Message.service) === null || _u === void 0 ? void 0 : _u.useCase) {
-        span.setAttribute("M3.service.useCase", (_v = m3Message.service) === null || _v === void 0 ? void 0 : _v.useCase);
+    if (m3Message.service?.useCase) {
+        span.setAttribute("M3.service.useCase", m3Message.service?.useCase);
     }
-    if ((_w = m3Message.service) === null || _w === void 0 ? void 0 : _w.useCaseStep) {
-        span.setAttribute("M3.service.use_case_step", (_x = m3Message.service) === null || _x === void 0 ? void 0 : _x.useCaseStep);
+    if (m3Message.service?.useCaseStep) {
+        span.setAttribute("M3.service.use_case_step", m3Message.service?.useCaseStep);
     }
-    if ((_y = m3Message.service) === null || _y === void 0 ? void 0 : _y.useCaseAge) {
-        span.setAttribute("M3.service.use_case_age", (_z = m3Message.service) === null || _z === void 0 ? void 0 : _z.useCaseAge);
+    if (m3Message.service?.useCaseAge) {
+        span.setAttribute("M3.service.use_case_age", m3Message.service?.useCaseAge);
     }
-    if ((_0 = m3Message.service) === null || _0 === void 0 ? void 0 : _0.functionName) {
-        span.setAttribute("M3.service.function_name", (_1 = m3Message.service) === null || _1 === void 0 ? void 0 : _1.functionName);
+    if (m3Message.service?.functionName) {
+        span.setAttribute("M3.service.function_name", m3Message.service?.functionName);
     }
-    if ((_2 = m3Message.service) === null || _2 === void 0 ? void 0 : _2.session) {
-        span.setAttribute("M3.service.session", (_3 = m3Message.service) === null || _3 === void 0 ? void 0 : _3.session);
+    if (m3Message.service?.session) {
+        span.setAttribute("M3.service.session", m3Message.service?.session);
     }
-    if ((_4 = m3Message.service) === null || _4 === void 0 ? void 0 : _4.transaction) {
-        span.setAttribute("M3.service.transaction", (_5 = m3Message.service) === null || _5 === void 0 ? void 0 : _5.transaction);
+    if (m3Message.service?.transaction) {
+        span.setAttribute("M3.service.transaction", m3Message.service?.transaction);
     }
 }
 //# sourceMappingURL=m3.common.js.map

package/dist/extend/common/m3.common.js.map

@@ -1 +1 @@
-{"version":3,"file":"m3.common.js","sourceRoot":"","sources":["../../../src/extend/common/m3.common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"m3.common.js","sourceRoot":"","sources":["../../../src/extend/common/m3.common.ts"],"names":[],"mappings":";;AAIA,kCAkDC;AApDD,qDAAsD;AAEtD,SAAgB,WAAW,CAAC,IAAU,EAAE,SAAkB;IACxD,IAAA,mCAAkB,EAAC,IAAI,CAAC,CAAC;IACzB,IAAI,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CACf,0BAA0B,EAC1B,SAAS,CAAC,OAAO,EAAE,WAAW,CAC/B,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC;QACpC,IAAI,CAAC,YAAY,CACf,0BAA0B,EAC1B,SAAS,CAAC,OAAO,EAAE,YAAY,CAChC,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,wBAAwB,EAAE,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC"}