@ogcio/o11y-sdk-node 0.1.0-beta.7 → 0.1.0-beta.9

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.1.0-beta.9](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.8...@ogcio/o11y-sdk-node@v0.1.0-beta.9) (2025-03-24)
+
+
+### Features
+
+* add custom log processor for span enrich ([#102](https://github.com/ogcio/o11y/issues/102)) ([bbf8334](https://github.com/ogcio/o11y/commit/bbf83340940ed651dff63bbe7aaa52881d1e8c8c))
+* upgrade to opentelemetry 2 AB[#25863](https://github.com/ogcio/o11y/issues/25863) ([#106](https://github.com/ogcio/o11y/issues/106)) ([3ff0314](https://github.com/ogcio/o11y/commit/3ff0314fef9f4d7b5db76da3b94e9035801384c7))
+
+## [0.1.0-beta.8](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.7...@ogcio/o11y-sdk-node@v0.1.0-beta.8) (2025-03-07)
+
+
+### Features
+
+* o11y showcase AB[#25895](https://github.com/ogcio/o11y/issues/25895) ([#84](https://github.com/ogcio/o11y/issues/84)) ([f8f10af](https://github.com/ogcio/o11y/commit/f8f10af97d9f5c188e3e65f7d62d5c673edce25a))
+
+
+### Bug Fixes
+
+* improve getMetric attributes types ([#76](https://github.com/ogcio/o11y/issues/76)) ([243649c](https://github.com/ogcio/o11y/commit/243649c4bfe750687a729fbd836772cce16e0cb1))
+
 ## [0.1.0-beta.7](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.6...@ogcio/o11y-sdk-node@v0.1.0-beta.7) (2025-02-18)
 
 

package/dist/lib/exporter/console.d.ts

@@ -1,3 +1,3 @@
 import { NodeSDKConfig } from "../index.js";
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 export default function buildConsoleExporters(config: NodeSDKConfig): Exporters;

package/dist/lib/exporter/console.js

@@ -2,6 +2,7 @@ import { ConsoleLogRecordExporter, SimpleLogRecordProcessor, } from "@openteleme
 import { metrics } from "@opentelemetry/sdk-node";
 import { ConsoleSpanExporter, SimpleSpanProcessor, } from "@opentelemetry/sdk-trace-base";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 export default function buildConsoleExporters(config) {
     return {
         spans: [
@@ -11,6 +12,9 @@ export default function buildConsoleExporters(config) {
         metrics: new metrics.PeriodicExportingMetricReader({
             exporter: new metrics.ConsoleMetricExporter(),
         }),
-        logs: [new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())],
+        logs: [
+            new EnrichLogProcessor(config.spanAttributes),
+            new SimpleLogRecordProcessor(new ConsoleLogRecordExporter()),
+        ],
     };
 }

package/dist/lib/exporter/grpc.d.ts

@@ -1,3 +1,3 @@
 import { NodeSDKConfig } from "../index.js";
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 export default function buildGrpcExporters(config: NodeSDKConfig): Exporters;

package/dist/lib/exporter/grpc.js

@@ -5,6 +5,7 @@ import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
 import { LogRecordProcessorMap, SpanProcessorMap } from "../utils.js";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 export default function buildGrpcExporters(config) {
     return {
         spans: [
@@ -21,6 +22,7 @@ export default function buildGrpcExporters(config) {
             }),
         }),
         logs: [
+            new EnrichLogProcessor(config.spanAttributes),
             new LogRecordProcessorMap[config.collectorMode ?? "batch"](new OTLPLogExporter({
                 url: `${config.collectorUrl}`,
                 compression: CompressionAlgorithm.GZIP,

package/dist/lib/exporter/http.d.ts

@@ -1,3 +1,3 @@
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 import { NodeSDKConfig } from "../index.js";
 export default function buildHttpExporters(config: NodeSDKConfig): Exporters;

package/dist/lib/exporter/http.js

@@ -5,6 +5,7 @@ import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
 import { LogRecordProcessorMap, SpanProcessorMap } from "../utils.js";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 export default function buildHttpExporters(config) {
     if (config.collectorUrl.endsWith("/")) {
         config.collectorUrl = config.collectorUrl.slice(0, -1);
@@ -24,6 +25,7 @@ export default function buildHttpExporters(config) {
             }),
         }),
         logs: [
+            new EnrichLogProcessor(config.spanAttributes),
             new LogRecordProcessorMap[config.collectorMode ?? "batch"](new OTLPLogExporter({
                 url: `${config.collectorUrl}/v1/logs`,
                 compression: CompressionAlgorithm.GZIP,

package/dist/lib/instrumentation.node.js

@@ -1,12 +1,12 @@
-import { diag, DiagConsoleLogger, DiagLogLevel, } from "@opentelemetry/api";
+import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";
-import { NodeSDK, resources } from "@opentelemetry/sdk-node";
+import { NodeSDK } from "@opentelemetry/sdk-node";
 import { AlwaysOffSampler, ParentBasedSampler, TraceIdRatioBasedSampler, } from "@opentelemetry/sdk-trace-base";
-import packageJson from "../package.json" with { type: "json" };
 import buildConsoleExporters from "./exporter/console.js";
 import buildGrpcExporters from "./exporter/grpc.js";
 import buildHttpExporters from "./exporter/http.js";
+import { ObservabilityResourceDetector } from "./resource.js";
 import { UrlSampler } from "./url-sampler.js";
 export default function buildNodeInstrumentation(config) {
     if (!config) {
@@ -44,11 +44,9 @@ export default function buildNodeInstrumentation(config) {
             ? DiagLogLevel[config.diagLogLevel]
             : DiagLogLevel.INFO);
         const sdk = new NodeSDK({
-            resource: new resources.Resource({
-                "o11y.sdk.name": packageJson.name,
-                "o11y.sdk.version": packageJson.version,
-                ...config.resourceAttributes,
-            }),
+            resourceDetectors: [
+                new ObservabilityResourceDetector(config.resourceAttributes),
+            ],
             spanProcessors: exporter.spans,
             serviceName: config.serviceName,
             metricReader: exporter.metrics,
@@ -60,15 +58,6 @@ export default function buildNodeInstrumentation(config) {
                     "@opentelemetry/instrumentation-fs": {
                         enabled: config.enableFS ?? false,
                     },
-                    "@opentelemetry/instrumentation-pino": {
-                        logHook: (_span, record, _level) => {
-                            if (config.spanAttributes != undefined) {
-                                for (const [key, value] of Object.entries(config.spanAttributes)) {
-                                    record[key] = typeof value === "function" ? value() : value;
-                                }
-                            }
-                        },
-                    },
                 }),
             ],
         });
@@ -85,8 +74,7 @@ function isUrl(url) {
         new URL(url);
         return true;
     }
-    catch (err) {
-        console.error(err);
+    catch (_) {
         return false;
     }
 }

package/dist/lib/metrics.d.ts

@@ -1,18 +1,18 @@
-import { Counter, Gauge, Histogram, MetricOptions, ObservableCounter, ObservableGauge, ObservableUpDownCounter, UpDownCounter } from "@opentelemetry/api";
-declare const MetricsMap: {
-    gauge: Gauge;
-    histogram: Histogram;
-    counter: Counter;
-    updowncounter: UpDownCounter;
-    "async-counter": ObservableCounter;
-    "async-updowncounter": ObservableUpDownCounter;
-    "async-gauge": ObservableGauge;
+import { Counter, Gauge, Histogram, MetricOptions, ObservableCounter, ObservableGauge, ObservableUpDownCounter, UpDownCounter, Attributes } from "@opentelemetry/api";
+type MetricTypeMap<TAttributes extends Attributes> = {
+    counter: Counter<TAttributes>;
+    histogram: Histogram<TAttributes>;
+    gauge: Gauge<TAttributes>;
+    updowncounter: UpDownCounter<TAttributes>;
+    "async-counter": ObservableCounter<TAttributes>;
+    "async-updowncounter": ObservableUpDownCounter<TAttributes>;
+    "async-gauge": ObservableGauge<TAttributes>;
 };
-type MetricType = keyof typeof MetricsMap;
+export type MetricType = keyof MetricTypeMap<Attributes>;
 export interface MetricsParams {
+    meterName: string;
     metricName: string;
-    attributeName: string;
     options?: MetricOptions;
 }
-export declare function getMetric<T extends MetricType>(type: T, p: MetricsParams): (typeof MetricsMap)[T];
+export declare function getMetric<T extends MetricType, TAttributes extends Attributes = Attributes>(type: T, p: MetricsParams): MetricTypeMap<TAttributes>[T];
 export {};

package/dist/lib/metrics.js

@@ -8,21 +8,17 @@ const MetricsFactoryMap = {
     "async-updowncounter": (meter) => meter.createObservableUpDownCounter,
     "async-gauge": (meter) => meter.createObservableGauge,
 };
-function getMeter({ metricName, attributeName }) {
-    let meter;
-    if (!metricName || !attributeName) {
-        console.error("Invaid metric configuration!");
-        meter = createNoopMeter();
+function getMeter({ meterName }) {
+    if (!meterName) {
+        console.error("Invalid metric name!");
+        return createNoopMeter();
     }
-    else {
-        meter = metrics.getMeter(`custom_metric.${metricName}`);
-    }
-    return meter;
+    return metrics.getMeter(`custom_metric.${meterName}`);
 }
 export function getMetric(type, p) {
     const meter = getMeter(p);
     if (!MetricsFactoryMap[type]) {
         throw new Error(`Unsupported metric type: ${type}`);
     }
-    return MetricsFactoryMap[type](meter).bind(meter)(p.attributeName, p.options);
+    return MetricsFactoryMap[type](meter).bind(meter)(p.metricName, p.options);
 }

package/dist/lib/processor/enrich-logger-processor.d.ts

@@ -0,0 +1,10 @@
+import { LogRecord, LogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { Context } from "@opentelemetry/api";
+import { SignalAttributeValue } from "../index.js";
+export declare class EnrichLogProcessor implements LogRecordProcessor {
+    private _spanAttributes?;
+    constructor(spanAttributes?: Record<string, SignalAttributeValue | (() => SignalAttributeValue)>);
+    forceFlush(): Promise<void>;
+    onEmit(logRecord: LogRecord, _context?: Context): void;
+    shutdown(): Promise<void>;
+}

package/dist/lib/processor/enrich-logger-processor.js

@@ -0,0 +1,19 @@
+export class EnrichLogProcessor {
+    _spanAttributes = undefined;
+    constructor(spanAttributes) {
+        this._spanAttributes = spanAttributes;
+    }
+    forceFlush() {
+        return Promise.resolve();
+    }
+    onEmit(logRecord, _context) {
+        if (this._spanAttributes) {
+            for (const [key, value] of Object.entries(this._spanAttributes)) {
+                logRecord.setAttribute(key, typeof value === "function" ? value() : value);
+            }
+        }
+    }
+    shutdown() {
+        return Promise.resolve();
+    }
+}

package/dist/lib/resource.d.ts

@@ -0,0 +1,7 @@
+import { ResourceDetector, DetectedResource } from "@opentelemetry/resources";
+import { SignalAttributeValue } from "./index.js";
+export declare class ObservabilityResourceDetector implements ResourceDetector {
+    private _resourceAttributes;
+    constructor(resourceAttributes?: Record<string, SignalAttributeValue>);
+    detect(): DetectedResource;
+}

package/dist/lib/resource.js

@@ -0,0 +1,18 @@
+import packageJson from "../package.json" with { type: "json" };
+export class ObservabilityResourceDetector {
+    _resourceAttributes;
+    constructor(resourceAttributes) {
+        this._resourceAttributes = resourceAttributes;
+    }
+    detect() {
+        let attributes = {};
+        if (this._resourceAttributes) {
+            attributes = {
+                ...this._resourceAttributes,
+                "o11y.sdk.name": packageJson.name,
+                "o11y.sdk.version": packageJson.version,
+            };
+        }
+        return { attributes };
+    }
+}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ogcio/o11y-sdk-node",
-    "version": "0.1.0-beta.7",
+    "version": "0.1.0-beta.9",
     "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
     "main": "dist/index.js",
     "type": "module",
@@ -28,26 +28,30 @@
     "license": "ISC",
     "dependencies": {
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/auto-instrumentations-node": "^0.56.0",
-        "@opentelemetry/core": "1.30.1",
-        "@opentelemetry/exporter-logs-otlp-grpc": "^0.57.2",
-        "@opentelemetry/exporter-logs-otlp-http": "^0.57.2",
-        "@opentelemetry/exporter-metrics-otlp-grpc": "^0.57.2",
-        "@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
-        "@opentelemetry/exporter-trace-otlp-grpc": "^0.57.2",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
-        "@opentelemetry/instrumentation": "^0.57.2",
-        "@opentelemetry/otlp-exporter-base": "^0.57.2",
-        "@opentelemetry/sdk-logs": "^0.57.2",
-        "@opentelemetry/sdk-metrics": "^1.30.1",
-        "@opentelemetry/sdk-node": "^0.57.2",
-        "@opentelemetry/sdk-trace-base": "^1.30.1"
+        "@opentelemetry/auto-instrumentations-node": "^0.57.0",
+        "@opentelemetry/core": "^2.0.0",
+        "@opentelemetry/exporter-logs-otlp-grpc": "^0.200.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.200.0",
+        "@opentelemetry/exporter-metrics-otlp-grpc": "^0.200.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "^0.200.0",
+        "@opentelemetry/exporter-trace-otlp-grpc": "^0.200.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
+        "@opentelemetry/instrumentation": "^0.200.0",
+        "@opentelemetry/otlp-exporter-base": "^0.200.0",
+        "@opentelemetry/resources": "^2.0.0",
+        "@opentelemetry/sdk-logs": "^0.200.0",
+        "@opentelemetry/sdk-metrics": "^2.0.0",
+        "@opentelemetry/sdk-node": "^0.200.0",
+        "@opentelemetry/sdk-trace-base": "^2.0.0"
     },
     "devDependencies": {
-        "@types/node": "^22.13.4",
-        "@vitest/coverage-v8": "^3.0.5",
-        "tsx": "^4.19.2",
-        "typescript": "^5.7.3",
-        "vitest": "^3.0.5"
+        "@types/node": "^22.13.9",
+        "@vitest/coverage-v8": "^3.0.8",
+        "tsx": "^4.19.3",
+        "typescript": "^5.8.2",
+        "vitest": "^3.0.8"
+    },
+    "engines": {
+        "node": ">=20.6.0"
     }
 }

package/dist/vitest.config.js

@@ -24,7 +24,7 @@ export default defineConfig({
         workspace: [
             {
                 test: {
-                    include: ["**/test/*.test.ts"],
+                    include: ["**/test/*.test.ts", "**/test/processor/*.test.ts"],
                     name: "unit",
                 },
             },

package/lib/exporter/console.ts

@@ -8,8 +8,9 @@ import {
   SimpleSpanProcessor,
 } from "@opentelemetry/sdk-trace-base";
 import { NodeSDKConfig } from "../index.js";
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 
 export default function buildConsoleExporters(
   config: NodeSDKConfig,
@@ -22,6 +23,9 @@ export default function buildConsoleExporters(
     metrics: new metrics.PeriodicExportingMetricReader({
       exporter: new metrics.ConsoleMetricExporter(),
     }),
-    logs: [new SimpleLogRecordProcessor(new ConsoleLogRecordExporter())],
+    logs: [
+      new EnrichLogProcessor(config.spanAttributes),
+      new SimpleLogRecordProcessor(new ConsoleLogRecordExporter()),
+    ],
   };
 }

package/lib/exporter/grpc.ts

@@ -4,9 +4,10 @@ import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
 import { NodeSDKConfig } from "../index.js";
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 import { LogRecordProcessorMap, SpanProcessorMap } from "../utils.js";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 
 export default function buildGrpcExporters(config: NodeSDKConfig): Exporters {
   return {
@@ -26,6 +27,7 @@ export default function buildGrpcExporters(config: NodeSDKConfig): Exporters {
       }),
     }),
     logs: [
+      new EnrichLogProcessor(config.spanAttributes),
       new LogRecordProcessorMap[config.collectorMode ?? "batch"](
         new OTLPLogExporter({
           url: `${config.collectorUrl}`,

package/lib/exporter/http.ts

@@ -5,8 +5,9 @@ import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
 import { LogRecordProcessorMap, SpanProcessorMap } from "../utils.js";
 import { EnrichSpanProcessor } from "../processor/enrich-span-processor.js";
-import { Exporters } from "../options.js";
+import { Exporters } from "./index.js";
 import { NodeSDKConfig } from "../index.js";
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
 
 export default function buildHttpExporters(config: NodeSDKConfig): Exporters {
   if (config.collectorUrl.endsWith("/")) {
@@ -30,6 +31,7 @@ export default function buildHttpExporters(config: NodeSDKConfig): Exporters {
       }),
     }),
     logs: [
+      new EnrichLogProcessor(config.spanAttributes),
       new LogRecordProcessorMap[config.collectorMode ?? "batch"](
         new OTLPLogExporter({
           url: `${config.collectorUrl}/v1/logs`,

package/lib/instrumentation.node.ts

@@ -1,23 +1,18 @@
-import {
-  diag,
-  DiagConsoleLogger,
-  DiagLogLevel,
-  Span,
-} from "@opentelemetry/api";
+import { diag, DiagConsoleLogger, DiagLogLevel } from "@opentelemetry/api";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";
-import { NodeSDK, resources } from "@opentelemetry/sdk-node";
+import { NodeSDK } from "@opentelemetry/sdk-node";
 import {
   AlwaysOffSampler,
   ParentBasedSampler,
   TraceIdRatioBasedSampler,
 } from "@opentelemetry/sdk-trace-base";
-import packageJson from "../package.json" with { type: "json" };
 import buildConsoleExporters from "./exporter/console.js";
 import buildGrpcExporters from "./exporter/grpc.js";
 import buildHttpExporters from "./exporter/http.js";
+import type { Exporters } from "./exporter/index.js";
 import type { NodeSDKConfig } from "./index.js";
-import type { Exporters } from "./options.js";
+import { ObservabilityResourceDetector } from "./resource.js";
 import { UrlSampler } from "./url-sampler.js";
 
 export default function buildNodeInstrumentation(
@@ -76,11 +71,9 @@ export default function buildNodeInstrumentation(
     );
 
     const sdk = new NodeSDK({
-      resource: new resources.Resource({
-        "o11y.sdk.name": packageJson.name,
-        "o11y.sdk.version": packageJson.version,
-        ...config.resourceAttributes,
-      }),
+      resourceDetectors: [
+        new ObservabilityResourceDetector(config.resourceAttributes),
+      ],
       spanProcessors: exporter.spans,
       serviceName: config.serviceName,
       metricReader: exporter.metrics,
@@ -92,21 +85,6 @@ export default function buildNodeInstrumentation(
           "@opentelemetry/instrumentation-fs": {
             enabled: config.enableFS ?? false,
           },
-          "@opentelemetry/instrumentation-pino": {
-            logHook: (
-              _span: Span,
-              record: Record<string, unknown>,
-              _level?: number,
-            ) => {
-              if (config.spanAttributes != undefined) {
-                for (const [key, value] of Object.entries(
-                  config.spanAttributes,
-                )) {
-                  record[key] = typeof value === "function" ? value() : value;
-                }
-              }
-            },
-          },
         }),
       ],
     });
@@ -126,8 +104,7 @@ function isUrl(url: string): boolean {
   try {
     new URL(url);
     return true;
-  } catch (err) {
-    console.error(err);
+  } catch (_) {
     return false;
   }
 }

package/lib/metrics.ts

@@ -10,26 +10,30 @@ import {
   ObservableGauge,
   ObservableUpDownCounter,
   UpDownCounter,
+  Attributes,
 } from "@opentelemetry/api";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-declare const MetricsMap: {
-  gauge: Gauge;
-  histogram: Histogram;
-  counter: Counter;
-  updowncounter: UpDownCounter;
-  "async-counter": ObservableCounter;
-  "async-updowncounter": ObservableUpDownCounter;
-  "async-gauge": ObservableGauge;
+type MetricTypeMap<TAttributes extends Attributes> = {
+  counter: Counter<TAttributes>;
+  histogram: Histogram<TAttributes>;
+  gauge: Gauge<TAttributes>;
+  updowncounter: UpDownCounter<TAttributes>;
+  "async-counter": ObservableCounter<TAttributes>;
+  "async-updowncounter": ObservableUpDownCounter<TAttributes>;
+  "async-gauge": ObservableGauge<TAttributes>;
 };
 
-type MetricType = keyof typeof MetricsMap;
+export type MetricType = keyof MetricTypeMap<Attributes>;
 
-const MetricsFactoryMap: {
-  [K in MetricType]: (
+const MetricsFactoryMap: Record<
+  MetricType,
+  (
     meter: Meter,
-  ) => (name: string, options?: MetricOptions) => (typeof MetricsMap)[K];
-} = {
+  ) => (
+    name: string,
+    options?: MetricOptions,
+  ) => MetricTypeMap<Attributes>[MetricType]
+> = {
   gauge: (meter: Meter) => meter.createGauge,
   histogram: (meter: Meter) => meter.createHistogram,
   counter: (meter: Meter) => meter.createCounter,
@@ -37,34 +41,35 @@ const MetricsFactoryMap: {
   "async-counter": (meter: Meter) => meter.createObservableCounter,
   "async-updowncounter": (meter: Meter) => meter.createObservableUpDownCounter,
   "async-gauge": (meter: Meter) => meter.createObservableGauge,
-};
+} as const;
 
 export interface MetricsParams {
+  meterName: string;
   metricName: string;
-  attributeName: string;
   options?: MetricOptions;
 }
 
-function getMeter({ metricName, attributeName }: MetricsParams) {
-  let meter: Meter;
-  if (!metricName || !attributeName) {
-    console.error("Invaid metric configuration!");
-    meter = createNoopMeter();
-  } else {
-    meter = metrics.getMeter(`custom_metric.${metricName}`);
+function getMeter({ meterName }: MetricsParams) {
+  if (!meterName) {
+    console.error("Invalid metric name!");
+    return createNoopMeter();
   }
-  return meter;
+
+  return metrics.getMeter(`custom_metric.${meterName}`);
 }
 
-export function getMetric<T extends MetricType>(
-  type: T,
-  p: MetricsParams,
-): (typeof MetricsMap)[T] {
+export function getMetric<
+  T extends MetricType,
+  TAttributes extends Attributes = Attributes,
+>(type: T, p: MetricsParams): MetricTypeMap<TAttributes>[T] {
   const meter = getMeter(p);
 
   if (!MetricsFactoryMap[type]) {
     throw new Error(`Unsupported metric type: ${type}`);
   }
 
-  return MetricsFactoryMap[type](meter).bind(meter)(p.attributeName, p.options);
+  return MetricsFactoryMap[type](meter).bind(meter)(
+    p.metricName,
+    p.options,
+  ) as MetricTypeMap<TAttributes>[T];
 }

package/lib/processor/enrich-logger-processor.ts

@@ -0,0 +1,34 @@
+import { LogRecord, LogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { Context } from "@opentelemetry/api";
+import { SignalAttributeValue } from "../index.js";
+
+export class EnrichLogProcessor implements LogRecordProcessor {
+  private _spanAttributes?:
+    | Record<string, SignalAttributeValue | (() => SignalAttributeValue)>
+    | undefined = undefined;
+
+  constructor(
+    spanAttributes?: Record<
+      string,
+      SignalAttributeValue | (() => SignalAttributeValue)
+    >,
+  ) {
+    this._spanAttributes = spanAttributes;
+  }
+  forceFlush(): Promise<void> {
+    return Promise.resolve();
+  }
+  onEmit(logRecord: LogRecord, _context?: Context): void {
+    if (this._spanAttributes) {
+      for (const [key, value] of Object.entries(this._spanAttributes)) {
+        logRecord.setAttribute(
+          key,
+          typeof value === "function" ? value() : value,
+        );
+      }
+    }
+  }
+  shutdown(): Promise<void> {
+    return Promise.resolve();
+  }
+}

package/lib/resource.ts

@@ -0,0 +1,29 @@
+import {
+  ResourceDetector,
+  DetectedResource,
+  DetectedResourceAttributes,
+} from "@opentelemetry/resources";
+import { SignalAttributeValue } from "./index.js";
+import packageJson from "../package.json" with { type: "json" };
+
+export class ObservabilityResourceDetector implements ResourceDetector {
+  private _resourceAttributes: Record<string, SignalAttributeValue> | undefined;
+
+  constructor(resourceAttributes?: Record<string, SignalAttributeValue>) {
+    this._resourceAttributes = resourceAttributes;
+  }
+
+  detect(): DetectedResource {
+    let attributes: DetectedResourceAttributes = {};
+
+    if (this._resourceAttributes) {
+      attributes = {
+        ...this._resourceAttributes,
+        "o11y.sdk.name": packageJson.name,
+        "o11y.sdk.version": packageJson.version,
+      };
+    }
+
+    return { attributes };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogcio/o11y-sdk-node",
-  "version": "0.1.0-beta.7",
+  "version": "0.1.0-beta.9",
   "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
   "main": "dist/index.js",
   "type": "module",
@@ -20,27 +20,31 @@
   "license": "ISC",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.56.0",
-    "@opentelemetry/core": "1.30.1",
-    "@opentelemetry/exporter-logs-otlp-grpc": "^0.57.2",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.57.2",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.57.2",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.57.2",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
-    "@opentelemetry/instrumentation": "^0.57.2",
-    "@opentelemetry/otlp-exporter-base": "^0.57.2",
-    "@opentelemetry/sdk-logs": "^0.57.2",
-    "@opentelemetry/sdk-metrics": "^1.30.1",
-    "@opentelemetry/sdk-node": "^0.57.2",
-    "@opentelemetry/sdk-trace-base": "^1.30.1"
+    "@opentelemetry/auto-instrumentations-node": "^0.57.0",
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/exporter-logs-otlp-grpc": "^0.200.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.200.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.200.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.200.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.200.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
+    "@opentelemetry/instrumentation": "^0.200.0",
+    "@opentelemetry/otlp-exporter-base": "^0.200.0",
+    "@opentelemetry/resources": "^2.0.0",
+    "@opentelemetry/sdk-logs": "^0.200.0",
+    "@opentelemetry/sdk-metrics": "^2.0.0",
+    "@opentelemetry/sdk-node": "^0.200.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.4",
-    "@vitest/coverage-v8": "^3.0.5",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.5"
+    "@types/node": "^22.13.9",
+    "@vitest/coverage-v8": "^3.0.8",
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.8"
+  },
+  "engines": {
+    "node": ">=20.6.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json",

package/test/integration/run.sh

@@ -37,6 +37,9 @@ if [[ $ERROR_CODE -eq 0 ]]; then
     docker run --detach \
         --network $NETWORK_NAME \
         --name $NODE_CONTAINER_NAME \
+        -e DB_DISABLED="true" \
+        -e SERVER_HOST="0.0.0.0" \
+        -e OTEL_COLLECTOR_URL="http://integrationalloy:4317" \
         --health-cmd="curl -f http://${NODE_CONTAINER_NAME}:9091/api/health > /dev/null || exit 1" \
         --health-start-period=1s \
         --health-retries=10 \

package/test/metrics.test.ts

@@ -29,7 +29,7 @@ describe("MetricsFactoryMap", () => {
 
   const validMetricParams: MetricsParams = {
     metricName: "test-metric",
-    attributeName: "test-attribute",
+    meterName: "test-meter",
     options: { description: "A test metric" },
   };
 
@@ -40,7 +40,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-gauge");
     expect(mockMeter.createGauge).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -52,7 +52,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-histogram");
     expect(mockMeter.createHistogram).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -64,7 +64,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-counter");
     expect(mockMeter.createCounter).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -76,7 +76,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-updowncounter");
     expect(mockMeter.createUpDownCounter).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -88,7 +88,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-async-counter");
     expect(mockMeter.createObservableCounter).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -102,7 +102,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-async-updowncounter");
     expect(mockMeter.createObservableUpDownCounter).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -114,7 +114,7 @@ describe("MetricsFactoryMap", () => {
 
     expect(result).toBe("mocked-async-gauge");
     expect(mockMeter.createObservableGauge).toHaveBeenCalledWith(
-      validMetricParams.attributeName,
+      validMetricParams.metricName,
       validMetricParams.options,
     );
   });
@@ -131,7 +131,7 @@ describe("MetricsFactoryMap", () => {
   test("should return noop metric fallback for null config", async () => {
     const nullMetricParams: MetricsParams = {
       metricName: null!,
-      attributeName: "",
+      meterName: "",
     };
 
     const result = getMetric("async-gauge", nullMetricParams);

package/test/node-config.test.ts

@@ -44,8 +44,8 @@ describe("verify config settings", () => {
 
     const logs = _configuration.logRecordProcessors;
 
-    assert.equal(logs.length, 1);
-    assert.ok(logs[0] instanceof BatchLogRecordProcessor);
+    assert.equal(logs.length, 2);
+    assert.ok(logs[1] instanceof BatchLogRecordProcessor);
 
     const spans = _configuration.spanProcessors;
 
@@ -74,8 +74,8 @@ describe("verify config settings", () => {
 
     const logs = _configuration.logRecordProcessors;
 
-    assert.equal(logs.length, 1);
-    assert.ok(logs[0] instanceof BatchLogRecordProcessor);
+    assert.equal(logs.length, 2);
+    assert.ok(logs[1] instanceof BatchLogRecordProcessor);
 
     const spans = _configuration.spanProcessors;
 
@@ -105,8 +105,8 @@ describe("verify config settings", () => {
     const logs = _configuration.logRecordProcessors;
 
     // verify simple log processor for instant console logging
-    assert.equal(logs.length, 1);
-    assert.ok(logs[0] instanceof SimpleLogRecordProcessor);
+    assert.equal(logs.length, 2);
+    assert.ok(logs[1] instanceof SimpleLogRecordProcessor);
 
     const spans = _configuration.spanProcessors;
 
@@ -136,8 +136,8 @@ describe("verify config settings", () => {
     const _configuration = sdk["_configuration"];
 
     const logRecordProcessors = _configuration.logRecordProcessors;
-    assert.equal(logRecordProcessors.length, 1);
-    assert.ok(logRecordProcessors[0] instanceof SimpleLogRecordProcessor);
+    assert.equal(logRecordProcessors.length, 2);
+    assert.ok(logRecordProcessors[1] instanceof SimpleLogRecordProcessor);
   });
 
   test("check if clear base endpoint final slash", () => {

package/test/processor/enrich-logger-processor.test.ts

@@ -0,0 +1,58 @@
+import { describe, it, expect, vi } from "vitest";
+import { LogRecord } from "@opentelemetry/sdk-logs";
+import { EnrichLogProcessor } from "../../lib/processor/enrich-logger-processor.js";
+
+const createMockLogRecord = () => {
+  return {
+    setAttribute: vi.fn(),
+  } as unknown as LogRecord;
+};
+
+describe("EnrichLogProcessor", () => {
+  it("should enrich log record with static attributes", () => {
+    const attributes = { key1: "value1", key2: 42 };
+    const processor = new EnrichLogProcessor(attributes);
+    const mockLogRecord = createMockLogRecord();
+
+    processor.onEmit(mockLogRecord);
+
+    expect(mockLogRecord.setAttribute).toHaveBeenCalledWith("key1", "value1");
+    expect(mockLogRecord.setAttribute).toHaveBeenCalledWith("key2", 42);
+  });
+
+  it("should enrich log record with dynamic attributes", () => {
+    const attributes = {
+      key1: () => "dynamicValue",
+      key2: () => 100,
+    };
+    const processor = new EnrichLogProcessor(attributes);
+    const mockLogRecord = createMockLogRecord();
+
+    processor.onEmit(mockLogRecord);
+
+    expect(mockLogRecord.setAttribute).toHaveBeenCalledWith(
+      "key1",
+      "dynamicValue",
+    );
+    expect(mockLogRecord.setAttribute).toHaveBeenCalledWith("key2", 100);
+  });
+
+  it("should not set attributes if no span attributes are provided", () => {
+    const processor = new EnrichLogProcessor();
+    const mockLogRecord = createMockLogRecord();
+
+    processor.onEmit(mockLogRecord);
+
+    expect(mockLogRecord.setAttribute).not.toHaveBeenCalled();
+  });
+
+  it("should reject forceFlush", async () => {
+    await expect(
+      new EnrichLogProcessor().forceFlush(),
+    ).resolves.toBeUndefined();
+  });
+
+  it("should resolve shutdown", async () => {
+    await expect(new EnrichLogProcessor().shutdown()).resolves.toBeUndefined();
+  });
+});

package/test/{enrich-span-processor.test.ts → processor/enrich-span-processor.test.ts}

@@ -5,13 +5,12 @@ import {
   Link,
   Span,
   SpanAttributes,
-  SpanAttributeValue,
   SpanContext,
   SpanStatus,
   TimeInput,
 } from "@opentelemetry/api";
 import { describe, expect, it } from "vitest";
-import { EnrichSpanProcessor } from "../lib/processor/enrich-span-processor.js";
+import { EnrichSpanProcessor } from "../../lib/processor/enrich-span-processor.js";
 
 class MockSpan implements Span {
   public attributes: Record<string, AttributeValue> = {};

package/test/resource.test.ts

@@ -0,0 +1,22 @@
+import { describe, test, expect, vi } from "vitest";
+import { ObservabilityResourceDetector } from "../lib/resource";
+
+describe("ObservabilityResourceDetector", () => {
+  test("should return custom resource attribute", () => {
+    const detector = new ObservabilityResourceDetector({
+      first: "first_value",
+      second: "second_value",
+    });
+    const result = detector.detect();
+
+    expect(result.attributes).not.toBeNull();
+    expect(result.attributes).toHaveProperty("first");
+    expect(result.attributes!["first"]).eq("first_value");
+    expect(result.attributes).toHaveProperty("second");
+    expect(result.attributes!["second"]).eq("second_value");
+    // default
+    expect(result.attributes).toHaveProperty("o11y.sdk.name");
+    expect(result.attributes!["o11y.sdk.name"]).eq("@ogcio/o11y-sdk-node");
+    expect(result.attributes).toHaveProperty("o11y.sdk.version");
+  });
+});

package/vitest.config.ts

@@ -25,7 +25,7 @@ export default defineConfig({
     workspace: [
       {
         test: {
-          include: ["**/test/*.test.ts"],
+          include: ["**/test/*.test.ts", "**/test/processor/*.test.ts"],
           name: "unit",
         },
       },