securenow 3.0.7 → 3.0.9

package/package.json

@@ -1,17 +1,26 @@
 {
   "name": "securenow",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "type": "commonjs",
   "main": "register.js",
-  "exports": { ".": "./register.js", "./register": "./register.js", "./tracing": "./tracing.js" },
-  "files": ["register.js", "tracing.js", "README.md"],
+  "exports": {
+    ".": "./register.js",
+    "./register": "./register.js",
+    "./tracing": "./tracing.js"
+  },
+  "files": [
+    "register.js",
+    "tracing.js",
+    "README.md"
+  ],
   "dependencies": {
     "@opentelemetry/api": "1.7.0",
-    "@opentelemetry/sdk-node": "0.47.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.47.0",
     "@opentelemetry/auto-instrumentations-node": "0.47.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.47.0",
     "@opentelemetry/resources": "1.20.0",
+    "@opentelemetry/sdk-node": "0.47.0",
     "@opentelemetry/semantic-conventions": "1.20.0",
+    "dotenv": "^17.2.1",
     "uuid": "^9.0.0"
   },
   "overrides": {

package/register.js

@@ -1,2 +1,14 @@
-// tiny entry so users can always do: --require securenow/register
-require('./tracing');
+// securenow/preload.js
+'use strict';
+
+// load .env into process.env before anything else
+try {
+  require('dotenv').config();
+  console.log('[securenow] dotenv loaded from', process.env.DOTENV_CONFIG_PATH || '.env');
+} catch (e) {
+  // dotenv is optional — only warn if it’s missing
+  console.warn('[securenow] dotenv not found or failed to load');
+}
+
+// then run the real tracer preload
+require('./register');

package/tracing.js

@@ -2,16 +2,20 @@
 
 /**
  * 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_APPID=logical-name              # or OTEL_SERVICE_NAME=logical-name
+ *   SECURENOW_NO_UUID=1                       # one service.name across all workers
+ *   SECURENOW_INSTANCE=http://host:4318       # OTLP/HTTP base (default http://46.62.173.237:4318)
+ *   OTEL_EXPORTER_OTLP_ENDPOINT=...           # alternative base
+ *   OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=...    # full traces URL
+ *   OTEL_EXPORTER_OTLP_HEADERS="k=v,k2=v2"
  *   SECURENOW_DISABLE_INSTRUMENTATIONS="pkg1,pkg2"
  *   OTEL_LOG_LEVEL=info|debug
  *   SECURENOW_TEST_SPAN=1
+ *
+ * Safety:
+ *   SECURENOW_STRICT=1  -> if no appid/name is provided in cluster, exit(1) so PM2 restarts the worker
  */
 
 const { diag, DiagConsoleLogger, DiagLogLevel } = require('@opentelemetry/api');
@@ -33,7 +37,7 @@ const parseHeaders = str => {
   return out;
 };
 
-// Diagnostics
+// -------- diagnostics --------
 (() => {
   const L = (env('OTEL_LOG_LEVEL') || '').toLowerCase();
   const level = L === 'debug' ? DiagLogLevel.DEBUG :
@@ -44,44 +48,56 @@ const parseHeaders = str => {
   console.log('[securenow] preload loaded pid=%d', process.pid);
 })();
 
-// Endpoint config
+// -------- endpoints --------
 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
+// -------- naming rules --------
 const rawBase = (env('OTEL_SERVICE_NAME') || env('SECURENOW_APPID') || '').trim().replace(/^['"]|['"]$/g, '');
 const baseName = rawBase || null;
-const noUuid = String(env('SECURENOW_NO_UUID')) === '1' || String(env('SECURENOW_NO_UUID')).toLowerCase() === 'true';
+const noUuid   = String(env('SECURENOW_NO_UUID')) === '1' || String(env('SECURENOW_NO_UUID')).toLowerCase() === 'true';
+const strict   = String(env('SECURENOW_STRICT')) === '1' || String(env('SECURENOW_STRICT')).toLowerCase() === 'true';
+const inPm2Cluster = !!(process.env.NODE_APP_INSTANCE || process.env.pm_id);
+
+// Fail fast in cluster if base is missing (no more "free" names)
+if (!baseName && inPm2Cluster && strict) {
+  console.error('[securenow] FATAL: SECURENOW_APPID/OTEL_SERVICE_NAME missing in cluster (pid=%d). Exiting due to SECURENOW_STRICT=1.', process.pid);
+  // small delay so the log flushes
+  setTimeout(() => process.exit(1), 10);
+}
 
 // service.name
 let serviceName;
 if (baseName) {
   serviceName = noUuid ? baseName : `${baseName}-${uuidv4()}`;
 } else {
+  // last-resort fallback (only if STRlCT is off). You can rename this to make it obvious in monitoring.
   serviceName = `securenow-free-${uuidv4()}`;
 }
 
-// service.instance.id (always appID+uuid if appID provided)
-const instancePrefix = baseName || 'securenow';
+// service.instance.id = <appid-or-fallback>-<uuid> (unique per worker)
+const instancePrefix   = baseName || 'securenow';
 const serviceInstanceId = `${instancePrefix}-${uuidv4()}`;
 
-// One loud line per worker
-console.log('[securenow] pid=%d SECURENOW_APPID=%s OTEL_SERVICE_NAME=%s → service.name=%s instance.id=%s',
+// Loud line per worker to prove what was used
+console.log('[securenow] pid=%d SECURENOW_APPID=%s OTEL_SERVICE_NAME=%s SECURENOW_NO_UUID=%s SECURENOW_STRICT=%s → service.name=%s instance.id=%s',
   process.pid,
   JSON.stringify(env('SECURENOW_APPID')),
   JSON.stringify(env('OTEL_SERVICE_NAME')),
+  JSON.stringify(env('SECURENOW_NO_UUID')),
+  JSON.stringify(env('SECURENOW_STRICT')),
   serviceName,
   serviceInstanceId
 );
 
-// Instrumentations (allow selective disables)
+// -------- instrumentations --------
 const disabledMap = {};
 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,
@@ -89,12 +105,12 @@ const sdk = new NodeSDK({
   resource: new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
     [SemanticResourceAttributes.SERVICE_INSTANCE_ID]: serviceInstanceId,
-    [SemanticResourceAttributes.DEPLOYMENT_ENVIRONMENT]: env('NODE_ENV') || 'development',
+    [SemanticResourceAttributes.DEPLOYMENT_ENVIRONMENT]: env('NODE_ENV') || 'production',
     [SemanticResourceAttributes.SERVICE_VERSION]: process.env.npm_package_version || undefined,
   }),
 });
 
-// Start (works if start() is sync or async)
+// -------- start / shutdown (sync/async safe) --------
 (async () => {
   try {
     await Promise.resolve(sdk.start?.());
@@ -109,7 +125,6 @@ const sdk = new NodeSDK({
   }
 })();
 
-// Shutdown
 async function safeShutdown(sig) {
   try { await Promise.resolve(sdk.shutdown?.()); console.log(`[securenow] Tracing terminated on ${sig}`); }
   catch (e) { console.error('[securenow] Tracing shutdown error:', e); }