@oas-tools/oas-telemetry 0.7.0-alpha.4 → 0.7.0

package/dist/cjs/utils/logger.cjs

@@ -5,22 +5,44 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _bootConfig = require("../config/bootConfig.cjs");
+var _telemetryRegistry = require("../telemetry/telemetryRegistry.cjs");
 const LOG_LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'NONE'];
-const currentLogLevel = (_bootConfig.bootEnvVariables.OASTLM_BOOT_LOG_LEVEL || 'INFO').toUpperCase();
-const serviceName = 'OAS-Telemetry';
-function log(level, ...messages) {
-  if (LOG_LEVELS.indexOf(level) >= LOG_LEVELS.indexOf(currentLogLevel)) {
-    const timestamp = new Date().toISOString();
-    console.log(`${timestamp} [${serviceName}] [${level}]:`, ...messages);
-  }
+const currentLogLevel = _bootConfig.bootEnvVariables.OASTLM_BOOT_LOG_LEVEL.toUpperCase();
+const serviceName = 'OAS-TLM-@-' + _bootConfig.bootEnvVariables.OASTLM_BOOT_SERVICE_NAME;
+function shouldLog(level) {
+  return LOG_LEVELS.indexOf(level) >= LOG_LEVELS.indexOf(currentLogLevel);
 }
 var _default = exports.default = {
-  debug: (...messages) => log('DEBUG', ...messages),
-  info: (...messages) => log('INFO', ...messages),
-  log: (...messages) => log('INFO', ...messages),
-  // Alias for info
-  warn: (...messages) => log('WARN', ...messages),
-  error: (...messages) => log('ERROR', ...messages),
+  debug: (...messages) => {
+    if (shouldLog('DEBUG')) {
+      const timestamp = new Date().toISOString();
+      _telemetryRegistry.originalConsoleMethods.debug(`${timestamp} [${serviceName}] [DEBUG]:`, ...messages);
+    }
+  },
+  info: (...messages) => {
+    if (shouldLog('INFO')) {
+      const timestamp = new Date().toISOString();
+      _telemetryRegistry.originalConsoleMethods.info(`${timestamp} [${serviceName}] [INFO]:`, ...messages);
+    }
+  },
+  log: (...messages) => {
+    if (shouldLog('INFO')) {
+      const timestamp = new Date().toISOString();
+      _telemetryRegistry.originalConsoleMethods.log(`${timestamp} [${serviceName}] [INFO]:`, ...messages);
+    }
+  },
+  warn: (...messages) => {
+    if (shouldLog('WARN')) {
+      const timestamp = new Date().toISOString();
+      _telemetryRegistry.originalConsoleMethods.warn(`${timestamp} [${serviceName}] [WARN]:`, ...messages);
+    }
+  },
+  error: (...messages) => {
+    if (shouldLog('ERROR')) {
+      const timestamp = new Date().toISOString();
+      _telemetryRegistry.originalConsoleMethods.error(`${timestamp} [${serviceName}] [ERROR]:`, ...messages);
+    }
+  },
   currentLogLevel
 };
 module.exports = exports.default;

package/dist/esm/config/bootConfig.js

@@ -1,4 +1,5 @@
 import dotenv from 'dotenv';
+import { randomUUID } from 'crypto';
 if (process.env.NODE_ENV !== 'test') {
     dotenv.config();
 }
@@ -8,4 +9,5 @@ export const bootEnvVariables = {
     OASTLM_BOOT_ENV: process.env.OASTLM_BOOT_ENV || process.env.NODE_ENV || 'production',
     OASTLM_BOOT_MODULE_DISABLED: process.env.OASTLM_BOOT_MODULE_DISABLED === 'true',
     OASTLM_BOOT_LOG_LEVEL: process.env.OASTLM_BOOT_LOG_LEVEL || 'INFO',
+    OASTLM_BOOT_SERVICE_NAME: process.env.OASTLM_BOOT_SERVICE_NAME || `SERVICE-${randomUUID().slice(0, 8).toUpperCase()}`,
 };

package/dist/esm/config/config.js

@@ -11,9 +11,10 @@ const loadEnv = () => {
         },
         auth: {
             enabled: getParsedEnvVar("OASTLM_CONFIG_AUTH_ENABLED", (v) => v === "true"),
-            apiKeyMaxAge: getParsedEnvVar("OASTLM_CONFIG_AUTH_API_KEY_MAX_AGE", (v) => parseInt(v, 10)),
             password: getParsedEnvVar("OASTLM_CONFIG_AUTH_PASSWORD"),
             jwtSecret: getParsedEnvVar("OASTLM_CONFIG_AUTH_JWT_SECRET"),
+            accessTokenMaxAge: getParsedEnvVar("OASTLM_CONFIG_AUTH_ACCESS_TOKEN_MAX_AGE", (v) => parseInt(v, 10)),
+            refreshTokenMaxAge: getParsedEnvVar("OASTLM_CONFIG_AUTH_REFRESH_TOKEN_MAX_AGE", (v) => parseInt(v, 10)),
         },
         traces: {
             memoryExporter: {
@@ -61,9 +62,10 @@ export const defaultConfig = {
     },
     auth: {
         enabled: false,
-        apiKeyMaxAge: 1000 * 60 * 60, // 1 hour
         password: "oas-telemetry-password",
         jwtSecret: "oas-telemetry-secret",
+        accessTokenMaxAge: 1000 * 60 * 5, // 5 minutes
+        refreshTokenMaxAge: 1000 * 60 * 60 * 24 * 7, // 7 days
     },
     ai: {
         openAIKey: null,