@ogcio/o11y-sdk-node 0.7.0 → 0.8.0

package/README.md

@@ -7,13 +7,13 @@ The NodeJS observability sdk is a npm package used to setup and implement opente
 pnpm
 
 ```bash
-  pnpm i --save @ogcio/o11y-sdk-node
+pnpm i --save @ogcio/o11y-sdk-node
 ```
 
 npm
 
 ```bash
-  npm i @ogcio/o11y-sdk-node
+npm i @ogcio/o11y-sdk-node
 ```
 
 ## Usage

package/dist/sdk-core/lib/redaction/ip-redactor.js

@@ -1,17 +1,44 @@
 import { BasicRedactor } from "./basic-redactor.js";
 export class IpRedactor extends BasicRedactor {
-    static IPV4_REGEX = /(?<!\d)(?:%[0-9A-Fa-f]{2})?(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}(?:%[0-9A-Fa-f]{2})?(?!\d)/gi;
-    static IPV6_REGEX = /(?<![0-9a-f:])(?:%[0-9A-Fa-f]{2})?((?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){1,7}:|:(?::[0-9A-Fa-f]{1,4}){1,7}|(?:[0-9A-Fa-f]{1,4}:){1,6}:[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){1,5}(?::[0-9A-Fa-f]{1,4}){1,2}|(?:[0-9A-Fa-f]{1,4}:){1,4}(?::[0-9A-Fa-f]{1,4}){1,3}|(?:[0-9A-Fa-f]{1,4}:){1,3}(?::[0-9A-Fa-f]{1,4}){1,4}|(?:[0-9A-Fa-f]{1,4}:){1,2}(?::[0-9A-Fa-f]{1,4}){1,5}|[0-9A-Fa-f]{1,4}:(?::[0-9A-Fa-f]{1,4}){1,6}|:(?::[0-9A-Fa-f]{1,4}){1,7}:?|(?:[0-9A-Fa-f]{1,4}:){1,4}:(?:25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})(?:%[0-9A-Fa-f]{2})?(?![0-9a-f:])/gi;
+    // iOS < 16.6 compatible: no lookbehind/lookahead
+    static IPV4_REGEX = /(?:%[0-9A-Fa-f]{2})?(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}(?:%[0-9A-Fa-f]{2})?/gi;
+    // Comprehensive IPv6 regex without lookbehind - matches all standard formats including :: compression
+    static IPV6_REGEX = /(?:%[0-9A-Fa-f]{2})?((?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){1,6}:[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){1,5}(?::[0-9A-Fa-f]{1,4}){1,2}|(?:[0-9A-Fa-f]{1,4}:){1,4}(?::[0-9A-Fa-f]{1,4}){1,3}|(?:[0-9A-Fa-f]{1,4}:){1,3}(?::[0-9A-Fa-f]{1,4}){1,4}|(?:[0-9A-Fa-f]{1,4}:){1,2}(?::[0-9A-Fa-f]{1,4}){1,5}|[0-9A-Fa-f]{1,4}:(?:(?::[0-9A-Fa-f]{1,4}){1,6})|::(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4}|[0-9A-Fa-f]{1,4}::(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){2}::(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){3}::(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){4}::(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){5}::(?:[0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){6}::[0-9A-Fa-f]{1,4}|(?:[0-9A-Fa-f]{1,4}:){1,7}:|(?:[0-9A-Fa-f]{1,4}:){1,4}:(?:25[0-5]|2[0-4]\d|1\d\d|\d{1,2})(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|\d{1,2})){3})(?:%[0-9A-Fa-f]{2})?/gi;
     redact(value) {
         const counters = {};
-        const redactedValue = value
-            .replace(IpRedactor.IPV4_REGEX, () => {
-            counters["IPv4"] = (counters["IPv4"] || 0) + 1;
-            return "[REDACTED IPV4]";
-        })
-            .replace(IpRedactor.IPV6_REGEX, () => {
-            counters["IPv6"] = (counters["IPv6"] || 0) + 1;
-            return "[REDACTED IPV6]";
+        // First pass: redact IPv4 with boundary checking
+        const tempValue = value.replace(IpRedactor.IPV4_REGEX, (match, ...args) => {
+            const offset = args[args.length - 2];
+            const before = offset > 0 ? value[offset - 1] : "";
+            const after = offset + match.length < value.length
+                ? value[offset + match.length]
+                : "";
+            // Check if surrounded by non-digit characters
+            const isValidBefore = !before || !/\d/.test(before);
+            const isValidAfter = !after || !/\d/.test(after);
+            if (isValidBefore && isValidAfter) {
+                counters["IPv4"] = (counters["IPv4"] || 0) + 1;
+                return "[REDACTED IPV4]";
+            }
+            return match;
+        });
+        // Second pass: redact IPv6 with boundary checking
+        const redactedValue = tempValue.replace(IpRedactor.IPV6_REGEX, (match, ...args) => {
+            const offset = args[args.length - 2];
+            const before = offset > 0 ? tempValue[offset - 1] : "";
+            const after = offset + match.length < tempValue.length
+                ? tempValue[offset + match.length]
+                : "";
+            // For IPv6:
+            // Reject if there's a colon before (indicating :::)
+            // Reject if there's a hex digit or colon after
+            const isValidBefore = !before || !/[0-9a-f:]/i.test(before);
+            const isValidAfter = !after || !/[0-9a-f:]/i.test(after);
+            if (isValidBefore && isValidAfter) {
+                counters["IPv6"] = (counters["IPv6"] || 0) + 1;
+                return "[REDACTED IPV6]";
+            }
+            return match;
         });
         return {
             redactedValue: redactedValue,

package/dist/sdk-core/lib/redaction/ppsn-redactor.js

@@ -1,11 +1,23 @@
 import { BasicRedactor } from "./basic-redactor.js";
 export class PpsnRedactor extends BasicRedactor {
-    static PPSN_REGEX = /(?<!([0-9]|[a-z]))[0-9]{7}[a-z]{1,2}(?!([0-9]|[a-z]))/gi;
+    // iOS < 16.6 compatible: no lookbehind/lookahead
+    static PPSN_REGEX = /[0-9]{7}[a-z]{1,2}/gi;
     redact(value) {
         let redactedCounter = 0;
-        const redactedValue = value.replace(PpsnRedactor.PPSN_REGEX, (_) => {
-            redactedCounter++;
-            return "[REDACTED PPSN]";
+        // Boundary checking to replace lookbehind/lookahead
+        const redactedValue = value.replace(PpsnRedactor.PPSN_REGEX, (match, offset) => {
+            const before = offset > 0 ? value[offset - 1] : "";
+            const after = offset + match.length < value.length
+                ? value[offset + match.length]
+                : "";
+            // Check if surrounded by non-alphanumeric characters
+            const isValidBefore = !before || !/[0-9a-z]/i.test(before);
+            const isValidAfter = !after || !/[0-9a-z]/i.test(after);
+            if (isValidBefore && isValidAfter) {
+                redactedCounter++;
+                return "[REDACTED PPSN]";
+            }
+            return match;
         });
         return {
             redactedValue: redactedValue,

package/dist/sdk-node/index.d.ts

@@ -1,5 +1,6 @@
 import type { NodeSDK } from "@opentelemetry/sdk-node";
 import buildNodeInstrumentation from "./lib/instrumentation.node.js";
+export type { SpanKind, SpanStatus, SpanStatusCode, TraceFlags, } from "@opentelemetry/api";
 export type * from "./lib/index.js";
 export type { NodeSDK };
 export { buildNodeInstrumentation as instrumentNode };

package/dist/sdk-node/lib/exporter/console.js

@@ -9,6 +9,7 @@ export default function buildConsoleExporters(config) {
             ..._spansProcessorConfig(config),
         ],
         metrics: new metrics.PeriodicExportingMetricReader({
+            exportIntervalMillis: config.metrics?.exportIntervalMs,
             exporter: new metrics.ConsoleMetricExporter(),
         }),
         logs: [

package/dist/sdk-node/lib/exporter/grpc.js

@@ -24,6 +24,7 @@ export default async function buildGrpcExporters(config) {
             ..._spansProcessorConfig(config),
         ],
         metrics: new metrics.PeriodicExportingMetricReader({
+            exportIntervalMillis: config.metrics?.exportIntervalMs,
             exporter: new PIIExporterDecorator(new OTLPMetricExporter({
                 url: `${config.collectorUrl}`,
                 compression: CompressionAlgorithm.GZIP,

package/dist/sdk-node/lib/exporter/http.js

@@ -20,6 +20,7 @@ export default function buildHttpExporters(config) {
             ..._spansProcessorConfig(config),
         ],
         metrics: new metrics.PeriodicExportingMetricReader({
+            exportIntervalMillis: config.metrics?.exportIntervalMs,
             exporter: new PIIExporterDecorator(new OTLPMetricExporter({
                 url: `${config.collectorUrl}/v1/metrics`,
                 compression: CompressionAlgorithm.GZIP,

package/dist/sdk-node/lib/index.d.ts

@@ -54,6 +54,14 @@ export interface NodeSDKConfig {
      * @default 1
      */
     traceRatio?: number;
+    metrics?: {
+        /**
+         * Delay in milliseconds for the metric reader to initiate metric collection.
+         *
+         * @default 60_000
+         */
+        exportIntervalMs?: number;
+    };
     /**
      * Flag to enable or disable the tracing for node:fs module
      *

package/dist/sdk-node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ogcio/o11y-sdk-node",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
     "main": "dist/index.js",
     "type": "module",
@@ -9,8 +9,11 @@
         "test": "vitest",
         "prepublishOnly": "pnpm i && rm -rf dist && tsc -p tsconfig.json",
         "test:unit": "vitest --project unit",
-        "test:integration": "pnpm --filter @ogcio/o11y run prepare:integration && vitest --project integration",
-        "test:integration:dryrun": "vitest --project integration"
+        "test:integration": "pnpm test:integration:setup && pnpm test:integration:run && pnpm test:integration:assert && pnpm test:integration:teardown",
+        "test:integration:setup": "sh ./test/integration/setup.sh integration",
+        "test:integration:run": "pnpm --filter @ogcio/o11y run prepare:integration",
+        "test:integration:assert": "vitest --project integration",
+        "test:integration:teardown": "sh ./test/integration/teardown.sh integration"
     },
     "exports": {
         ".": "./dist/sdk-node/index.js",
@@ -30,10 +33,10 @@
     "author": "team:ogcio/observability",
     "license": "ISC",
     "dependencies": {
-        "@grpc/grpc-js": "1.14.2",
+        "@grpc/grpc-js": "1.14.3",
         "@opentelemetry/api": "1.9.0",
         "@opentelemetry/api-logs": "0.208.0",
-        "@opentelemetry/auto-instrumentations-node": "0.67.2",
+        "@opentelemetry/auto-instrumentations-node": "0.67.3",
         "@opentelemetry/core": "2.2.0",
         "@opentelemetry/exporter-logs-otlp-grpc": "0.208.0",
         "@opentelemetry/exporter-logs-otlp-http": "0.208.0",
@@ -50,11 +53,11 @@
         "@opentelemetry/sdk-trace-base": "2.2.0"
     },
     "devDependencies": {
-        "@types/node": "24.10.1",
-        "@vitest/coverage-v8": "4.0.15",
+        "@types/node": "25.0.3",
+        "@vitest/coverage-v8": "4.0.16",
         "tsx": "4.21.0",
         "typescript": "5.9.3",
-        "vitest": "4.0.15"
+        "vitest": "4.0.16"
     },
     "engines": {
         "node": ">=20.6.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogcio/o11y-sdk-node",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Opentelemetry standard instrumentation SDK for NodeJS based project",
   "main": "dist/index.js",
   "type": "module",
@@ -22,10 +22,10 @@
   "author": "team:ogcio/observability",
   "license": "ISC",
   "dependencies": {
-    "@grpc/grpc-js": "1.14.2",
+    "@grpc/grpc-js": "1.14.3",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "0.208.0",
-    "@opentelemetry/auto-instrumentations-node": "0.67.2",
+    "@opentelemetry/auto-instrumentations-node": "0.67.3",
     "@opentelemetry/core": "2.2.0",
     "@opentelemetry/exporter-logs-otlp-grpc": "0.208.0",
     "@opentelemetry/exporter-logs-otlp-http": "0.208.0",
@@ -42,11 +42,11 @@
     "@opentelemetry/sdk-trace-base": "2.2.0"
   },
   "devDependencies": {
-    "@types/node": "24.10.1",
-    "@vitest/coverage-v8": "4.0.15",
+    "@types/node": "25.0.3",
+    "@vitest/coverage-v8": "4.0.16",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "vitest": "4.0.15"
+    "vitest": "4.0.16"
   },
   "engines": {
     "node": ">=20.6.0"
@@ -55,7 +55,10 @@
     "build": "rm -rf dist && tsc -p tsconfig.json",
     "test": "vitest",
     "test:unit": "vitest --project unit",
-    "test:integration": "pnpm --filter @ogcio/o11y run prepare:integration && vitest --project integration",
-    "test:integration:dryrun": "vitest --project integration"
+    "test:integration": "pnpm test:integration:setup && pnpm test:integration:run && pnpm test:integration:assert && pnpm test:integration:teardown",
+    "test:integration:setup": "sh ./test/integration/setup.sh integration",
+    "test:integration:run": "pnpm --filter @ogcio/o11y run prepare:integration",
+    "test:integration:assert": "vitest --project integration",
+    "test:integration:teardown": "sh ./test/integration/teardown.sh integration"
   }
 }