nestjs-otel 6.2.0 → 7.0.0

package/README.md

@@ -10,10 +10,6 @@
 
 [OpenTelemetry](https://opentelemetry.io/) module for [Nest](https://github.com/nestjs/nest).
 
-## Questions
-
-For questions and support please use the official [Discord channel](https://discord.gg/ju8C2zJgBJ).
-
 ## Why
 
 Setting up observability metrics with nestjs requires multiple libraries and patterns. OpenTelemetry has support for multiple exporters and types of metrics such as Prometheus Metrics.
@@ -58,7 +54,7 @@ import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { JaegerExporter } from '@opentelemetry/exporter-jaeger';
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
 import { JaegerPropagator } from '@opentelemetry/propagator-jaeger';
-import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
+import { B3Propagator } from '@opentelemetry/propagator-b3';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
@@ -76,9 +72,6 @@ const otelSDK = new NodeSDK({
       new W3CTraceContextPropagator(),
       new W3CBaggagePropagator(),
       new B3Propagator(),
-      new B3Propagator({
-        injectEncoding: B3InjectEncoding.MULTI_HEADER,
-      }),
     ],
   }),
   instrumentations: [getNodeAutoInstrumentations()],
@@ -120,11 +113,13 @@ bootstrap();
 
 3. Configure nest-otel:
 
+3.1. With `forRoot`:
+
 ```ts
 const OpenTelemetryModuleConfig = OpenTelemetryModule.forRoot({
   metrics: {
     hostMetrics: true, // Includes Host Metrics
-    apiMetrics: {
+    apiMetrics: { // @deprecated - will be removed in 8.0 - you should start using the semcov from opentelemetry metrics instead
       enable: true, // Includes api metrics
       defaultAttributes: {
         // You can set default labels for api metrics
@@ -143,17 +138,87 @@ const OpenTelemetryModuleConfig = OpenTelemetryModule.forRoot({
 export class AppModule {}
 ```
 
+3.2. With `forRootAsync`:
+
+```ts
+OpenTelemetryModule.forRootAsync({
+  useClass: OtelConfigService
+});
+```
+
+```ts
+import { Injectable, Logger } from '@nestjs/common'
+import { ConfigService } from '@nestjs/config'
+import { OpenTelemetryOptionsFactory, OpenTelemetryModuleOptions } from 'nestjs-otel';
+
+@Injectable()
+export class OtelConfigService implements OpenTelemetryOptionsFactory {
+  private readonly logger = new Logger(OtelConfigService.name)
+
+  constructor(private configService: ConfigService) {}
+
+  createOpenTelemetryOptions(): Promise<OpenTelemetryModuleOptions> | OpenTelemetryModuleOptions {
+    const { hostMetrics, apiMetrics } = this.configService.get('otel')
+
+    return {
+      metrics: {
+        hostMetrics: hostMetrics.enabled,
+        apiMetrics: {
+          enable: apiMetrics.enabled,
+        },
+      },
+    };
+  }
+}
+```
+
 ## Span Decorator
 
-If you need, you can define a custom Tracing Span for a method. It works async or sync. Span takes its name from the parameter; but by default, it is the same as the method's name
+If you need, you can define a custom Tracing Span for a method. It works async or sync.
+
+Span optionally takes one or both of the following parameters:
+  * `name` - explicit name of the span; if omitted, it is derived as `<class-name>.<method-name>`.
+  * `options` - `SpanOptions` to customize the span options.
+
+You can also supply a function as the `options` argument. It will be called with the decorated method's arguments, so you can dynamically customize the span options.
+
 
 ```ts
 import { Span } from 'nestjs-otel';
 
-@Span('CRITICAL_SECTION')
-async getBooks() {
-    return [`Harry Potter and the Philosopher's Stone`];
+export class BooksService {
+
+  // span.name == 'CRITICAL_SECTION'
+  @Span('CRITICAL_SECTION')
+  async getBooks() {
+      return [`Harry Potter and the Philosopher's Stone`];
+  }
+
+  // span.name == 'BooksService.getBooksAgain'
+  @Span()
+  async getBooksAgain() {
+      return [`Harry Potter and the Philosopher's Stone`];
+  }
+
+  // explicitly set span options
+  @Span('getBook', { kind: SpanKind.SERVER })
+  async getBook(id: number) {
+    // ...
+  }
+
+  // options are set dynamically based on the id parameter
+  @Span('getBook', (id) => ({ attributes: { bookId: id } }))
+  async getBookAgain(id: number) {
+    // ...
+  }
+
+  // same as above, but span name is omitted and inferred automatically
+  @Span((id) => ({ attributes: { bookId: id } }))
+  async getBookOnceMore(id: number) {
+    // ...
+  }
 }
+
 ```
 
 ## Tracing Service
@@ -246,6 +311,7 @@ You have the following decorators:
 - `@OtelCounter()`
 - `@OtelUpDownCounter()`
 - `@OtelHistogram()`
+- `@OtelGauge()`
 - `@OtelObservableGauge()`
 - `@OtelObservableCounter()`
 - `@OtelObservableUpDownCounter()`
@@ -269,6 +335,8 @@ export class AppController {
 
 ## API Metrics with Middleware
 
+> @deprecated - this will be removed in 8.0 - you should start using the semcov from opentelemetry metrics instead
+
 | Impl | Otel Metric                         | Prometheus Metric                         | Description                               | Metric Type |
 | ---- | --------------------------------    | ---------------------------------------   | ----------------------------------------- | ----------- |
 | ✅   | http.server.request.count           | http_server_request_count_total           | Total number of HTTP requests.            | Counter     |

package/lib/feature-detection.utils.d.ts

@@ -1,24 +1,5 @@
-import { HttpServer } from '@nestjs/common';
-export declare enum ExpressVersion {
-    V4 = "4.x",
-    V5 = "5.x"
-}
-export declare enum FastifyVersion {
-    V4 = "4.x",
-    V5 = "5.x"
-}
 export declare enum HttpAdapterType {
     EXPRESS = "express",
     FASTIFY = "fastify"
 }
-type HttpExpresAdapterResponse = {
-    adapterType: HttpAdapterType.EXPRESS;
-    version: ExpressVersion;
-};
-type HttpFastifyAdapterResponse = {
-    adapterType: HttpAdapterType.FASTIFY;
-    version: FastifyVersion;
-};
-type HttpAdapterTypeAndVersion = HttpExpresAdapterResponse | HttpFastifyAdapterResponse;
-export declare function detectHttpAdapterTypeAndVersion(httpAdapter: HttpServer): HttpAdapterTypeAndVersion;
-export {};
+export declare function detectHttpAdapterType(httpAdapter: any): HttpAdapterType;

package/lib/feature-detection.utils.js

@@ -1,59 +1,16 @@
 "use strict";
+// Kudos to Papooch - https://github.com/Papooch/nestjs-cls/blob/2803ce67409c493601cc61a3299e7b47d3869c66/packages/core/src/lib/cls-module/feature-detection.utils.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpAdapterType = exports.FastifyVersion = exports.ExpressVersion = void 0;
-exports.detectHttpAdapterTypeAndVersion = detectHttpAdapterTypeAndVersion;
-var ExpressVersion;
-(function (ExpressVersion) {
-    ExpressVersion["V4"] = "4.x";
-    ExpressVersion["V5"] = "5.x";
-})(ExpressVersion || (exports.ExpressVersion = ExpressVersion = {}));
-var FastifyVersion;
-(function (FastifyVersion) {
-    FastifyVersion["V4"] = "4.x";
-    FastifyVersion["V5"] = "5.x";
-})(FastifyVersion || (exports.FastifyVersion = FastifyVersion = {}));
+exports.HttpAdapterType = void 0;
+exports.detectHttpAdapterType = detectHttpAdapterType;
 var HttpAdapterType;
 (function (HttpAdapterType) {
     HttpAdapterType["EXPRESS"] = "express";
     HttpAdapterType["FASTIFY"] = "fastify";
 })(HttpAdapterType || (exports.HttpAdapterType = HttpAdapterType = {}));
-function detectHttpAdapterTypeAndVersion(httpAdapter) {
-    const adapterType = detectHttpAdapterType(httpAdapter);
-    if (adapterType === HttpAdapterType.FASTIFY) {
-        return {
-            adapterType: HttpAdapterType.FASTIFY,
-            version: detectFastifyVersion(httpAdapter.getInstance()),
-        };
-    }
-    else {
-        return {
-            adapterType: HttpAdapterType.EXPRESS,
-            version: detectExpressVersion(httpAdapter.getInstance()),
-        };
-    }
-}
 function detectHttpAdapterType(httpAdapter) {
     if (httpAdapter.constructor.name === 'FastifyAdapter') {
         return HttpAdapterType.FASTIFY;
     }
     return HttpAdapterType.EXPRESS;
 }
-function detectExpressVersion(expressApp) {
-    // feature detection based on https://expressjs.com/en/guide/migrating-5.html
-    if (
-    // app.del is removed in Express 5
-    typeof expressApp.del === 'undefined') {
-        return ExpressVersion.V5;
-    }
-    return ExpressVersion.V4;
-}
-function detectFastifyVersion(fastifyApp) {
-    // feature detection based on https://fastify.dev/docs/v5.1.x/Guides/Migration-Guide-V5/
-    if (
-    // these methods are removed in Fastify 5
-    typeof fastifyApp.getDefaultRoute === 'undefined' &&
-        typeof fastifyApp.setDefaultRoute === 'undefined') {
-        return FastifyVersion.V5;
-    }
-    return FastifyVersion.V4;
-}

package/lib/feature-detection.utils.spec.js

@@ -1,29 +1,53 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const feature_detection_utils_1 = require("./feature-detection.utils");
-function useNest10() {
-    jest.mock('@nestjs/testing', () => jest.requireActual('@nestjs/testing10'));
-    jest.mock('@nestjs/common', () => jest.requireActual('@nestjs/common10'));
-    jest.mock('@nestjs/core', () => jest.requireActual('@nestjs/core10'));
-    jest.mock('@nestjs/platform-express', () => jest.requireActual('@nestjs/platform-express10'));
-    jest.mock('@nestjs/platform-fastify', () => jest.requireActual('@nestjs/platform-fastify10'));
-}
-function useNest11() {
-    jest.unmock('@nestjs/testing');
-    jest.unmock('@nestjs/common');
-    jest.unmock('@nestjs/core');
-    jest.unmock('@nestjs/platform-express');
-    jest.unmock('@nestjs/platform-fastify');
-}
 describe('FeatureDetectionUtils', () => {
     describe('When using Express adapter', () => {
         async function getExpressApp() {
-            const { Module } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nestjs/common')));
-            const { Test } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nestjs/testing')));
+            const { Module } = await Promise.resolve().then(() => __importStar(require('@nestjs/common')));
+            const { Test } = await Promise.resolve().then(() => __importStar(require('@nestjs/testing')));
             let TestModule = class TestModule {
             };
-            TestModule = tslib_1.__decorate([
+            TestModule = __decorate([
                 Module({})
             ], TestModule);
             const module = await Test.createTestingModule({
@@ -31,33 +55,20 @@ describe('FeatureDetectionUtils', () => {
             }).compile();
             return module.createNestApplication();
         }
-        it('should detect Express version 4 on Nest 10', async () => {
-            useNest10();
-            const app = await getExpressApp();
-            const features = (0, feature_detection_utils_1.detectHttpAdapterTypeAndVersion)(app.getHttpAdapter());
-            expect(features).toEqual({
-                adapterType: feature_detection_utils_1.HttpAdapterType.EXPRESS,
-                version: feature_detection_utils_1.ExpressVersion.V4,
-            });
-        });
         it('should detect Express version 5 on Nest 11', async () => {
-            useNest11();
             const app = await getExpressApp();
-            const features = (0, feature_detection_utils_1.detectHttpAdapterTypeAndVersion)(app.getHttpAdapter());
-            expect(features).toEqual({
-                adapterType: feature_detection_utils_1.HttpAdapterType.EXPRESS,
-                version: feature_detection_utils_1.ExpressVersion.V5,
-            });
+            const adapterType = (0, feature_detection_utils_1.detectHttpAdapterType)(app.getHttpAdapter());
+            expect(adapterType).toEqual(feature_detection_utils_1.HttpAdapterType.EXPRESS);
         });
     });
     describe('When using Fastify adapter', () => {
         async function getFastifyApp() {
-            const { Module } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nestjs/common')));
-            const { Test } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nestjs/testing')));
-            const { FastifyAdapter } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nestjs/platform-fastify')));
+            const { Module } = await Promise.resolve().then(() => __importStar(require('@nestjs/common')));
+            const { Test } = await Promise.resolve().then(() => __importStar(require('@nestjs/testing')));
+            const { FastifyAdapter } = await Promise.resolve().then(() => __importStar(require('@nestjs/platform-fastify')));
             let TestModule = class TestModule {
             };
-            TestModule = tslib_1.__decorate([
+            TestModule = __decorate([
                 Module({})
             ], TestModule);
             const module = await Test.createTestingModule({
@@ -65,23 +76,10 @@ describe('FeatureDetectionUtils', () => {
             }).compile();
             return module.createNestApplication(new FastifyAdapter());
         }
-        it('should detect Fastify version 4 on Nest 10', async () => {
-            useNest10();
-            const app = await getFastifyApp();
-            const features = (0, feature_detection_utils_1.detectHttpAdapterTypeAndVersion)(app.getHttpAdapter());
-            expect(features).toEqual({
-                adapterType: feature_detection_utils_1.HttpAdapterType.FASTIFY,
-                version: feature_detection_utils_1.FastifyVersion.V4,
-            });
-        });
         it('should detect Fastify version 5 on Nest 11', async () => {
-            useNest11();
             const app = await getFastifyApp();
-            const features = (0, feature_detection_utils_1.detectHttpAdapterTypeAndVersion)(app.getHttpAdapter());
-            expect(features).toEqual({
-                adapterType: feature_detection_utils_1.HttpAdapterType.FASTIFY,
-                version: feature_detection_utils_1.FastifyVersion.V5,
-            });
+            const adapterType = (0, feature_detection_utils_1.detectHttpAdapterType)(app.getHttpAdapter());
+            expect(adapterType).toEqual(feature_detection_utils_1.HttpAdapterType.FASTIFY);
         });
     });
 });

package/lib/index.d.ts

@@ -5,3 +5,4 @@ export * from './metrics/metric.service';
 export * from './metrics/injector';
 export * from './metrics/decorators';
 export * from './opentelemetry.constants';
+export * from './interfaces';

package/lib/index.js

@@ -1,10 +1,24 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./opentelemetry.module"), exports);
-tslib_1.__exportStar(require("./tracing/decorators/span"), exports);
-tslib_1.__exportStar(require("./tracing/trace.service"), exports);
-tslib_1.__exportStar(require("./metrics/metric.service"), exports);
-tslib_1.__exportStar(require("./metrics/injector"), exports);
-tslib_1.__exportStar(require("./metrics/decorators"), exports);
-tslib_1.__exportStar(require("./opentelemetry.constants"), exports);
+__exportStar(require("./opentelemetry.module"), exports);
+__exportStar(require("./tracing/decorators/span"), exports);
+__exportStar(require("./tracing/trace.service"), exports);
+__exportStar(require("./metrics/metric.service"), exports);
+__exportStar(require("./metrics/injector"), exports);
+__exportStar(require("./metrics/decorators"), exports);
+__exportStar(require("./opentelemetry.constants"), exports);
+__exportStar(require("./interfaces"), exports);

package/lib/interfaces/index.d.ts

@@ -1 +1,2 @@
 export * from './opentelemetry-options.interface';
+export * from './metric-options.interface';

package/lib/interfaces/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./opentelemetry-options.interface"), exports);
+__exportStar(require("./opentelemetry-options.interface"), exports);
+__exportStar(require("./metric-options.interface"), exports);

package/lib/interfaces/opentelemetry-options.interface.d.ts

@@ -39,6 +39,9 @@ export interface OpenTelemetryModuleAsyncOptions extends Pick<ModuleMetadata, 'i
 }
 export type OpenTelemetryMetrics = {
     hostMetrics?: boolean;
+    /**
+     * @deprecated apiMetrics is deprecated. Use semcov from opentelemetry metrics instead.
+     */
     apiMetrics?: {
         enable?: boolean;
         defaultAttributes?: Attributes;

package/lib/metrics/decorators/common.js

@@ -21,6 +21,7 @@ const OtelInstanceCounter = (options) => (originalClass) => {
             super(...args);
         }
     };
+    Object.defineProperty(wrappedClass, 'name', { value: originalClass.name });
     (0, opentelemetry_utils_1.copyMetadataFromFunctionToFunction)(originalClass, wrappedClass);
     return wrappedClass;
 };
@@ -42,7 +43,11 @@ const OtelMethodCounter = (options) => (target, propertyKey, descriptor) => {
         // @ts-ignore
         return originalFunction.apply(this, args);
     };
-    descriptor.value = wrappedFunction;
-    (0, opentelemetry_utils_1.copyMetadataFromFunctionToFunction)(originalFunction, wrappedFunction);
+    descriptor.value = new Proxy(originalFunction, {
+        apply: (_, thisArg, args) => {
+            return wrappedFunction.apply(thisArg, args);
+        },
+    });
+    (0, opentelemetry_utils_1.copyMetadataFromFunctionToFunction)(originalFunction, descriptor.value);
 };
 exports.OtelMethodCounter = OtelMethodCounter;

package/lib/metrics/decorators/common.spec.js

@@ -1,6 +1,14 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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 });
-const tslib_1 = require("tslib");
 require("reflect-metadata");
 const common_1 = require("@nestjs/common");
 const common_2 = require("./common");
@@ -8,14 +16,14 @@ const TestDecoratorThatSetsMetadata = () => (0, common_1.SetMetadata)('some-meta
 let TestClass = class TestClass {
     method() { }
 };
-tslib_1.__decorate([
+__decorate([
     TestDecoratorThatSetsMetadata(),
     (0, common_2.OtelMethodCounter)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestClass.prototype, "method", null);
-TestClass = tslib_1.__decorate([
+TestClass = __decorate([
     (0, common_2.OtelInstanceCounter)(),
     TestDecoratorThatSetsMetadata()
 ], TestClass);
@@ -27,6 +35,9 @@ describe('OtelInstanceCounter', () => {
     it('should maintain reflect metadata', async () => {
         expect(Reflect.getMetadata('some-metadata', instance.constructor)).toEqual(true);
     });
+    it('should preserve the original class name', async () => {
+        expect(instance.constructor.name).toEqual('TestClass');
+    });
 });
 describe('OtelMethodCounter', () => {
     let instance;
@@ -36,4 +47,7 @@ describe('OtelMethodCounter', () => {
     it('should maintain reflect metadata', async () => {
         expect(Reflect.getMetadata('some-metadata', instance.method)).toEqual(true);
     });
+    it('should preserve the original method name', async () => {
+        expect(instance.method.name).toEqual('method');
+    });
 });

package/lib/metrics/decorators/index.js

@@ -1,5 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./common"), exports);
-tslib_1.__exportStar(require("./param"), exports);
+__exportStar(require("./common"), exports);
+__exportStar(require("./param"), exports);

package/lib/metrics/decorators/param.d.ts

@@ -2,6 +2,7 @@ import { OtelMetricOptions } from '../../interfaces/metric-options.interface';
 export type MetricParamDecorator = (name: string, options?: OtelMetricOptions) => ParameterDecorator;
 export declare const OtelCounter: MetricParamDecorator;
 export declare const OtelUpDownCounter: MetricParamDecorator;
+export declare const OtelGauge: MetricParamDecorator;
 export declare const OtelHistogram: MetricParamDecorator;
 export declare const OtelObservableGauge: MetricParamDecorator;
 export declare const OtelObservableCounter: MetricParamDecorator;

package/lib/metrics/decorators/param.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OtelObservableUpDownCounter = exports.OtelObservableCounter = exports.OtelObservableGauge = exports.OtelHistogram = exports.OtelUpDownCounter = exports.OtelCounter = void 0;
+exports.OtelObservableUpDownCounter = exports.OtelObservableCounter = exports.OtelObservableGauge = exports.OtelHistogram = exports.OtelGauge = exports.OtelUpDownCounter = exports.OtelCounter = void 0;
 const common_1 = require("@nestjs/common");
 const metric_data_1 = require("../metric-data");
 function createMetricParamDecorator(type, getOrCreateMetric) {
@@ -15,6 +15,7 @@ function createMetricParamDecorator(type, getOrCreateMetric) {
 }
 exports.OtelCounter = createMetricParamDecorator('OtelCounter', metric_data_1.getOrCreateCounter);
 exports.OtelUpDownCounter = createMetricParamDecorator('OtelUpDownCounter', metric_data_1.getOrCreateCounter);
+exports.OtelGauge = createMetricParamDecorator('OtelGauge', metric_data_1.getOrCreateGauge);
 exports.OtelHistogram = createMetricParamDecorator('OtelHistogram', metric_data_1.getOrCreateHistogram);
 exports.OtelObservableGauge = createMetricParamDecorator('OtelObservableGauge', metric_data_1.getOrCreateObservableGauge);
 exports.OtelObservableCounter = createMetricParamDecorator('OtelObservableCounter', metric_data_1.getOrCreateObservableCounter);

package/lib/metrics/metric-data.d.ts

@@ -1,10 +1,11 @@
-import { Counter, UpDownCounter, Histogram, ObservableGauge, ObservableCounter, ObservableUpDownCounter } from '@opentelemetry/api';
+import { Gauge, Counter, UpDownCounter, Histogram, ObservableGauge, ObservableCounter, ObservableUpDownCounter } from '@opentelemetry/api';
 import { OtelMetricOptions } from '../interfaces/metric-options.interface';
-export type GenericMetric = Counter | UpDownCounter | Histogram | ObservableGauge | ObservableCounter | ObservableUpDownCounter;
+export type GenericMetric = Counter | UpDownCounter | Histogram | Gauge | ObservableGauge | ObservableCounter | ObservableUpDownCounter;
 export declare enum MetricType {
     'Counter' = "Counter",
     'UpDownCounter' = "UpDownCounter",
     'Histogram' = "Histogram",
+    'Gauge' = "Gauge",
     'ObservableGauge' = "ObservableGauge",
     'ObservableCounter' = "ObservableCounter",
     'ObservableUpDownCounter' = "ObservableUpDownCounter"
@@ -12,6 +13,7 @@ export declare enum MetricType {
 export declare const meterData: Map<string, GenericMetric>;
 export declare function getOrCreateHistogram(name: string, options?: OtelMetricOptions): Histogram;
 export declare function getOrCreateCounter(name: string, options?: OtelMetricOptions): Counter;
+export declare function getOrCreateGauge(name: string, options?: OtelMetricOptions): Gauge;
 export declare function getOrCreateUpDownCounter(name: string, options?: OtelMetricOptions): UpDownCounter;
 export declare function getOrCreateObservableGauge(name: string, options?: OtelMetricOptions): ObservableGauge;
 export declare function getOrCreateObservableCounter(name: string, options?: OtelMetricOptions): ObservableCounter;

package/lib/metrics/metric-data.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.meterData = exports.MetricType = void 0;
 exports.getOrCreateHistogram = getOrCreateHistogram;
 exports.getOrCreateCounter = getOrCreateCounter;
+exports.getOrCreateGauge = getOrCreateGauge;
 exports.getOrCreateUpDownCounter = getOrCreateUpDownCounter;
 exports.getOrCreateObservableGauge = getOrCreateObservableGauge;
 exports.getOrCreateObservableCounter = getOrCreateObservableCounter;
@@ -14,6 +15,7 @@ var MetricType;
     MetricType["Counter"] = "Counter";
     MetricType["UpDownCounter"] = "UpDownCounter";
     MetricType["Histogram"] = "Histogram";
+    MetricType["Gauge"] = "Gauge";
     MetricType["ObservableGauge"] = "ObservableGauge";
     MetricType["ObservableCounter"] = "ObservableCounter";
     MetricType["ObservableUpDownCounter"] = "ObservableUpDownCounter";
@@ -35,6 +37,9 @@ function getOrCreateHistogram(name, options = {}) {
 function getOrCreateCounter(name, options = {}) {
     return getOrCreate(name, options, MetricType.Counter);
 }
+function getOrCreateGauge(name, options = {}) {
+    return getOrCreate(name, options, MetricType.Gauge);
+}
 function getOrCreateUpDownCounter(name, options = {}) {
     return getOrCreate(name, options, MetricType.UpDownCounter);
 }

package/lib/metrics/metric.service.d.ts

@@ -3,6 +3,7 @@ export declare class MetricService {
     getCounter(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").Counter<import("@opentelemetry/api").Attributes>;
     getUpDownCounter(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").UpDownCounter<import("@opentelemetry/api").Attributes>;
     getHistogram(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").Histogram<import("@opentelemetry/api").Attributes>;
+    getGauge(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").Gauge<import("@opentelemetry/api").Attributes>;
     getObservableCounter(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").ObservableCounter;
     getObservableGauge(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").ObservableGauge;
     getObservableUpDownCounter(name: string, options?: OtelMetricOptions): import("@opentelemetry/api").ObservableUpDownCounter;

package/lib/metrics/metric.service.js

@@ -1,7 +1,12 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetricService = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const metric_data_1 = require("./metric-data");
 let MetricService = class MetricService {
@@ -14,6 +19,9 @@ let MetricService = class MetricService {
     getHistogram(name, options) {
         return (0, metric_data_1.getOrCreateHistogram)(name, options);
     }
+    getGauge(name, options) {
+        return (0, metric_data_1.getOrCreateGauge)(name, options);
+    }
     getObservableCounter(name, options) {
         return (0, metric_data_1.getOrCreateObservableCounter)(name, options);
     }
@@ -25,6 +33,6 @@ let MetricService = class MetricService {
     }
 };
 exports.MetricService = MetricService;
-exports.MetricService = MetricService = tslib_1.__decorate([
+exports.MetricService = MetricService = __decorate([
     (0, common_1.Injectable)()
 ], MetricService);

package/lib/middleware/api-metrics.middleware.d.ts

@@ -4,16 +4,16 @@ import { MetricService } from '../metrics/metric.service';
 export declare class ApiMetricsMiddleware implements NestMiddleware {
     private readonly metricService;
     private readonly options;
-    private defaultAttributes;
-    private httpServerRequestCount;
-    private httpServerResponseCount;
-    private httpServerDuration;
-    private httpServerRequestSize;
-    private httpServerResponseSize;
-    private httpServerResponseSuccessCount;
-    private httpServerResponseErrorCount;
-    private httpClientRequestErrorCount;
-    private httpServerAbortCount;
+    private readonly defaultAttributes;
+    private readonly httpServerRequestCount;
+    private readonly httpServerResponseCount;
+    private readonly httpServerDuration;
+    private readonly httpServerRequestSize;
+    private readonly httpServerResponseSize;
+    private readonly httpServerResponseSuccessCount;
+    private readonly httpServerResponseErrorCount;
+    private readonly httpClientRequestErrorCount;
+    private readonly httpServerAbortCount;
     private readonly ignoreUndefinedRoutes;
     constructor(metricService: MetricService, options?: OpenTelemetryModuleOptions);
     use(req: any, res: any, next: any): void;

package/lib/middleware/api-metrics.middleware.js

@@ -1,13 +1,73 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiMetricsMiddleware = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
-const response_time_1 = tslib_1.__importDefault(require("response-time"));
-const urlParser = tslib_1.__importStar(require("url"));
+const response_time_1 = __importDefault(require("response-time"));
+const urlParser = __importStar(require("url"));
 const metric_service_1 = require("../metrics/metric.service");
 const opentelemetry_constants_1 = require("../opentelemetry.constants");
 let ApiMetricsMiddleware = class ApiMetricsMiddleware {
+    metricService;
+    options;
+    defaultAttributes;
+    httpServerRequestCount;
+    httpServerResponseCount;
+    httpServerDuration;
+    httpServerRequestSize;
+    httpServerResponseSize;
+    httpServerResponseSuccessCount;
+    httpServerResponseErrorCount;
+    httpClientRequestErrorCount;
+    httpServerAbortCount;
+    ignoreUndefinedRoutes;
     constructor(metricService, options = {}) {
         this.metricService = metricService;
         this.options = options;
@@ -123,9 +183,9 @@ let ApiMetricsMiddleware = class ApiMetricsMiddleware {
     }
 };
 exports.ApiMetricsMiddleware = ApiMetricsMiddleware;
-exports.ApiMetricsMiddleware = ApiMetricsMiddleware = tslib_1.__decorate([
+exports.ApiMetricsMiddleware = ApiMetricsMiddleware = __decorate([
     (0, common_1.Injectable)(),
-    tslib_1.__param(0, (0, common_1.Inject)(metric_service_1.MetricService)),
-    tslib_1.__param(1, (0, common_1.Inject)(opentelemetry_constants_1.OPENTELEMETRY_MODULE_OPTIONS)),
-    tslib_1.__metadata("design:paramtypes", [metric_service_1.MetricService, Object])
+    __param(0, (0, common_1.Inject)(metric_service_1.MetricService)),
+    __param(1, (0, common_1.Inject)(opentelemetry_constants_1.OPENTELEMETRY_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [metric_service_1.MetricService, Object])
 ], ApiMetricsMiddleware);

package/lib/middleware/index.js

@@ -1,4 +1,17 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./api-metrics.middleware"), exports);
+__exportStar(require("./api-metrics.middleware"), exports);

package/lib/middleware.utils.js

@@ -3,21 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMiddlewareMountPoint = getMiddlewareMountPoint;
 const feature_detection_utils_1 = require("./feature-detection.utils");
 const MOUNT_POINT_EXPRESS_5 = '/';
-const MOUNT_POINT_EXPRESS_4 = '*';
 const MOUNT_POINT_FASTIFY_5 = '{*path}';
-const MOUNT_POINT_FASTIFY_4 = '(.*)';
 function getMiddlewareMountPoint(adapter) {
-    const features = (0, feature_detection_utils_1.detectHttpAdapterTypeAndVersion)(adapter);
-    if (features.adapterType === feature_detection_utils_1.HttpAdapterType.FASTIFY) {
-        if (features.version === feature_detection_utils_1.FastifyVersion.V5) {
-            return MOUNT_POINT_FASTIFY_5;
-        }
-        return MOUNT_POINT_FASTIFY_4;
+    const httpAdapterType = (0, feature_detection_utils_1.detectHttpAdapterType)(adapter);
+    if (httpAdapterType === feature_detection_utils_1.HttpAdapterType.FASTIFY) {
+        return MOUNT_POINT_FASTIFY_5;
     }
     else {
-        if (features.version === feature_detection_utils_1.ExpressVersion.V5) {
-            return MOUNT_POINT_EXPRESS_5;
-        }
-        return MOUNT_POINT_EXPRESS_4;
+        return MOUNT_POINT_EXPRESS_5;
     }
 }

package/lib/opentelemetry-core.module.js

@@ -1,8 +1,19 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var OpenTelemetryCoreModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenTelemetryCoreModule = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const host_metrics_1 = require("@opentelemetry/host-metrics");
 const api_1 = require("@opentelemetry/api");
@@ -19,10 +30,12 @@ const middleware_utils_1 = require("./middleware.utils");
  * @internal
  */
 let OpenTelemetryCoreModule = OpenTelemetryCoreModule_1 = class OpenTelemetryCoreModule {
+    options;
+    adapterHost;
+    logger = new common_1.Logger('OpenTelemetryModule');
     constructor(options = {}, adapterHost) {
         this.options = options;
         this.adapterHost = adapterHost;
-        this.logger = new common_1.Logger('OpenTelemetryModule');
     }
     /**
      * Bootstraps the internal OpenTelemetry Module with the given options
@@ -127,9 +140,9 @@ let OpenTelemetryCoreModule = OpenTelemetryCoreModule_1 = class OpenTelemetryCor
     }
 };
 exports.OpenTelemetryCoreModule = OpenTelemetryCoreModule;
-exports.OpenTelemetryCoreModule = OpenTelemetryCoreModule = OpenTelemetryCoreModule_1 = tslib_1.__decorate([
+exports.OpenTelemetryCoreModule = OpenTelemetryCoreModule = OpenTelemetryCoreModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({}),
-    tslib_1.__param(0, (0, common_1.Inject)(opentelemetry_constants_1.OPENTELEMETRY_MODULE_OPTIONS)),
-    tslib_1.__metadata("design:paramtypes", [Object, core_1.HttpAdapterHost])
+    __param(0, (0, common_1.Inject)(opentelemetry_constants_1.OPENTELEMETRY_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [Object, core_1.HttpAdapterHost])
 ], OpenTelemetryCoreModule);

package/lib/opentelemetry.module.js

@@ -1,8 +1,13 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var OpenTelemetryModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenTelemetryModule = void 0;
-const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const opentelemetry_core_module_1 = require("./opentelemetry-core.module");
 /**
@@ -34,6 +39,6 @@ let OpenTelemetryModule = OpenTelemetryModule_1 = class OpenTelemetryModule {
     }
 };
 exports.OpenTelemetryModule = OpenTelemetryModule;
-exports.OpenTelemetryModule = OpenTelemetryModule = OpenTelemetryModule_1 = tslib_1.__decorate([
+exports.OpenTelemetryModule = OpenTelemetryModule = OpenTelemetryModule_1 = __decorate([
     (0, common_1.Module)({})
 ], OpenTelemetryModule);

package/lib/tracing/decorators/span.d.ts

@@ -1,2 +1,5 @@
 import { SpanOptions } from '@opentelemetry/api';
-export declare function Span(name?: string, options?: SpanOptions): (target: any, propertyKey: PropertyKey, propertyDescriptor: PropertyDescriptor) => void;
+type SpanDecoratorOptions<T extends any[]> = SpanOptions | ((...args: T) => SpanOptions);
+export declare function Span<T extends any[]>(options?: SpanDecoratorOptions<T>): (target: any, propertyKey: PropertyKey, propertyDescriptor: TypedPropertyDescriptor<(...args: T) => any>) => void;
+export declare function Span<T extends any[]>(name?: string, options?: SpanDecoratorOptions<T>): (target: any, propertyKey: PropertyKey, propertyDescriptor: TypedPropertyDescriptor<(...args: T) => any>) => void;
+export {};

package/lib/tracing/decorators/span.js

@@ -7,29 +7,39 @@ const recordException = (span, error) => {
     span.recordException(error);
     span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: error.message });
 };
-function Span(name, options = {}) {
+function Span(nameOrOptions, maybeOptions) {
     return (target, propertyKey, propertyDescriptor) => {
+        let name;
+        let options;
+        if (typeof nameOrOptions === 'string') {
+            name = nameOrOptions;
+            options = maybeOptions ?? {};
+        }
+        else {
+            name = `${target.constructor.name}.${String(propertyKey)}`;
+            options = nameOrOptions ?? {};
+        }
         const originalFunction = propertyDescriptor.value;
+        if (typeof originalFunction !== 'function') {
+            throw new Error(`The @Span decorator can be only used on functions, but ${propertyKey.toString()} is not a function.`);
+        }
         const wrappedFunction = function PropertyDescriptor(...args) {
             const tracer = api_1.trace.getTracer('default');
-            const spanName = name || `${target.constructor.name}.${String(propertyKey)}`;
-            return tracer.startActiveSpan(spanName, options, span => {
+            const spanOptions = typeof options === 'function' ? options(...args) : options;
+            return tracer.startActiveSpan(name, spanOptions, span => {
                 if (originalFunction.constructor.name === 'AsyncFunction') {
-                    return (originalFunction
-                        // @ts-ignore
+                    return originalFunction
                         .apply(this, args)
-                        // @ts-ignore
-                        .catch(error => {
+                        .catch((error) => {
                         recordException(span, error);
                         // Throw error to propagate it further
                         throw error;
                     })
                         .finally(() => {
                         span.end();
-                    }));
+                    });
                 }
                 try {
-                    // @ts-ignore
                     return originalFunction.apply(this, args);
                 }
                 catch (error) {
@@ -42,7 +52,14 @@ function Span(name, options = {}) {
                 }
             });
         };
-        propertyDescriptor.value = wrappedFunction;
-        (0, opentelemetry_utils_1.copyMetadataFromFunctionToFunction)(originalFunction, wrappedFunction);
+        // Wrap the original function in a proxy to ensure that the function name is preserved.
+        // This should also preserve parameters for OpenAPI and other libraries
+        // that rely on the function name as metadata key.
+        propertyDescriptor.value = new Proxy(originalFunction, {
+            apply: (_, thisArg, args) => {
+                return wrappedFunction.apply(thisArg, args);
+            },
+        });
+        (0, opentelemetry_utils_1.copyMetadataFromFunctionToFunction)(originalFunction, propertyDescriptor.value);
     };
 }

package/lib/tracing/decorators/span.spec.js

@@ -1,7 +1,15 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 require("reflect-metadata");
 const api_1 = require("@opentelemetry/api");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
@@ -15,48 +23,69 @@ class TestSpan {
         return this.singleSpan();
     }
     fooProducerSpan() { }
+    argsInOptions(a, b) { }
+    implicitSpanNameWithOptions() { }
+    argsInOptionsWithImplicitName(a, b) { }
     error() {
         throw new Error('hello world');
     }
     metadata() { }
     [_a = symbol]() { }
 }
-tslib_1.__decorate([
+__decorate([
     (0, span_1.Span)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, "singleSpan", null);
-tslib_1.__decorate([
+__decorate([
     (0, span_1.Span)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, "doubleSpan", null);
-tslib_1.__decorate([
+__decorate([
     (0, span_1.Span)('foo', { kind: api_1.SpanKind.PRODUCER }),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, "fooProducerSpan", null);
-tslib_1.__decorate([
+__decorate([
+    (0, span_1.Span)('bar', (a, b) => ({ attributes: { a, b } })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, String]),
+    __metadata("design:returntype", void 0)
+], TestSpan.prototype, "argsInOptions", null);
+__decorate([
+    (0, span_1.Span)({ kind: api_1.SpanKind.PRODUCER }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], TestSpan.prototype, "implicitSpanNameWithOptions", null);
+__decorate([
+    (0, span_1.Span)((a, b) => ({ attributes: { a, b } })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, String]),
+    __metadata("design:returntype", void 0)
+], TestSpan.prototype, "argsInOptionsWithImplicitName", null);
+__decorate([
     (0, span_1.Span)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, "error", null);
-tslib_1.__decorate([
+__decorate([
     (0, span_1.Span)(),
     TestDecoratorThatSetsMetadata(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, "metadata", null);
-tslib_1.__decorate([
+__decorate([
     (0, span_1.Span)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], TestSpan.prototype, _a, null);
 describe('Span', () => {
     let instance;
@@ -67,8 +96,9 @@ describe('Span', () => {
         instance = new TestSpan();
         traceExporter = new sdk_trace_node_1.InMemorySpanExporter();
         spanProcessor = new sdk_trace_node_1.SimpleSpanProcessor(traceExporter);
-        provider = new sdk_trace_node_1.NodeTracerProvider();
-        provider.addSpanProcessor(spanProcessor);
+        provider = new sdk_trace_node_1.NodeTracerProvider({
+            spanProcessors: [spanProcessor],
+        });
         provider.register();
     });
     afterEach(async () => {
@@ -81,6 +111,10 @@ describe('Span', () => {
     it('should maintain reflect metadataa', async () => {
         expect(Reflect.getMetadata('some-metadata', instance.metadata)).toEqual(true);
     });
+    it('should preserve the original method name', () => {
+        const originalFunctionName = instance.singleSpan.name;
+        expect(originalFunctionName).toEqual('singleSpan');
+    });
     it('should set correct span', async () => {
         instance.singleSpan();
         const spans = traceExporter.getFinishedSpans();
@@ -93,6 +127,25 @@ describe('Span', () => {
         expect(spans).toHaveLength(1);
         expect(spans.map(span => span.kind)).toEqual([api_1.SpanKind.PRODUCER]);
     });
+    it('should set correct span options with implicit span name', async () => {
+        instance.implicitSpanNameWithOptions();
+        const spans = traceExporter.getFinishedSpans();
+        expect(spans).toHaveLength(1);
+        expect(spans[0].name).toEqual('TestSpan.implicitSpanNameWithOptions');
+        expect(spans[0].kind).toEqual(api_1.SpanKind.PRODUCER);
+    });
+    it('should set correct span options based on method params', async () => {
+        instance.argsInOptions(10, 'bar');
+        const spans = traceExporter.getFinishedSpans();
+        expect(spans).toHaveLength(1);
+        expect(spans[0].attributes).toEqual({ a: 10, b: 'bar' });
+    });
+    it('should set correct span options based on method params with implicit span name', async () => {
+        instance.argsInOptionsWithImplicitName(10, 'bar');
+        const spans = traceExporter.getFinishedSpans();
+        expect(spans).toHaveLength(1);
+        expect(spans[0].attributes).toEqual({ a: 10, b: 'bar' });
+    });
     it('should set correct span even when calling other method with Span decorator', async () => {
         instance.doubleSpan();
         const spans = traceExporter.getFinishedSpans();

package/lib/tracing/trace.service.js

@@ -1,7 +1,12 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TraceService = void 0;
-const tslib_1 = require("tslib");
 const api_1 = require("@opentelemetry/api");
 const common_1 = require("@nestjs/common");
 let TraceService = class TraceService {
@@ -16,6 +21,6 @@ let TraceService = class TraceService {
     }
 };
 exports.TraceService = TraceService;
-exports.TraceService = TraceService = tslib_1.__decorate([
+exports.TraceService = TraceService = __decorate([
     (0, common_1.Injectable)()
 ], TraceService);

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "nestjs-otel",
-  "version": "6.2.0",
+  "version": "7.0.0",
   "description": "NestJS OpenTelemetry Library",
   "main": "lib/index.js",
   "typings": "lib/index",
+  "engines": {
+    "node": ">= 20"
+  },
   "scripts": {
     "prebuild": "rimraf lib",
     "build": "tsc",
@@ -11,7 +14,7 @@
     "format": "prettier --write ./**/*.{js,json,ts}",
     "test": "npm run test:unit && npm run test:e2e",
     "test:coverage": "jest --coverage",
-    "test:unit": "jest --passWithNoTests",
+    "test:unit": "jest",
     "test:watch": "jest --watch",
     "test:e2e": "jest --config ./tests/jest-e2e.json --runInBand --forceExit",
     "test:e2e:watch": "jest --config ./tests/jest-e2e.json --runInBand --watch",
@@ -26,8 +29,7 @@
     "opentelemetry",
     "otel",
     "tracing",
-    "observability",
-    "prometheus"
+    "observability"
   ],
   "author": "pragmaticivan@gmail.com",
   "license": "Apache-2.0",
@@ -37,43 +39,38 @@
   "homepage": "https://github.com/pragmaticivan/nestjs-otel#readme",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/host-metrics": "^0.35.5",
+    "@opentelemetry/host-metrics": "^0.36.0",
     "response-time": "^2.3.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.7.1",
-    "@commitlint/config-conventional": "^19.7.1",
-    "@nestjs/common": "^11.0.11",
-    "@nestjs/common10": "npm:@nestjs/common@10",
-    "@nestjs/core": "^11.0.11",
-    "@nestjs/core10": "npm:@nestjs/core@10",
-    "@nestjs/platform-express": "^11.0.11",
-    "@nestjs/platform-express10": "npm:@nestjs/platform-express@10",
-    "@nestjs/platform-fastify": "^11.0.11",
-    "@nestjs/platform-fastify10": "npm:@nestjs/platform-fastify@10",
-    "@nestjs/testing": "^11.0.11",
-    "@nestjs/testing10": "npm:@nestjs/testing@10",
-    "@opentelemetry/exporter-prometheus": "^0.57.2",
-    "@opentelemetry/sdk-metrics": "^1.30.1",
-    "@opentelemetry/sdk-trace-node": "^1.30.1",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@nestjs/common": "^11.1.1",
+    "@nestjs/core": "^11.1.1",
+    "@nestjs/platform-express": "^11.1.1",
+    "@nestjs/platform-fastify": "^11.1.1",
+    "@nestjs/testing": "^11.1.1",
+    "@opentelemetry/exporter-prometheus": "^0.201.1",
+    "@opentelemetry/sdk-metrics": "^2.0.0",
+    "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.8",
+    "@types/node": "^22.15.18",
     "@types/response-time": "^2.3.8",
-    "@types/supertest": "^6.0.2",
+    "@types/supertest": "^6.0.3",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
-    "lint-staged": "^15.4.3",
-    "prettier": "^3.5.2",
+    "lint-staged": "^16.0.0",
+    "prettier": "^3.5.3",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.2",
-    "supertest": "^7.0.0",
-    "ts-jest": "^29.2.6",
-    "typescript": "5.8.2"
+    "supertest": "^7.1.1",
+    "ts-jest": "^29.3.3",
+    "typescript": "5.8.3"
   },
   "peerDependencies": {
-    "@nestjs/common": ">= 10 < 12",
-    "@nestjs/core": ">= 10 < 12"
+    "@nestjs/common": ">= 11 < 12",
+    "@nestjs/core": ">= 11 < 12"
   },
   "jest": {
     "moduleFileExtensions": [