@ogcio/o11y-sdk-node 0.1.0-beta.8 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## [0.2.0](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.13...@ogcio/o11y-sdk-node@v0.2.0) (2025-06-24)
+
+
+### Features
+
+* late june deps update ([#154](https://github.com/ogcio/o11y/issues/154)) ([a772622](https://github.com/ogcio/o11y/commit/a7726225a59b2dbcd4326919323d935843b2f93f))
+
+
+### Miscellaneous Chores
+
+* **deps-dev:** bump @types/node to `24` AB[#29294](https://github.com/ogcio/o11y/issues/29294) ([3c74c28](https://github.com/ogcio/o11y/commit/3c74c28af41af8403220368ac72a90e40c3e15ae))
+
+## [0.1.0-beta.13](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.12...@ogcio/o11y-sdk-node@v0.1.0-beta.13) (2025-06-16)
+
+
+### Bug Fixes
+
+* **sdk-node:** allow graceful shutdown of instrumentation on SIGTERM AB[#28329](https://github.com/ogcio/o11y/issues/28329) ([#151](https://github.com/ogcio/o11y/issues/151)) ([991ee15](https://github.com/ogcio/o11y/commit/991ee1559898b721823cb9d1e0490e2ad82e6d0a))
+
+## [0.1.0-beta.12](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.11...@ogcio/o11y-sdk-node@v0.1.0-beta.12) (2025-06-04)
+
+
+### Features
+
+* add custom log processor for span enrich ([#102](https://github.com/ogcio/o11y/issues/102)) ([bbf8334](https://github.com/ogcio/o11y/commit/bbf83340940ed651dff63bbe7aaa52881d1e8c8c))
+* add opentelemetry sampler ([#66](https://github.com/ogcio/o11y/issues/66)) ([48a1761](https://github.com/ogcio/o11y/commit/48a1761d68fbccf7b63e4232a62376caecf01fbc))
+* april depedency upgrade AB[#27200](https://github.com/ogcio/o11y/issues/27200) ([#116](https://github.com/ogcio/o11y/issues/116)) ([d792fe5](https://github.com/ogcio/o11y/commit/d792fe5a783b0b495912b5bef2babfe11ef5e01d))
+* june deps update ([#147](https://github.com/ogcio/o11y/issues/147)) ([b365a40](https://github.com/ogcio/o11y/commit/b365a4099cdfd8533ffa4948620d29f0044bbd70))
+* may deps update ([#136](https://github.com/ogcio/o11y/issues/136)) ([3edd8b1](https://github.com/ogcio/o11y/commit/3edd8b1d823740d555fc4d93be427e9dc1438a95))
+* o11y sdk repo setup ([#15](https://github.com/ogcio/o11y/issues/15)) ([c5816ba](https://github.com/ogcio/o11y/commit/c5816baff1454353f12539949959e84964ed6401))
+* 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))
+* remove pnpm test on prepublishOnly script ([#68](https://github.com/ogcio/o11y/issues/68)) ([41f6f57](https://github.com/ogcio/o11y/commit/41f6f57fa415c4f7adc29f49f983539274ef7320))
+* **sdk-node:** add span customization AB[#25358](https://github.com/ogcio/o11y/issues/25358) ([46ba97b](https://github.com/ogcio/o11y/commit/46ba97bac4004ff326a954592f45213ce0e4d683))
+* **sdk-node:** custom metrics ([#53](https://github.com/ogcio/o11y/issues/53)) ([3cb40b1](https://github.com/ogcio/o11y/commit/3cb40b1add3d80615c8d123d233724094559c7ff))
+* **sdk-node:** renaming MetricsParams interface properties AB[#26188](https://github.com/ogcio/o11y/issues/26188) ([#96](https://github.com/ogcio/o11y/issues/96)) ([244aee0](https://github.com/ogcio/o11y/commit/244aee01ae6e7f319ae7f9fdeff27eb40ee3c863))
+* 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))
+
+
+### Bug Fixes
+
+* add readme file inside submodule ([#27](https://github.com/ogcio/o11y/issues/27)) ([dc518d5](https://github.com/ogcio/o11y/commit/dc518d5dde573368443bc0f8619e80e331880c78))
+* default attributes in resource ([#112](https://github.com/ogcio/o11y/issues/112)) ([f0f0b9d](https://github.com/ogcio/o11y/commit/f0f0b9d555ef321d31f7171e25dc4b8a5b044522))
+* improve getMetric attributes types ([#76](https://github.com/ogcio/o11y/issues/76)) ([243649c](https://github.com/ogcio/o11y/commit/243649c4bfe750687a729fbd836772cce16e0cb1))
+* prepublishOnly hook ([#60](https://github.com/ogcio/o11y/issues/60)) ([9fbd3ad](https://github.com/ogcio/o11y/commit/9fbd3ad0b45a1604cf2eccc26b2f8855640417a1))
+* **sdk-node:** add waitForReady for grpc-client to handle transient init connection errors AB[#28329](https://github.com/ogcio/o11y/issues/28329) ([#144](https://github.com/ogcio/o11y/issues/144)) ([6f260da](https://github.com/ogcio/o11y/commit/6f260da15fcbcd2c629ec6d4bb9fb3592803f399))
+* **sdk-node:** update sdk init examples AB[#28329](https://github.com/ogcio/o11y/issues/28329) ([#146](https://github.com/ogcio/o11y/issues/146)) ([81de295](https://github.com/ogcio/o11y/commit/81de2957a7bef7430a46c6677f3c876255ef7c88))
+
+## [0.1.0-beta.11](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.10...@ogcio/o11y-sdk-node@v0.1.0-beta.11) (2025-05-21)
+
+
+### Features
+
+* may deps update ([#136](https://github.com/ogcio/o11y/issues/136)) ([3edd8b1](https://github.com/ogcio/o11y/commit/3edd8b1d823740d555fc4d93be427e9dc1438a95))
+
+## [0.1.0-beta.10](https://github.com/ogcio/o11y/compare/@ogcio/o11y-sdk-node@v0.1.0-beta.9...@ogcio/o11y-sdk-node@v0.1.0-beta.10) (2025-04-09)
+
+
+### Features
+
+* april depedency upgrade AB[#27200](https://github.com/ogcio/o11y/issues/27200) ([#116](https://github.com/ogcio/o11y/issues/116)) ([d792fe5](https://github.com/ogcio/o11y/commit/d792fe5a783b0b495912b5bef2babfe11ef5e01d))
+
+
+### Bug Fixes
+
+* default attributes in resource ([#112](https://github.com/ogcio/o11y/issues/112)) ([f0f0b9d](https://github.com/ogcio/o11y/commit/f0f0b9d555ef321d31f7171e25dc4b8a5b044522))
+
+## [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)
 
 

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";
-export default function buildGrpcExporters(config: NodeSDKConfig): Exporters;
+import { Exporters } from "./index.js";
+export default function buildGrpcExporters(config: NodeSDKConfig): Promise<Exporters>;

package/dist/lib/exporter/grpc.js

@@ -5,12 +5,20 @@ 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";
-export default function buildGrpcExporters(config) {
+import { EnrichLogProcessor } from "../processor/enrich-logger-processor.js";
+async function defaultMetadata() {
+    const { Metadata } = await import("@grpc/grpc-js");
+    return new Metadata({
+        waitForReady: true,
+    });
+}
+export default async function buildGrpcExporters(config) {
     return {
         spans: [
             new SpanProcessorMap[config.collectorMode ?? "batch"](new OTLPTraceExporter({
                 url: `${config.collectorUrl}`,
                 compression: CompressionAlgorithm.GZIP,
+                metadata: config.grpcMetadata ?? (await defaultMetadata()),
             })),
             new EnrichSpanProcessor(config.spanAttributes),
         ],
@@ -18,12 +26,15 @@ export default function buildGrpcExporters(config) {
             exporter: new OTLPMetricExporter({
                 url: `${config.collectorUrl}`,
                 compression: CompressionAlgorithm.GZIP,
+                metadata: config.grpcMetadata ?? (await defaultMetadata()),
             }),
         }),
         logs: [
+            new EnrichLogProcessor(config.spanAttributes),
             new LogRecordProcessorMap[config.collectorMode ?? "batch"](new OTLPLogExporter({
                 url: `${config.collectorUrl}`,
                 compression: CompressionAlgorithm.GZIP,
+                metadata: config.grpcMetadata ?? (await defaultMetadata()),
             })),
         ],
     };

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/index.d.ts

@@ -1,3 +1,4 @@
+import type { Metadata } from "@grpc/grpc-js";
 export interface NodeSDKConfig {
     /**
      * The opentelemetry collector entrypoint GRPC url.
@@ -58,6 +59,12 @@ export interface NodeSDKConfig {
      * @default grpc
      */
     protocol?: SDKProtocol;
+    /**
+     * Grpc Metadata for the grpc-js client.
+     *
+     * @default { waitForReady: true }
+     */
+    grpcMetadata?: Metadata;
 }
 export interface SamplerCondition {
     type: "endsWith" | "includes" | "equals";

package/dist/lib/instrumentation.node.d.ts

@@ -1,3 +1,3 @@
 import { NodeSDK } from "@opentelemetry/sdk-node";
 import type { NodeSDKConfig } from "./index.js";
-export default function buildNodeInstrumentation(config?: NodeSDKConfig): NodeSDK | undefined;
+export default function buildNodeInstrumentation(config?: NodeSDKConfig): Promise<NodeSDK | undefined>;

package/dist/lib/instrumentation.node.js

@@ -1,14 +1,15 @@
-import { diag, DiagConsoleLogger, DiagLogLevel, } from "@opentelemetry/api";
+import process from "process";
+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) {
+export default async function buildNodeInstrumentation(config) {
     if (!config) {
         console.warn("observability config not set. Skipping NodeJS OpenTelemetry instrumentation.");
         return;
@@ -21,16 +22,6 @@ export default function buildNodeInstrumentation(config) {
         console.error("collectorUrl does not use a valid format. Skipping NodeJS OpenTelemetry instrumentation.");
         return;
     }
-    let exporter;
-    if (config.protocol === "http") {
-        exporter = buildHttpExporters(config);
-    }
-    else if (config.protocol === "console") {
-        exporter = buildConsoleExporters(config);
-    }
-    else {
-        exporter = buildGrpcExporters(config);
-    }
     const urlSampler = new UrlSampler(config.ignoreUrls, new TraceIdRatioBasedSampler(config.traceRatio ?? 1));
     const mainSampler = new ParentBasedSampler({
         root: urlSampler,
@@ -39,41 +30,47 @@ export default function buildNodeInstrumentation(config) {
         localParentSampled: urlSampler,
         localParentNotSampled: new AlwaysOffSampler(),
     });
+    diag.setLogger(new DiagConsoleLogger(), config.diagLogLevel ? DiagLogLevel[config.diagLogLevel] : DiagLogLevel.INFO);
     try {
-        diag.setLogger(new DiagConsoleLogger(), config.diagLogLevel
-            ? DiagLogLevel[config.diagLogLevel]
-            : DiagLogLevel.INFO);
+        const nodeSdkInstrumentation = getNodeAutoInstrumentations({
+            "@opentelemetry/instrumentation-fs": {
+                enabled: config.enableFS ?? false,
+            },
+        });
+        let exporter;
+        if (config.protocol === "http") {
+            exporter = buildHttpExporters(config);
+        }
+        else if (config.protocol === "console") {
+            exporter = buildConsoleExporters(config);
+        }
+        else {
+            exporter = await buildGrpcExporters(config);
+        }
         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,
             logRecordProcessors: exporter.logs,
             sampler: mainSampler,
             textMapPropagator: new W3CTraceContextPropagator(),
-            instrumentations: [
-                getNodeAutoInstrumentations({
-                    "@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;
-                                }
-                            }
-                        },
-                    },
-                }),
-            ],
+            instrumentations: [nodeSdkInstrumentation],
         });
         sdk.start();
         console.log("NodeJS OpenTelemetry instrumentation started successfully.");
+        process.on("SIGTERM", async () => {
+            try {
+                // Flushing before shutdown is implemented on a per-exporter basis.
+                await sdk.shutdown();
+                console.log("NodeJS OpenTelemetry instrumentation shutdown successfully");
+            }
+            catch (error) {
+                console.error("Error shutting down NodeJS OpenTelemetry instrumentation:", error);
+            }
+        });
         return sdk;
     }
     catch (error) {

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,
+            };
+        }
+        attributes["o11y.sdk.name"] = packageJson.name;
+        attributes["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.8",
+    "version": "0.2.0",
     "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
     "main": "dist/index.js",
     "type": "module",
@@ -27,27 +27,32 @@
     "author": "team:ogcio/observability",
     "license": "ISC",
     "dependencies": {
+        "@grpc/grpc-js": "^1.13.4",
         "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/auto-instrumentations-node": "^0.56.1",
-        "@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.60.1",
+        "@opentelemetry/core": "^2.0.1",
+        "@opentelemetry/exporter-logs-otlp-grpc": "^0.202.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-grpc": "^0.202.0",
+        "@opentelemetry/exporter-metrics-otlp-http": "^0.202.0",
+        "@opentelemetry/exporter-trace-otlp-grpc": "^0.202.0",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
+        "@opentelemetry/instrumentation": "^0.202.0",
+        "@opentelemetry/otlp-exporter-base": "^0.202.0",
+        "@opentelemetry/resources": "^2.0.1",
+        "@opentelemetry/sdk-logs": "^0.202.0",
+        "@opentelemetry/sdk-metrics": "^2.0.1",
+        "@opentelemetry/sdk-node": "^0.202.0",
+        "@opentelemetry/sdk-trace-base": "^2.0.1"
     },
     "devDependencies": {
-        "@types/node": "^22.13.9",
-        "@vitest/coverage-v8": "^3.0.8",
-        "tsx": "^4.19.3",
-        "typescript": "^5.8.2",
-        "vitest": "^3.0.8"
+        "@types/node": "^24.0.3",
+        "@vitest/coverage-v8": "^3.2.4",
+        "tsx": "^4.20.3",
+        "typescript": "^5.8.3",
+        "vitest": "^3.2.4"
+    },
+    "engines": {
+        "node": ">=20.6.0"
     }
 }

package/dist/vitest.config.js

@@ -21,10 +21,10 @@ export default defineConfig({
         reporters: ["default", ["junit", { outputFile: "test-report.xml" }]],
         environment: "node",
         pool: "threads",
-        workspace: [
+        projects: [
             {
                 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,17 +4,29 @@ 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 {
+async function defaultMetadata() {
+  const { Metadata } = await import("@grpc/grpc-js");
+
+  return new Metadata({
+    waitForReady: true,
+  });
+}
+
+export default async function buildGrpcExporters(
+  config: NodeSDKConfig,
+): Promise<Exporters> {
   return {
     spans: [
       new SpanProcessorMap[config.collectorMode ?? "batch"](
         new OTLPTraceExporter({
           url: `${config.collectorUrl}`,
           compression: CompressionAlgorithm.GZIP,
+          metadata: config.grpcMetadata ?? (await defaultMetadata()),
         }),
       ),
       new EnrichSpanProcessor(config.spanAttributes),
@@ -23,13 +35,16 @@ export default function buildGrpcExporters(config: NodeSDKConfig): Exporters {
       exporter: new OTLPMetricExporter({
         url: `${config.collectorUrl}`,
         compression: CompressionAlgorithm.GZIP,
+        metadata: config.grpcMetadata ?? (await defaultMetadata()),
       }),
     }),
     logs: [
+      new EnrichLogProcessor(config.spanAttributes),
       new LogRecordProcessorMap[config.collectorMode ?? "batch"](
         new OTLPLogExporter({
           url: `${config.collectorUrl}`,
           compression: CompressionAlgorithm.GZIP,
+          metadata: config.grpcMetadata ?? (await defaultMetadata()),
         }),
       ),
     ],

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/index.ts

@@ -1,3 +1,5 @@
+import type { Metadata } from "@grpc/grpc-js";
+
 export interface NodeSDKConfig {
   /**
    * The opentelemetry collector entrypoint GRPC url.
@@ -66,6 +68,13 @@ export interface NodeSDKConfig {
    * @default grpc
    */
   protocol?: SDKProtocol;
+
+  /**
+   * Grpc Metadata for the grpc-js client.
+   *
+   * @default { waitForReady: true }
+   */
+  grpcMetadata?: Metadata;
 }
 
 export interface SamplerCondition {

package/lib/instrumentation.node.ts

@@ -1,28 +1,24 @@
-import {
-  diag,
-  DiagConsoleLogger,
-  DiagLogLevel,
-  Span,
-} from "@opentelemetry/api";
+import process from "process";
+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(
+export default async function buildNodeInstrumentation(
   config?: NodeSDKConfig,
-): NodeSDK | undefined {
+): Promise<NodeSDK | undefined> {
   if (!config) {
     console.warn(
       "observability config not set. Skipping NodeJS OpenTelemetry instrumentation.",
@@ -44,16 +40,6 @@ export default function buildNodeInstrumentation(
     return;
   }
 
-  let exporter: Exporters;
-
-  if (config.protocol === "http") {
-    exporter = buildHttpExporters(config);
-  } else if (config.protocol === "console") {
-    exporter = buildConsoleExporters(config);
-  } else {
-    exporter = buildGrpcExporters(config);
-  }
-
   const urlSampler = new UrlSampler(
     config.ignoreUrls,
     new TraceIdRatioBasedSampler(config.traceRatio ?? 1),
@@ -67,52 +53,59 @@ export default function buildNodeInstrumentation(
     localParentNotSampled: new AlwaysOffSampler(),
   });
 
+  diag.setLogger(
+    new DiagConsoleLogger(),
+    config.diagLogLevel ? DiagLogLevel[config.diagLogLevel] : DiagLogLevel.INFO,
+  );
+
   try {
-    diag.setLogger(
-      new DiagConsoleLogger(),
-      config.diagLogLevel
-        ? DiagLogLevel[config.diagLogLevel]
-        : DiagLogLevel.INFO,
-    );
+    const nodeSdkInstrumentation = getNodeAutoInstrumentations({
+      "@opentelemetry/instrumentation-fs": {
+        enabled: config.enableFS ?? false,
+      },
+    });
+
+    let exporter: Exporters;
+
+    if (config.protocol === "http") {
+      exporter = buildHttpExporters(config);
+    } else if (config.protocol === "console") {
+      exporter = buildConsoleExporters(config);
+    } else {
+      exporter = await buildGrpcExporters(config);
+    }
 
     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,
       logRecordProcessors: exporter.logs,
       sampler: mainSampler,
       textMapPropagator: new W3CTraceContextPropagator(),
-      instrumentations: [
-        getNodeAutoInstrumentations({
-          "@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;
-                }
-              }
-            },
-          },
-        }),
-      ],
+      instrumentations: [nodeSdkInstrumentation],
     });
 
     sdk.start();
     console.log("NodeJS OpenTelemetry instrumentation started successfully.");
+
+    process.on("SIGTERM", async () => {
+      try {
+        // Flushing before shutdown is implemented on a per-exporter basis.
+        await sdk.shutdown();
+        console.log(
+          "NodeJS OpenTelemetry instrumentation shutdown successfully",
+        );
+      } catch (error) {
+        console.error(
+          "Error shutting down NodeJS OpenTelemetry instrumentation:",
+          error,
+        );
+      }
+    });
+
     return sdk;
   } catch (error) {
     console.error(

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,30 @@
+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,
+      };
+    }
+
+    attributes["o11y.sdk.name"] = packageJson.name;
+    attributes["o11y.sdk.version"] = packageJson.version;
+
+    return { attributes };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogcio/o11y-sdk-node",
-  "version": "0.1.0-beta.8",
+  "version": "0.2.0",
   "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
   "main": "dist/index.js",
   "type": "module",
@@ -19,28 +19,33 @@
   "author": "team:ogcio/observability",
   "license": "ISC",
   "dependencies": {
+    "@grpc/grpc-js": "^1.13.4",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.56.1",
-    "@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.60.1",
+    "@opentelemetry/core": "^2.0.1",
+    "@opentelemetry/exporter-logs-otlp-grpc": "^0.202.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.202.0",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.202.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.202.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.202.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
+    "@opentelemetry/instrumentation": "^0.202.0",
+    "@opentelemetry/otlp-exporter-base": "^0.202.0",
+    "@opentelemetry/resources": "^2.0.1",
+    "@opentelemetry/sdk-logs": "^0.202.0",
+    "@opentelemetry/sdk-metrics": "^2.0.1",
+    "@opentelemetry/sdk-node": "^0.202.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.1"
   },
   "devDependencies": {
-    "@types/node": "^22.13.9",
-    "@vitest/coverage-v8": "^3.0.8",
-    "tsx": "^4.19.3",
-    "typescript": "^5.8.2",
-    "vitest": "^3.0.8"
+    "@types/node": "^24.0.3",
+    "@vitest/coverage-v8": "^3.2.4",
+    "tsx": "^4.20.3",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.4"
+  },
+  "engines": {
+    "node": ">=20.6.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json",

package/test/index.test.ts

@@ -1,13 +1,27 @@
-import { describe, test, expect, vi } from "vitest";
+import { describe, test, expect, vi, beforeEach, afterEach } from "vitest";
 import { NodeSDKConfig } from "../index";
 import { instrumentNode } from "../index";
-
-vi.mock("../lib/instrumentation.node", () => ({
-  default: vi.fn(),
-}));
+import * as buildNodeInstrumentationModule from "../lib/instrumentation.node";
+import { metrics } from "@opentelemetry/sdk-node";
 
 describe("instrumentNode", () => {
+  beforeEach(() => {
+    // @ts-ignore Avoid actually running exporters at any time in tests (overriding private method)
+    vi.spyOn(
+      metrics.PeriodicExportingMetricReader.prototype,
+      "_doRun",
+    ).mockImplementation(vi.fn());
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   test("should call buildNodeInstrumentation with the provided config", async () => {
+    const instrumentationMock = vi
+      .spyOn(buildNodeInstrumentationModule, "default")
+      .mockImplementation(vi.fn());
+
     const config: NodeSDKConfig = {
       serviceName: "custom-service",
       collectorUrl: "http://custom-collector.com",
@@ -23,16 +37,34 @@ describe("instrumentNode", () => {
       },
     };
 
-    const buildNodeInstrumentation = await import(
-      "../lib/instrumentation.node"
-    );
+    await instrumentNode(config);
 
-    instrumentNode(config);
+    expect(instrumentationMock).toHaveBeenCalledWith(config);
+  });
 
-    expect(buildNodeInstrumentation.default).toHaveBeenCalledWith(config);
+  test("should not throw when called without arguments", async () => {
+    await expect(instrumentNode()).resolves.not.toThrow();
   });
 
-  test("should not throw when called without arguments", () => {
-    expect(() => instrumentNode()).not.toThrow();
+  test("should invoke instrumentation shutdown on SIGTERM", async () => {
+    const config: NodeSDKConfig = {
+      serviceName: "custom-service",
+      collectorUrl: "http://custom-collector.com",
+      protocol: "grpc",
+      resourceAttributes: {
+        "team.infra.cluster": "dev-01",
+        "team.infra.pod": "01",
+        "team.service.type": "fastify",
+      },
+      spanAttributes: {
+        "signal.namespace": "example",
+        "signal.number": () => "callback",
+      },
+    };
+
+    const sdk = await instrumentNode(config);
+    const shutdownMock = vi.spyOn(sdk, "shutdown");
+    process.emit("SIGTERM");
+    expect(shutdownMock).toHaveBeenCalled();
   });
 });

package/test/integration/README.md

@@ -22,5 +22,5 @@ The `run.sh` script performs the following steps:
 - run fastify app in a docker container
 - ensure is running otherwise exit process
 - execute some curl to the fastify microservice
-- persit alloy log to a file and save to following path `/packages/sdk-node/test/integration/`
+- persist alloy log to a file and save to following path `/packages/sdk-node/test/integration/`
 - docker turn down process (containers/network/image)

package/test/node-config.test.ts

@@ -1,18 +1,11 @@
 import { test, describe, assert, expect } from "vitest";
 import buildNodeInstrumentation from "../lib/instrumentation.node.js";
-import { NodeSDK, logs, metrics, tracing } from "@opentelemetry/sdk-node";
-import { OTLPTraceExporter as GRPC_OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
-import { OTLPMetricExporter as GRPC_OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
-import { OTLPLogExporter as GRPC_OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
-
-import { OTLPTraceExporter as HTTP_OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { OTLPMetricExporter as HTTP_OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
-import { OTLPLogExporter as HTTP_OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { NodeSDK, metrics } from "@opentelemetry/sdk-node";
+
 import { NodeSDKConfig } from "../lib/index.js";
 import buildHttpExporters from "../lib/exporter/http.js";
 import {
   BatchSpanProcessor,
-  ConsoleSpanExporter,
   SimpleSpanProcessor,
 } from "@opentelemetry/sdk-trace-base";
 import {
@@ -27,7 +20,7 @@ describe("verify config settings", () => {
     serviceName: "test",
   };
 
-  test("grpc config", () => {
+  test("grpc config", async () => {
     const config: NodeSDKConfig = {
       ...commonConfig,
       protocol: "grpc",
@@ -35,7 +28,7 @@ describe("verify config settings", () => {
       diagLogLevel: "NONE",
     };
 
-    const sdk: NodeSDK | undefined = buildNodeInstrumentation(config);
+    const sdk: NodeSDK | undefined = await buildNodeInstrumentation(config);
 
     assert.ok(sdk);
 
@@ -44,8 +37,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;
 
@@ -59,14 +52,14 @@ describe("verify config settings", () => {
     );
   });
 
-  test("http config", () => {
+  test("http config", async () => {
     const config: NodeSDKConfig = {
       ...commonConfig,
       protocol: "http",
       diagLogLevel: "NONE",
     };
 
-    const sdk: NodeSDK | undefined = buildNodeInstrumentation(config);
+    const sdk: NodeSDK | undefined = await buildNodeInstrumentation(config);
     assert.ok(sdk);
 
     const _configuration = sdk["_configuration"];
@@ -74,8 +67,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;
 
@@ -89,14 +82,14 @@ describe("verify config settings", () => {
     );
   });
 
-  test("console - console config", () => {
+  test("console - console config", async () => {
     const config: NodeSDKConfig = {
       ...commonConfig,
       protocol: "console",
       diagLogLevel: "NONE",
     };
 
-    const sdk: NodeSDK = buildNodeInstrumentation(config)!;
+    const sdk: NodeSDK = await buildNodeInstrumentation(config)!;
     assert.ok(sdk);
 
     const _configuration = sdk["_configuration"];
@@ -105,8 +98,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;
 
@@ -121,7 +114,7 @@ describe("verify config settings", () => {
     );
   });
 
-  test("single log sending config", () => {
+  test("single log sending config", async () => {
     const config: NodeSDKConfig = {
       ...commonConfig,
       protocol: "grpc",
@@ -129,15 +122,15 @@ describe("verify config settings", () => {
       collectorMode: "single",
     };
 
-    const sdk: NodeSDK | undefined = buildNodeInstrumentation(config);
+    const sdk: NodeSDK | undefined = await buildNodeInstrumentation(config);
 
     assert.ok(sdk);
 
     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,33 @@
+import { describe, test, expect } 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");
+  });
+
+  test("should return default resource attribute", () => {
+    const detector = new ObservabilityResourceDetector();
+    const result = detector.detect();
+
+    expect(result.attributes).not.toBeNull();
+    // 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/test/validation.test.ts

@@ -10,7 +10,7 @@ describe("validation config: should return without breaking the execution", () =
       .spyOn(console, "warn")
       .mockImplementation(vi.fn());
 
-    instrumentNode();
+    await instrumentNode();
 
     expect(consoleWarnSpy).toHaveBeenCalled();
     expect(consoleWarnSpy).toHaveBeenCalledWith(
@@ -26,11 +26,13 @@ describe("validation config: should return without breaking the execution", () =
       .mockImplementation(vi.fn());
     const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(vi.fn());
 
-    assert.doesNotThrow(() => {
-      sdk = buildNodeInstrumentation({
-        collectorUrl: undefined!,
-      });
-    });
+    await expect(
+      buildNodeInstrumentation({
+        collectorUrl: undefined,
+      }).then((result) => {
+        sdk = result;
+      }),
+    ).resolves.not.toThrowError();
 
     assert.equal(sdk, undefined);
 
@@ -41,7 +43,7 @@ describe("validation config: should return without breaking the execution", () =
     expect(consoleLogSpy).not.toHaveBeenCalled();
   });
 
-  test("node instrumentation: invalid url", () => {
+  test("node instrumentation: invalid url", async () => {
     let sdk: NodeSDK | undefined = undefined;
 
     const consoleErrorSpy = vi
@@ -49,11 +51,13 @@ describe("validation config: should return without breaking the execution", () =
       .mockImplementation(vi.fn());
     const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(vi.fn());
 
-    assert.doesNotThrow(() => {
-      sdk = buildNodeInstrumentation({
+    await expect(
+      buildNodeInstrumentation({
         collectorUrl: "notavalidURL",
-      });
-    });
+      }).then((result) => {
+        sdk = result;
+      }),
+    ).resolves.not.toThrowError();
 
     assert.equal(sdk, undefined);
 
@@ -64,7 +68,7 @@ describe("validation config: should return without breaking the execution", () =
     expect(consoleLogSpy).not.toHaveBeenCalled();
   });
 
-  test("node instrumentation: verify no instrumentation if exception occurs", () => {
+  test("node instrumentation: verify no instrumentation if exception occurs", async () => {
     let sdk: NodeSDK | undefined = undefined;
 
     const consoleErrorSpy = vi
@@ -78,12 +82,14 @@ describe("validation config: should return without breaking the execution", () =
       }),
     }));
 
-    assert.doesNotThrow(() => {
-      sdk = buildNodeInstrumentation({
+    await expect(
+      buildNodeInstrumentation({
         collectorUrl: "https://testurl.com",
         serviceName: "test",
-      });
-    });
+      }).then((result) => {
+        sdk = result;
+      }),
+    ).resolves.not.toThrowError();
 
     assert.equal(sdk, undefined);
 

package/vitest.config.ts

@@ -22,10 +22,10 @@ export default defineConfig({
     reporters: ["default", ["junit", { outputFile: "test-report.xml" }]],
     environment: "node",
     pool: "threads",
-    workspace: [
+    projects: [
       {
         test: {
-          include: ["**/test/*.test.ts"],
+          include: ["**/test/*.test.ts", "**/test/processor/*.test.ts"],
           name: "unit",
         },
       },