securenow 3.0.6 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securenow",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "type": "commonjs",
   "main": "register.js",
   "exports": { ".": "./register.js", "./register": "./register.js", "./tracing": "./tracing.js" },

package/tracing.js

@@ -2,18 +2,16 @@
 
 /**
  * Preload with: NODE_OPTIONS="-r securenow/register"
- *
  * Env:
  *   SECURENOW_INSTANCE=http://host:4318
  *   OTEL_EXPORTER_OTLP_ENDPOINT=...
  *   OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=...
  *   OTEL_EXPORTER_OTLP_HEADERS="authorization=Bearer abc123,foo=bar"
- *   OTEL_SERVICE_NAME=logical-name
- *   SECURENOW_APPID=logical-name
- *   SECURENOW_NO_UUID=1                 # one service.name across all workers
- *   SECURENOW_DISABLE_INSTRUMENTATIONS="@opentelemetry/instrumentation-mongodb,@opentelemetry/instrumentation-redis"
+ *   OTEL_SERVICE_NAME=logical-name | SECURENOW_APPID=logical-name
+ *   SECURENOW_NO_UUID=1           # one service.name across all workers
+ *   SECURENOW_DISABLE_INSTRUMENTATIONS="pkg1,pkg2"
  *   OTEL_LOG_LEVEL=info|debug
- *   SECURENOW_TEST_SPAN=1               # emit a smoke test span on startup
+ *   SECURENOW_TEST_SPAN=1
  */
 
 const { diag, DiagConsoleLogger, DiagLogLevel } = require('@opentelemetry/api');
@@ -24,71 +22,67 @@ const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventi
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
 const { v4: uuidv4 } = require('uuid');
 
-// -------------------- helpers --------------------
 const env = k => process.env[k] ?? process.env[k.toUpperCase()] ?? process.env[k.toLowerCase()];
-const parseHeaders = (str) => {
-  const out = {};
-  if (!str) return out;
-  for (const raw of str.split(',')) {
-    const s = raw.trim();
-    if (!s) continue;
-    const i = s.indexOf('=');
-    if (i === -1) continue;
+const parseHeaders = str => {
+  const out = {}; if (!str) return out;
+  for (const raw of String(str).split(',')) {
+    const s = raw.trim(); if (!s) continue;
+    const i = s.indexOf('='); if (i === -1) continue;
     out[s.slice(0, i).trim().toLowerCase()] = s.slice(i + 1).trim();
   }
   return out;
 };
 
-// -------------------- diagnostics --------------------
+// Diagnostics
 (() => {
   const L = (env('OTEL_LOG_LEVEL') || '').toLowerCase();
-  const level =
-    L === 'debug' ? DiagLogLevel.DEBUG :
-    L === 'info'  ? DiagLogLevel.INFO  :
-    L === 'warn'  ? DiagLogLevel.WARN  :
-    L === 'error' ? DiagLogLevel.ERROR : DiagLogLevel.NONE;
+  const level = L === 'debug' ? DiagLogLevel.DEBUG :
+                L === 'info'  ? DiagLogLevel.INFO  :
+                L === 'warn'  ? DiagLogLevel.WARN  :
+                L === 'error' ? DiagLogLevel.ERROR : DiagLogLevel.NONE;
   diag.setLogger(new DiagConsoleLogger(), level);
-  console.log('[securenow] preload loaded pid=', process.pid);
+  console.log('[securenow] preload loaded pid=%d', process.pid);
 })();
 
-// -------------------- endpoints --------------------
+// Endpoint config
 const endpointBase = (env('SECURENOW_INSTANCE') || env('OTEL_EXPORTER_OTLP_ENDPOINT') || 'http://46.62.173.237:4318').replace(/\/$/, '');
 const tracesUrl = env('OTEL_EXPORTER_OTLP_TRACES_ENDPOINT') || `${endpointBase}/v1/traces`;
 const headers = parseHeaders(env('OTEL_EXPORTER_OTLP_HEADERS'));
 
-// -------------------- naming rules --------------------
-const rawBase =
-  (env('OTEL_SERVICE_NAME') || env('SECURENOW_APPID') || '').trim().replace(/^['"]|['"]$/g, '');
+// Naming rules
+const rawBase = (env('OTEL_SERVICE_NAME') || env('SECURENOW_APPID') || '').trim().replace(/^['"]|['"]$/g, '');
 const baseName = rawBase || null;
-
-// SECURENOW_NO_UUID=1  -> keep one service.name for all workers (baseName), but unique instance ids
 const noUuid = String(env('SECURENOW_NO_UUID')) === '1' || String(env('SECURENOW_NO_UUID')).toLowerCase() === 'true';
 
+// service.name
 let serviceName;
 if (baseName) {
   serviceName = noUuid ? baseName : `${baseName}-${uuidv4()}`;
 } else {
-  // No provided name: safe fallback, unique per process
   serviceName = `securenow-free-${uuidv4()}`;
 }
 
-// Always make a unique instance id (appID + uuid if available; else “securenow” + uuid)
+// service.instance.id (always appID+uuid if appID provided)
 const instancePrefix = baseName || 'securenow';
 const serviceInstanceId = `${instancePrefix}-${uuidv4()}`;
 
-console.log('[securenow] resolved names →', { serviceName, serviceInstanceId });
+// One loud line per worker
+console.log('[securenow] pid=%d SECURENOW_APPID=%s OTEL_SERVICE_NAME=%s → service.name=%s instance.id=%s',
+  process.pid,
+  JSON.stringify(env('SECURENOW_APPID')),
+  JSON.stringify(env('OTEL_SERVICE_NAME')),
+  serviceName,
+  serviceInstanceId
+);
 
-// -------------------- instrumentations --------------------
-const disabledList = (env('SECURENOW_DISABLE_INSTRUMENTATIONS') || '')
-  .split(',')
-  .map(s => s.trim())
-  .filter(Boolean);
+// Instrumentations (allow selective disables)
 const disabledMap = {};
-for (const name of disabledList) disabledMap[name] = { enabled: false };
+for (const n of (env('SECURENOW_DISABLE_INSTRUMENTATIONS') || '').split(',').map(s => s.trim()).filter(Boolean)) {
+  disabledMap[n] = { enabled: false };
+}
 
-// -------------------- SDK --------------------
+// SDK
 const traceExporter = new OTLPTraceExporter({ url: tracesUrl, headers });
-
 const sdk = new NodeSDK({
   traceExporter,
   instrumentations: getNodeAutoInstrumentations({ ...disabledMap }),
@@ -100,35 +94,26 @@ const sdk = new NodeSDK({
   }),
 });
 
-// -------------------- start (sync/async safe) --------------------
+// Start (works if start() is sync or async)
 (async () => {
   try {
     await Promise.resolve(sdk.start?.());
-    console.log('[securenow] OTel SDK started →', tracesUrl);
-
+    console.log('[securenow] OTel SDK started → %s', tracesUrl);
     if (String(env('SECURENOW_TEST_SPAN')) === '1') {
       const api = require('@opentelemetry/api');
       const tracer = api.trace.getTracer('securenow-smoke');
-      const span = tracer.startSpan('securenow.startup.smoke');
-      span.setAttribute('securenow.test', true);
-      span.end();
-      console.log('[securenow] emitted startup smoke span');
+      const span = tracer.startSpan('securenow.startup.smoke'); span.end();
     }
-  } catch (err) {
-    console.error('[securenow] OTel start failed:', err && err.stack || err);
+  } catch (e) {
+    console.error('[securenow] OTel start failed:', e && e.stack || e);
   }
 })();
 
-// -------------------- graceful shutdown --------------------
+// Shutdown
 async function safeShutdown(sig) {
-  try {
-    await Promise.resolve(sdk.shutdown?.());
-    console.log(`[securenow] Tracing terminated on ${sig}`);
-  } catch (err) {
-    console.error('[securenow] Tracing shutdown error:', err);
-  } finally {
-    process.exit(0);
-  }
+  try { await Promise.resolve(sdk.shutdown?.()); console.log(`[securenow] Tracing terminated on ${sig}`); }
+  catch (e) { console.error('[securenow] Tracing shutdown error:', e); }
+  finally { process.exit(0); }
 }
 process.on('SIGINT',  () => safeShutdown('SIGINT'));
 process.on('SIGTERM', () => safeShutdown('SIGTERM'));