securenow 7.0.0-anas → 7.0.0-anas.2

package/app-config.js

@@ -6,18 +6,26 @@
  * Used by both the SDK (tracing.js, nextjs.js, nuxt-server-plugin.mjs) and
  * the CLI to answer three questions with a single source of truth:
  *
- *   - Which app key routes this telemetry?  (resolveAppKey)
- *   - What service.name label to show?      (resolveAppId)
- *   - Which OTLP collector to hit?          (resolveInstance)
+ *   - What is the app routing key?  (resolveAppKey) — used as OTel service.name
+ *                                     AND as x-api-key header. The collector
+ *                                     filters ClickHouse queries by
+ *                                     `resource_string_service$$name IN (...)`
+ *                                     so service.name MUST be the app.key UUID.
+ *   - What human label to show?     (resolveAppName) — display only, never
+ *                                     sent to the collector.
+ *   - Which OTLP collector to hit?  (resolveInstance)
  *
  * Resolution order (first non-empty wins):
  *
  *   1. Explicit environment variable
- *      (SECURENOW_API_KEY / SECURENOW_APPID / SECURENOW_INSTANCE)
+ *      (SECURENOW_APPID / SECURENOW_API_KEY / SECURENOW_INSTANCE)
  *   2. Project-local credentials  (./.securenow/credentials.json)
  *   3. Global credentials         (~/.securenow/credentials.json)
- *   4. package.json#name (for appId only)
+ *   4. package.json#name (for the human label only — can't route on this)
  *   5. Hard default / null
+ *
+ * Credentials file schema:
+ *   { token, email, expiresAt, app: { key: <uuid>, name: <display>, instance } }
  */
 
 const fs = require('fs');
@@ -72,8 +80,11 @@ function pick(value) {
   return str.length > 0 ? str : null;
 }
 
+// Routing key = app.key UUID. This is what the collector filters on.
+// Also used as x-api-key header once the collector supports it.
 function resolveAppKey() {
   const fromEnv =
+    pick(process.env.SECURENOW_APPID) ||
     pick(process.env.SECURENOW_API_KEY) ||
     pick(process.env.securenow);
   if (fromEnv) return fromEnv;
@@ -83,18 +94,24 @@ function resolveAppKey() {
   return null;
 }
 
-function resolveAppId() {
-  const fromEnv =
-    pick(process.env.OTEL_SERVICE_NAME) ||
-    pick(process.env.SECURENOW_APPID);
+// Human label for observability tools — never touches collector routing.
+// Falls back to package.json#name so pre-login users still see something readable.
+function resolveAppName() {
+  const fromEnv = pick(process.env.OTEL_SERVICE_NAME);
   if (fromEnv) return fromEnv;
 
   const creds = loadCredentials();
-  if (creds && creds.app && pick(creds.app.id)) return pick(creds.app.id);
+  if (creds && creds.app && pick(creds.app.name)) return pick(creds.app.name);
 
   return loadPackageJsonName();
 }
 
+// Legacy alias — callers that want "whatever identifies this process to OTel"
+// get the routing key if logged in, otherwise the human label fallback.
+function resolveAppId() {
+  return resolveAppKey() || resolveAppName();
+}
+
 function resolveInstance() {
   const fromEnv =
     pick(process.env.SECURENOW_INSTANCE) ||
@@ -110,9 +127,13 @@ function resolveInstance() {
 }
 
 function resolveAll() {
+  const appKey = resolveAppKey();
   return {
-    appKey: resolveAppKey(),
-    appId: resolveAppId(),
+    appKey,
+    appName: resolveAppName(),
+    // service.name must be the routing UUID when available — that's what the
+    // collector filters on. Fall back to the human label pre-login.
+    appId: appKey || resolveAppName(),
     instance: resolveInstance(),
   };
 }
@@ -120,6 +141,7 @@ function resolveAll() {
 module.exports = {
   FREE_TRIAL_INSTANCE,
   resolveAppKey,
+  resolveAppName,
   resolveAppId,
   resolveInstance,
   resolveAll,

package/cli/apps.js

@@ -310,7 +310,7 @@ async function setDefault(args) {
     }
     config.setApp({
       key: app.key,
-      id: app.name || app.key,
+      name: app.name || null,
       instance: instanceUrl(inst),
     });
     ui.success(`Default application set to ${ui.c.bold(app.name || key)}`);

package/cli/auth.js

@@ -54,7 +54,7 @@ async function loginWithBrowser() {
         const error = url.searchParams.get('error');
         const returnedState = url.searchParams.get('state');
         const appKey = url.searchParams.get('app_key');
-        const appId = url.searchParams.get('app_id');
+        const appName = url.searchParams.get('app_name');
         const appInstance = url.searchParams.get('app_instance');
 
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -75,10 +75,10 @@ async function loginWithBrowser() {
 
         if (token) {
           pendingToken = token;
-          if (appKey || appId || appInstance) {
+          if (appKey || appName || appInstance) {
             pendingApp = {
               key: appKey || null,
-              id: appId || null,
+              name: appName || null,
               instance: appInstance || null,
             };
           }
@@ -229,8 +229,8 @@ async function login(args, flags) {
     console.log('');
     ui.success(`Logged in as ${ui.c.bold(email)}`);
     ui.info(local ? 'Credentials saved to project .securenow/ (local)' : 'Credentials saved to ~/.securenow/ (global)');
-    if (app && app.id) {
-      ui.info(`Linked to app ${ui.c.bold(app.id)}${app.key ? ` (${ui.c.dim(app.key)})` : ''}`);
+    if (app && (app.name || app.key)) {
+      ui.info(`Linked to app ${ui.c.bold(app.name || app.key)}${app.key ? ` (${ui.c.dim(app.key)})` : ''}`);
     }
     if (exp) {
       const days = Math.ceil((exp - Date.now()) / (1000 * 60 * 60 * 24));

package/cli/config.js

@@ -120,10 +120,10 @@ function getToken() {
 
 function setAuth(token, email, expiresAt, { local = false, app = null } = {}) {
   const payload = { token, email, expiresAt };
-  if (app && (app.key || app.id || app.instance)) {
+  if (app && (app.key || app.name || app.instance)) {
     payload.app = {
       key: app.key || null,
-      id: app.id || null,
+      name: app.name || null,
       instance: app.instance || null,
     };
   }
@@ -143,7 +143,7 @@ function setApp(app, { local } = {}) {
     ...existing,
     app: {
       key: app.key || null,
-      id: app.id || null,
+      name: app.name || null,
       instance: app.instance || null,
     },
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securenow",
-  "version": "7.0.0-anas",
+  "version": "7.0.0-anas.2",
   "description": "OpenTelemetry instrumentation for Node.js, Next.js, and Nuxt - Send traces and logs to any OTLP-compatible backend",
   "type": "commonjs",
   "main": "register.js",
@@ -161,7 +161,7 @@
     "uuid": "^9.0.0"
   },
   "optionalDependencies": {
-    "@vercel/otel": "^1.14.0"
+    "@vercel/otel": "1.10.4"
   },
   "overrides": {
     "@opentelemetry/api": "1.7.0",