@oas-tools/oas-telemetry 0.7.0-alpha.2 → 0.7.0-alpha.3

package/dist/cjs/tlm-log/logController.cjs

@@ -3,20 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stopLogs = exports.statusLogs = exports.startLogs = exports.resetLogs = exports.listLogs = exports.insertLogsToDb = exports.findLogs = void 0;
-var _config = require("../config.cjs");
+exports.stopLogs = exports.statusLogs = exports.startLogs = exports.setRetentionTimeLogs = exports.resetLogs = exports.listLogs = exports.insertLogsToDb = exports.findLogs = void 0;
+var _telemetryRegistry = require("../telemetry/telemetryRegistry.cjs");
+var _logger = _interopRequireDefault(require("../utils/logger.cjs"));
+var _regexUtils = require("../utils/regexUtils.cjs");
 const _excluded = ["_id"];
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const listLogs = async (req, res) => {
   try {
-    const logs = _config.globalOasTlmConfig.logExporter.getFinishedLogs();
+    const logs = _telemetryRegistry.inMemoryDbLogExporter.getFinishedLogs();
     res.send({
       logsCount: logs.length,
       logs: logs
     });
   } catch (err) {
-    console.error(err);
+    _logger.default.error(err);
     res.status(500).send({
       error: 'Failed to list log data'
     });
@@ -25,14 +28,24 @@ const listLogs = async (req, res) => {
 exports.listLogs = listLogs;
 const findLogs = async (req, res) => {
   const body = req.body;
-  const messageSearch = body?.search || null; // Search term for MiniSearch
-  const findQuery = body?.find || {}; // Query for NeDB
-  console.dir(`findLogs called with query: ${JSON.stringify(findQuery)} and search ${messageSearch}`, {
+  const messageSearch = body?.textSearch || null; // Search term for MiniSearch
+  const findQuery = body?.query || {}; // Query for NeDB
+  _logger.default.debug(`findLogs called with query: ${JSON.stringify(findQuery)} and search ${messageSearch}`, {
     depth: 3
   });
+  let processedQuery;
+  try {
+    processedQuery = (0, _regexUtils.convertRegexRecursively)(findQuery);
+  } catch (error) {
+    _logger.default.error(error.message);
+    res.status(400).send({
+      error: error.message
+    });
+    return; // Exit if invalid regex was encountered
+  }
   try {
     const results = await new Promise((resolve, reject) => {
-      _config.globalOasTlmConfig.logExporter.find(findQuery, messageSearch, (err, docs) => {
+      _telemetryRegistry.inMemoryDbLogExporter.find(processedQuery, messageSearch, (err, docs) => {
         if (err) return reject(err);
         resolve(docs);
       });
@@ -43,7 +56,7 @@ const findLogs = async (req, res) => {
       logs: typedResults
     });
   } catch (err) {
-    console.error(err);
+    _logger.default.error(err);
     res.status(500).send({
       error: 'Failed to find logs',
       details: err.message
@@ -52,7 +65,7 @@ const findLogs = async (req, res) => {
 };
 exports.findLogs = findLogs;
 const resetLogs = (req, res) => {
-  _config.globalOasTlmConfig.logExporter.reset();
+  _telemetryRegistry.inMemoryDbLogExporter.reset();
   res.send('Logs reset');
 };
 exports.resetLogs = resetLogs;
@@ -76,13 +89,13 @@ const insertLogsToDb = async (req, res) => {
   try {
     let message = '';
     if (resetData) {
-      _config.globalOasTlmConfig.logExporter.reset();
+      _telemetryRegistry.inMemoryDbLogExporter.reset();
       message += 'Logs Database reset. ';
     }
     await new Promise((resolve, reject) => {
-      _config.globalOasTlmConfig.logExporter.insert(cleanedLogs, (err, newDocs) => {
+      _telemetryRegistry.inMemoryDbLogExporter.insert(cleanedLogs, (err, newDocs) => {
         if (err) {
-          console.error('Error inserting logs:', err);
+          _logger.default.error('Error inserting logs:', err);
           return reject(err);
         }
         resolve(newDocs);
@@ -94,7 +107,7 @@ const insertLogsToDb = async (req, res) => {
       InsertedLogsCount: cleanedLogs.length
     });
   } catch (err) {
-    console.error(err);
+    _logger.default.error(err);
     res.status(500).send({
       error: 'Failed to reset and insert data',
       details: err.message
@@ -103,19 +116,33 @@ const insertLogsToDb = async (req, res) => {
 };
 exports.insertLogsToDb = insertLogsToDb;
 const startLogs = (req, res) => {
-  _config.globalOasTlmConfig.logExporter.start();
+  _telemetryRegistry.inMemoryDbLogExporter.enable();
   res.send('Log collection started');
 };
 exports.startLogs = startLogs;
 const stopLogs = (req, res) => {
-  _config.globalOasTlmConfig.logExporter.stop();
+  _telemetryRegistry.inMemoryDbLogExporter.disable();
   res.send('Log collection stopped');
 };
 exports.stopLogs = stopLogs;
 const statusLogs = (req, res) => {
-  const isRunning = _config.globalOasTlmConfig.logExporter.isRunning() || false;
+  const isRunning = _telemetryRegistry.inMemoryDbLogExporter.isEnabled() || false;
   res.send({
     active: isRunning
   });
 };
-exports.statusLogs = statusLogs;
+exports.statusLogs = statusLogs;
+const setRetentionTimeLogs = (req, res) => {
+  const retentionTime = req.body.retentionTime;
+  if (typeof retentionTime !== 'number' || retentionTime <= 0) {
+    res.status(400).send({
+      error: 'Invalid retention time. Must be a positive number.'
+    });
+    return;
+  }
+  _telemetryRegistry.inMemoryDbLogExporter.retentionTimeInSeconds = retentionTime;
+  res.send({
+    message: `Retention time set to ${retentionTime} seconds.`
+  });
+};
+exports.setRetentionTimeLogs = setRetentionTimeLogs;

package/dist/cjs/tlm-log/logRoutes.cjs

@@ -3,16 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logRoutes = exports.default = void 0;
+exports.getLogRoutes = exports.default = void 0;
 var _express = require("express");
 var _logController = require("./logController.cjs");
-const logRoutes = exports.logRoutes = (0, _express.Router)();
-// Logs Control
-logRoutes.get('/start', _logController.startLogs);
-logRoutes.get('/stop', _logController.stopLogs);
-logRoutes.get('/status', _logController.statusLogs);
-logRoutes.get('/reset', _logController.resetLogs);
-logRoutes.get('/', _logController.listLogs);
-logRoutes.post('/', _logController.insertLogsToDb);
-logRoutes.post('/find', _logController.findLogs);
-var _default = exports.default = logRoutes;
+const getLogRoutes = () => {
+  const router = (0, _express.Router)();
+  // Logs Control
+  router.post('/start', _logController.startLogs);
+  router.post('/stop', _logController.stopLogs);
+  router.get('/status', _logController.statusLogs);
+  router.post('/reset', _logController.resetLogs);
+  router.post('/retention-time', _logController.setRetentionTimeLogs);
+  router.get('/', _logController.listLogs);
+  router.post('/', _logController.insertLogsToDb);
+  router.post('/find', _logController.findLogs);
+  return router;
+};
+exports.getLogRoutes = getLogRoutes;
+var _default = exports.default = getLogRoutes;

package/dist/cjs/tlm-metric/metricsController.cjs

@@ -3,14 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stopMetrics = exports.statusMetrics = exports.startMetrics = exports.resetMetrics = exports.listMetrics = exports.insertMetricsToDb = exports.findMetrics = void 0;
-var _config = require("../config.cjs");
+exports.stopMetrics = exports.statusMetrics = exports.startMetrics = exports.setRetentionTimeMetrics = exports.resetMetrics = exports.listMetrics = exports.insertMetricsToDb = exports.findMetrics = void 0;
+var _telemetryRegistry = require("../telemetry/telemetryRegistry.cjs");
+var _regexUtils = require("../utils/regexUtils.cjs");
 const _excluded = ["_id"];
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const listMetrics = async (req, res) => {
   try {
-    const metrics = _config.globalOasTlmConfig.metricsExporter.getFinishedMetrics();
+    const metrics = _telemetryRegistry.inMemoryDbMetricExporter.getFinishedMetrics();
     res.send({
       metricsCount: metrics.length,
       metrics: metrics
@@ -25,8 +26,18 @@ const listMetrics = async (req, res) => {
 exports.listMetrics = listMetrics;
 const findMetrics = (req, res) => {
   const body = req.body;
-  const search = body?.search ? body.search : {};
-  _config.globalOasTlmConfig.metricsExporter.find(search, (err, docs) => {
+  const query = body?.query ? body.query : {};
+  let processedQuery;
+  try {
+    processedQuery = (0, _regexUtils.convertRegexRecursively)(query);
+  } catch (error) {
+    console.error(error.message);
+    res.status(400).send({
+      error: error.message
+    });
+    return; // Exit if invalid regex was encountered
+  }
+  _telemetryRegistry.inMemoryDbMetricExporter.find(processedQuery, (err, docs) => {
     if (err) {
       console.error(err);
       res.status(404).send({
@@ -45,7 +56,7 @@ const findMetrics = (req, res) => {
 };
 exports.findMetrics = findMetrics;
 const resetMetrics = (req, res) => {
-  _config.globalOasTlmConfig.metricsExporter.reset();
+  _telemetryRegistry.inMemoryDbMetricExporter.reset();
   res.send('Metrics reset');
 };
 exports.resetMetrics = resetMetrics;
@@ -69,11 +80,11 @@ const insertMetricsToDb = async (req, res) => {
   try {
     let message = '';
     if (resetData) {
-      _config.globalOasTlmConfig.metricsExporter.reset();
+      _telemetryRegistry.inMemoryDbMetricExporter.reset();
       message += 'Metrics Database reset. ';
     }
     await new Promise((resolve, reject) => {
-      _config.globalOasTlmConfig.metricsExporter.insert(cleanedMetrics, (err, newDocs) => {
+      _telemetryRegistry.inMemoryDbMetricExporter.insert(cleanedMetrics, (err, newDocs) => {
         if (err) {
           console.error('Error inserting metrics:', err);
           return reject(err);
@@ -96,19 +107,33 @@ const insertMetricsToDb = async (req, res) => {
 };
 exports.insertMetricsToDb = insertMetricsToDb;
 const startMetrics = (req, res) => {
-  _config.globalOasTlmConfig.metricsExporter.start();
+  _telemetryRegistry.inMemoryDbMetricExporter.enable();
   res.send('Metrics collection started');
 };
 exports.startMetrics = startMetrics;
 const stopMetrics = (req, res) => {
-  _config.globalOasTlmConfig.metricsExporter.stop();
+  _telemetryRegistry.inMemoryDbMetricExporter.disable();
   res.send('Metrics collection stopped');
 };
 exports.stopMetrics = stopMetrics;
 const statusMetrics = (req, res) => {
-  const isRunning = _config.globalOasTlmConfig.metricsExporter.isRunning() || false;
+  const isRunning = _telemetryRegistry.inMemoryDbMetricExporter.isEnabled() || false;
   res.send({
     active: isRunning
   });
 };
-exports.statusMetrics = statusMetrics;
+exports.statusMetrics = statusMetrics;
+const setRetentionTimeMetrics = (req, res) => {
+  const retentionTime = req.body.retentionTime;
+  if (typeof retentionTime !== 'number' || retentionTime <= 0) {
+    res.status(400).send({
+      error: 'Invalid retention time. Must be a positive number.'
+    });
+    return;
+  }
+  _telemetryRegistry.inMemoryDbMetricExporter.retentionTimeInSeconds = retentionTime;
+  res.send({
+    message: `Retention time set to ${retentionTime} seconds.`
+  });
+};
+exports.setRetentionTimeMetrics = setRetentionTimeMetrics;

package/dist/cjs/tlm-metric/metricsRoutes.cjs

@@ -3,16 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.metricsRoutes = exports.default = void 0;
+exports.getMetricsRoutes = exports.default = void 0;
 var _express = require("express");
 var _metricsController = require("./metricsController.cjs");
-const metricsRoutes = exports.metricsRoutes = (0, _express.Router)();
-// Metrics Control
-metricsRoutes.get('/', _metricsController.listMetrics);
-metricsRoutes.post('/', _metricsController.insertMetricsToDb);
-metricsRoutes.post('/find', _metricsController.findMetrics);
-metricsRoutes.get('/reset', _metricsController.resetMetrics);
-metricsRoutes.get('/start', _metricsController.startMetrics);
-metricsRoutes.get('/stop', _metricsController.stopMetrics);
-metricsRoutes.get('/status', _metricsController.statusMetrics);
-var _default = exports.default = metricsRoutes;
+const getMetricsRoutes = () => {
+  const router = (0, _express.Router)();
+  // Metrics Control
+  router.post('/start', _metricsController.startMetrics);
+  router.post('/stop', _metricsController.stopMetrics);
+  router.get('/status', _metricsController.statusMetrics);
+  router.post('/reset', _metricsController.resetMetrics);
+  router.post('/retention-time', _metricsController.setRetentionTimeMetrics);
+  router.get('/', _metricsController.listMetrics);
+  router.post('/', _metricsController.insertMetricsToDb);
+  router.post('/find', _metricsController.findMetrics);
+  return router;
+};
+exports.getMetricsRoutes = getMetricsRoutes;
+var _default = exports.default = getMetricsRoutes;

package/dist/cjs/tlm-plugin/pluginController.cjs

@@ -4,36 +4,58 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerPlugin = exports.listPlugins = void 0;
-var _config = require("../config.cjs");
 var _axios = _interopRequireDefault(require("axios"));
 var _importFromString = require("import-from-string");
 var _dynamicInstaller = require("dynamic-installer");
 var _logger = _interopRequireDefault(require("../utils/logger.cjs"));
+var _pluginService = require("./pluginService.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // @ts-expect-error: import-from-string does not have proper type declarations
 
 // @ts-expect-error: dynamic-installer does not have proper type declarations
 
 const listPlugins = (req, res) => {
-  res.send(_config.globalOasTlmConfig.dynamicSpanExporter.getPlugins().map(plugin => {
+  const plugins = _pluginService.pluginService.getPlugins().map(plugin => {
     return {
       id: plugin.id,
       name: plugin.name,
       url: plugin.url,
       active: plugin.active
     };
-  }));
+  });
+  res.send({
+    pluginsCount: plugins.length,
+    plugins: plugins
+  });
 };
 exports.listPlugins = listPlugins;
 const registerPlugin = async (req, res) => {
-  const pluginResource = req.body;
-  _logger.default.info(`Plugin Registration Request: = ${JSON.stringify(req.body, null, 2)}...`);
-  _logger.default.info(`Getting plugin at ${pluginResource.url}...`);
   let pluginCode;
+  const pluginResource = req.body;
+  _logger.default.debug(`Plugin Registration Request: = ${JSON.stringify(req.body, null, 2)}...`);
+  // Validate plugin id
+  if (!pluginResource.id || typeof pluginResource.id !== "string") {
+    res.status(400).send(`Plugin id must be provided and must be a string`);
+    return;
+  }
+  // Check for duplicate plugin id
+  const existingPlugin = _pluginService.pluginService.getPlugins().find(plugin => plugin.id === pluginResource.id);
+  if (existingPlugin) {
+    res.status(400).send(`A plugin with id "${pluginResource.id}" already exists.`);
+    return;
+  }
   if (!pluginResource.url && !pluginResource.code) {
     res.status(400).send(`Plugin code or URL must be provided`);
     return;
   }
+  if (!pluginResource.moduleFormat) {
+    res.status(400).send(`Plugin moduleFormat must be provided (e.g., "cjs" or "esm")`);
+    return;
+  }
+  if (!["cjs", "esm"].includes(pluginResource.moduleFormat.toLowerCase())) {
+    res.status(400).send(`Invalid moduleFormat "${pluginResource.moduleFormat}". Supported formats are "cjs" and "esm".`);
+    return;
+  }
   let module;
   try {
     if (pluginResource.code) {
@@ -47,6 +69,7 @@ const registerPlugin = async (req, res) => {
       return;
     }
     if (pluginResource.install) {
+      _logger.default.info("Installing dependencies for plugin: " + pluginResource.name);
       const dependenciesStatus = await (0, _dynamicInstaller.installDependencies)(pluginResource.install);
       if (!dependenciesStatus.success) {
         if (pluginResource.install.ignoreErrors === true) {
@@ -57,15 +80,13 @@ const registerPlugin = async (req, res) => {
         }
       }
     }
-    _logger.default.info("Plugin size: " + pluginCode?.length);
-    _logger.default.info("Plugin format: " + pluginResource?.moduleFormat);
-    if (pluginResource?.moduleFormat && pluginResource.moduleFormat.toUpperCase() == "ESM") {
+    _logger.default.debug("Plugin format (provided): " + pluginResource?.moduleFormat);
+    if (pluginResource.moduleFormat.toLowerCase() === "esm") {
       _logger.default.info("ESM detected");
       module = await (0, _importFromString.importFromString)(pluginCode);
     } else {
       _logger.default.info("CJS detected (default)");
       module = await (0, _importFromString.requireFromString)(pluginCode);
-      _logger.default.info(module);
     }
   } catch (error) {
     _logger.default.error(`Error loading plugin: ${error}`);
@@ -73,14 +94,14 @@ const registerPlugin = async (req, res) => {
     return;
   }
   const plugin = module.default?.plugin ?? module.plugin;
-  if (plugin == undefined) {
-    res.status(400).send(`Plugin code should export a "plugin" object`);
-    _logger.default.info("Error in plugin code: no plugin object exported");
+  if (!plugin) {
+    res.status(400).send(`Plugin code should export a valid "plugin" object or static class`);
+    _logger.default.info("Error in plugin code: no valid plugin object exported");
     return;
   }
   for (const requiredFunction of ["load", "getName", "isConfigured"]) {
-    if (plugin[requiredFunction] == undefined) {
-      res.status(400).send(`The plugin code exports a "plugin" object, however it should have a "${requiredFunction}" method`);
+    if (typeof plugin[requiredFunction] !== "function") {
+      res.status(400).send(`The plugin code exports a "plugin" object, but it must have a "${requiredFunction}" method`);
       _logger.default.info("Error in plugin code: some required functions are missing");
       return;
     }
@@ -94,14 +115,14 @@ const registerPlugin = async (req, res) => {
   }
   if (plugin.isConfigured()) {
     _logger.default.info(`Loaded plugin <${plugin.getName()}>`);
-    pluginResource.plugin = plugin;
+    pluginResource.pluginImplementation = plugin;
     pluginResource.name = plugin.getName();
     pluginResource.active = true;
-    _config.globalOasTlmConfig.dynamicSpanExporter.pushPlugin(pluginResource);
-    _config.globalOasTlmConfig.dynamicSpanExporter.activatePlugin(pluginResource.plugin);
+    _pluginService.pluginService.pushPlugin(pluginResource);
+    _pluginService.pluginService.activatePlugin(pluginResource);
     res.status(201).send(`Plugin registered`);
   } else {
-    _logger.default.error(`Plugin <${plugin.getName()}> can not be configured`);
+    _logger.default.error(`Plugin <${plugin.getName()}> cannot be configured`);
     res.status(400).send(`Plugin configuration problem`);
   }
 };

package/dist/cjs/tlm-plugin/pluginRoutes.cjs

@@ -3,11 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginRoutes = exports.default = void 0;
+exports.getPluginRoutes = void 0;
 var _express = require("express");
 var _pluginController = require("./pluginController.cjs");
-const pluginRoutes = exports.pluginRoutes = (0, _express.Router)();
-// Plugins
-pluginRoutes.get('/plugins', _pluginController.listPlugins);
-pluginRoutes.post('/plugins', _pluginController.registerPlugin);
-var _default = exports.default = pluginRoutes;
+const getPluginRoutes = () => {
+  const router = (0, _express.Router)();
+  router.get('/', _pluginController.listPlugins);
+  router.post('/', _pluginController.registerPlugin);
+  return router;
+};
+exports.getPluginRoutes = getPluginRoutes;

package/dist/cjs/tlm-plugin/pluginService.cjs

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pluginService = void 0;
+class PluginService {
+  constructor() {
+    this.plugins = [];
+  }
+  getPlugins() {
+    return this.plugins;
+  }
+  pushPlugin(plugin) {
+    this.plugins.push(plugin);
+  }
+  activatePlugin(plugin) {
+    this.plugins.forEach(p => {
+      if (p.id === plugin.id) {
+        p.active = true;
+      }
+    });
+  }
+}
+const pluginService = exports.pluginService = new PluginService();

package/dist/cjs/tlm-trace/traceController.cjs

@@ -3,36 +3,37 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stopTelemetry = exports.statusTelemetry = exports.startTelemetry = exports.resetTelemetry = exports.listTelemetry = exports.insertTracesToDb = exports.findTelemetry = void 0;
-var _config = require("../config.cjs");
+exports.stopTraces = exports.statusTraces = exports.startTraces = exports.setRetentionTimeTraces = exports.resetTraces = exports.listTraces = exports.insertTracesToDb = exports.findTraces = void 0;
+var _telemetryRegistry = require("../telemetry/telemetryRegistry.cjs");
+var _regexUtils = require("../utils/regexUtils.cjs");
 const _excluded = ["_id"];
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-const startTelemetry = (req, res) => {
-  _config.globalOasTlmConfig.dynamicSpanExporter.exporter.start();
-  res.send('Telemetry started');
+const startTraces = (req, res) => {
+  _telemetryRegistry.inMemoryDbSpanExporter.enable();
+  res.send('Traces started');
 };
-exports.startTelemetry = startTelemetry;
-const stopTelemetry = (req, res) => {
-  _config.globalOasTlmConfig.dynamicSpanExporter.exporter.stop();
-  res.send('Telemetry stopped');
+exports.startTraces = startTraces;
+const stopTraces = (req, res) => {
+  _telemetryRegistry.inMemoryDbSpanExporter.disable();
+  res.send('Traces stopped');
 };
-exports.stopTelemetry = stopTelemetry;
-const statusTelemetry = (req, res) => {
-  const isRunning = _config.globalOasTlmConfig.dynamicSpanExporter.exporter.isRunning() || false;
+exports.stopTraces = stopTraces;
+const statusTraces = (req, res) => {
+  const isRunning = _telemetryRegistry.inMemoryDbSpanExporter.isEnabled() || false;
   res.send({
     active: isRunning
   });
 };
-exports.statusTelemetry = statusTelemetry;
-const resetTelemetry = (req, res) => {
-  _config.globalOasTlmConfig.dynamicSpanExporter.exporter.reset();
-  res.send('Telemetry reset');
+exports.statusTraces = statusTraces;
+const resetTraces = (req, res) => {
+  _telemetryRegistry.inMemoryDbSpanExporter.reset();
+  res.send('Traces reset');
 };
-exports.resetTelemetry = resetTelemetry;
-const listTelemetry = async (req, res) => {
+exports.resetTraces = resetTraces;
+const listTraces = async (req, res) => {
   try {
-    const spans = await _config.globalOasTlmConfig.dynamicSpanExporter.exporter.getFinishedSpans();
+    const spans = _telemetryRegistry.inMemoryDbSpanExporter.getFinishedSpans();
     res.send({
       spansCount: spans.length,
       spans: spans
@@ -40,39 +41,33 @@ const listTelemetry = async (req, res) => {
   } catch (err) {
     console.error(err);
     res.status(500).send({
-      error: 'Failed to list telemetry data'
+      error: 'Failed to list traces data'
     });
   }
 };
-exports.listTelemetry = listTelemetry;
-const findTelemetry = (req, res) => {
+exports.listTraces = listTraces;
+const findTraces = (req, res) => {
   const body = req.body;
-  const search = body?.search ? body.search : {};
-  if (body?.flags?.containsRegex) {
-    try {
-      //@ts-expect-error yes
-      body.config?.regexIds?.forEach(regexId => {
-        if (search[regexId]) search[regexId] = new RegExp(search[regexId]);
-      });
-    } catch (e) {
-      console.error(e);
-      res.status(404).send({
-        spansCount: 0,
-        spans: [],
-        error: e
-      });
-      return;
-    }
+  const query = body?.query ? body.query : {};
+  let processedQuery;
+  try {
+    processedQuery = (0, _regexUtils.convertRegexRecursively)(query);
+  } catch (error) {
+    console.error(error.message);
+    res.status(400).send({
+      error: error.message
+    });
+    return; // Exit if invalid regex was encountered
   }
-  _config.globalOasTlmConfig.dynamicSpanExporter.exporter.find(search, (err, docs) => {
+  _telemetryRegistry.inMemoryDbSpanExporter.find(processedQuery, (err, docs) => {
     if (err) {
       console.error(err);
       res.status(404).send({
         spansCount: 0,
         spans: [],
-        error: err
+        error: err.message
       });
-      return;
+      return; // Exit the function to prevent further execution
     }
     const spans = docs;
     res.send({
@@ -81,7 +76,7 @@ const findTelemetry = (req, res) => {
     });
   });
 };
-exports.findTelemetry = findTelemetry;
+exports.findTraces = findTraces;
 const insertTracesToDb = async (req, res) => {
   const jsonContent = req.body.spans;
   const resetData = req.query.reset === 'true';
@@ -102,11 +97,11 @@ const insertTracesToDb = async (req, res) => {
   try {
     let message = '';
     if (resetData) {
-      _config.globalOasTlmConfig.dynamicSpanExporter.exporter.reset();
+      _telemetryRegistry.inMemoryDbSpanExporter.reset();
       message += 'Traces Database reset. ';
     }
     await new Promise((resolve, reject) => {
-      _config.globalOasTlmConfig.dynamicSpanExporter.exporter.insert(cleanedTraces, (err, newDocs) => {
+      _telemetryRegistry.inMemoryDbSpanExporter.insert(cleanedTraces, (err, newDocs) => {
         if (err) {
           console.error('Error inserting traces:', err);
           return reject(err);
@@ -127,4 +122,18 @@ const insertTracesToDb = async (req, res) => {
     });
   }
 };
-exports.insertTracesToDb = insertTracesToDb;
+exports.insertTracesToDb = insertTracesToDb;
+const setRetentionTimeTraces = (req, res) => {
+  const retentionTime = req.body.retentionTime;
+  if (typeof retentionTime !== 'number' || retentionTime <= 0) {
+    res.status(400).send({
+      error: 'Invalid retention time. Must be a positive number.'
+    });
+    return;
+  }
+  _telemetryRegistry.inMemoryDbSpanExporter.retentionTimeInSeconds = retentionTime;
+  res.send({
+    message: `Retention time set to ${retentionTime} seconds.`
+  });
+};
+exports.setRetentionTimeTraces = setRetentionTimeTraces;