securenow 4.0.11 → 4.0.12

package/nextjs.js

@@ -23,6 +23,16 @@ const { v4: uuidv4 } = require('uuid');
 
 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 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;
+};
+
 let isRegistered = false;
 
 // Default sensitive fields to redact from request bodies
@@ -215,6 +225,9 @@ function registerSecureNow(options = {}) {
     return;
   }
 
+  // Detect environment outside try block for error handling
+  const isVercel = !!(env('VERCEL') || env('VERCEL_ENV') || env('VERCEL_URL'));
+
   try {
     console.log('[securenow] Next.js integration loading (pid=%d)', process.pid);
 
@@ -264,8 +277,12 @@ function registerSecureNow(options = {}) {
     const customSensitiveFields = (env('SECURENOW_SENSITIVE_FIELDS') || '').split(',').map(s => s.trim()).filter(Boolean);
     const allSensitiveFields = [...DEFAULT_SENSITIVE_FIELDS, ...customSensitiveFields];
 
-    // -------- Use @vercel/otel with enhanced configuration --------
-    const { registerOTel } = require('@vercel/otel');
+    // -------- Log environment detection --------
+    if (!isVercel) {
+      console.log('[securenow] 🖥️  Self-hosted environment detected (EC2/PM2) - using vanilla SDK');
+    }
+
+    // -------- Use different initialization based on environment --------
     const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
     
     // Configure HTTP instrumentation with comprehensive header capture
@@ -433,31 +450,61 @@ function registerSecureNow(options = {}) {
       },
     });
     
-    registerOTel({
-      serviceName: serviceName,
-      attributes: {
-        'deployment.environment': env('NODE_ENV') || env('VERCEL_ENV') || 'development',
-        'service.version': process.env.npm_package_version || process.env.VERCEL_GIT_COMMIT_SHA || undefined,
-        'vercel.region': process.env.VERCEL_REGION || undefined,
-      },
-      instrumentations: [httpInstrumentation],
-      instrumentationConfig: {
-        fetch: {
-          // Propagate context to your backend APIs
-          propagateContextUrls: [
-            /^https?:\/\/localhost/,
-            /^https?:\/\/.*\.vercel\.app/,
-            // Add your backend domains here
-          ],
-          // Optionally ignore certain URLs
-          ignoreUrls: [
-            /_next\/static/,
-            /_next\/image/,
-            /\.map$/,
-          ],
+    if (isVercel) {
+      // -------- Vercel Environment: Use @vercel/otel --------
+      const { registerOTel } = require('@vercel/otel');
+      
+      registerOTel({
+        serviceName: serviceName,
+        attributes: {
+          'deployment.environment': env('NODE_ENV') || env('VERCEL_ENV') || 'development',
+          'service.version': process.env.npm_package_version || process.env.VERCEL_GIT_COMMIT_SHA || undefined,
+          'vercel.region': process.env.VERCEL_REGION || undefined,
         },
-      },
-    });
+        instrumentations: [httpInstrumentation],
+        instrumentationConfig: {
+          fetch: {
+            // Propagate context to your backend APIs
+            propagateContextUrls: [
+              /^https?:\/\/localhost/,
+              /^https?:\/\/.*\.vercel\.app/,
+              // Add your backend domains here
+            ],
+            // Optionally ignore certain URLs
+            ignoreUrls: [
+              /_next\/static/,
+              /_next\/image/,
+              /\.map$/,
+            ],
+          },
+        },
+      });
+    } else {
+      // -------- Self-Hosted (EC2/PM2): Use Vanilla OpenTelemetry SDK --------
+      const { NodeSDK } = require('@opentelemetry/sdk-node');
+      const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
+      const { Resource } = require('@opentelemetry/resources');
+      const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
+      
+      const traceExporter = new OTLPTraceExporter({ 
+        url: tracesUrl,
+        headers: parseHeaders(env('OTEL_EXPORTER_OTLP_HEADERS'))
+      });
+      
+      const sdk = new NodeSDK({
+        serviceName: serviceName,
+        traceExporter: traceExporter,
+        instrumentations: [httpInstrumentation],
+        resource: new Resource({
+          [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
+          [SemanticResourceAttributes.DEPLOYMENT_ENVIRONMENT]: env('NODE_ENV') || env('VERCEL_ENV') || 'production',
+          [SemanticResourceAttributes.SERVICE_VERSION]: process.env.npm_package_version || undefined,
+        }),
+      });
+      
+      sdk.start();
+      console.log('[securenow] 🎯 Vanilla SDK initialized for self-hosted environment');
+    }
 
     isRegistered = true;
     console.log('[securenow] ✅ OpenTelemetry started for Next.js → %s', tracesUrl);
@@ -485,7 +532,11 @@ function registerSecureNow(options = {}) {
 
   } catch (error) {
     console.error('[securenow] Failed to initialize OpenTelemetry:', error);
-    console.error('[securenow] Make sure you have @vercel/otel installed: npm install @vercel/otel');
+    if (isVercel) {
+      console.error('[securenow] Make sure you have @vercel/otel installed: npm install @vercel/otel');
+    } else {
+      console.error('[securenow] Make sure OpenTelemetry dependencies are installed');
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securenow",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "OpenTelemetry instrumentation for Node.js and Next.js - Send traces to SigNoz or any OTLP backend",
   "type": "commonjs",
   "main": "register.js",