@devskin/agent 1.0.0 → 1.0.1

package/src/instrumentation/postgres.ts

@@ -0,0 +1,182 @@
+import { Agent } from '../agent';
+import { SpanBuilder } from '../span';
+import { SpanKind, SpanStatus } from '../types';
+
+/**
+ * Instrument PostgreSQL (pg) driver for database monitoring
+ */
+export function instrumentPostgres(agent: Agent): void {
+  try {
+    let pg: any;
+    try {
+      pg = require('pg');
+    } catch {
+      // pg not installed
+      return;
+    }
+
+    const agentConfig = agent.getConfig();
+
+    // Patch Client.prototype.query
+    const originalQuery = pg.Client.prototype.query;
+    pg.Client.prototype.query = function (queryConfig: any, values: any, callback: any) {
+      if (!agent.shouldSample()) {
+        return originalQuery.call(this, queryConfig, values, callback);
+      }
+
+      // Handle different call signatures
+      let actualSql: string;
+      let actualValues: any;
+      let actualCallback: any;
+
+      if (typeof queryConfig === 'string') {
+        actualSql = queryConfig;
+        actualValues = values;
+        actualCallback = callback;
+      } else if (typeof queryConfig === 'object') {
+        actualSql = queryConfig.text || queryConfig.query;
+        actualValues = queryConfig.values;
+        actualCallback = values; // callback is second param when queryConfig is object
+      } else {
+        return originalQuery.call(this, queryConfig, values, callback);
+      }
+
+      if (typeof actualValues === 'function') {
+        actualCallback = actualValues;
+        actualValues = undefined;
+      }
+
+      // Extract connection info
+      const connectionParams = this.connectionParameters;
+      const dbName = connectionParams?.database || 'unknown';
+      const host = connectionParams?.host || 'localhost';
+      const port = connectionParams?.port || 5432;
+      const user = connectionParams?.user;
+
+      // Create span for the query
+      const span = new SpanBuilder(
+        `pg.query`,
+        SpanKind.CLIENT,
+        agentConfig.serviceName!,
+        agentConfig.serviceVersion,
+        agentConfig.environment,
+        agent
+      );
+
+      // Extract query type
+      const queryType = extractQueryType(actualSql);
+
+      // Set database attributes following OpenTelemetry semantic conventions
+      span.setAttributes({
+        'db.system': 'postgresql',
+        'db.name': dbName,
+        'db.statement': normalizeQuery(actualSql),
+        'db.operation': queryType,
+        'db.user': user,
+        'net.peer.name': host,
+        'net.peer.port': port,
+        'db.connection_string': `postgresql://${host}:${port}/${dbName}`,
+      });
+
+      span.setAttribute('span.kind', 'client');
+
+      const startTime = Date.now();
+
+      // Wrap callback to capture result/error
+      if (actualCallback) {
+        const wrappedCallback = (err: any, result: any) => {
+          if (err) {
+            span.setStatus(SpanStatus.ERROR, err.message);
+            span.setAttribute('error', true);
+            span.setAttribute('error.message', err.message);
+            span.setAttribute('error.type', err.code || 'Error');
+          } else {
+            span.setStatus(SpanStatus.OK);
+            // Add result metadata
+            if (result && result.rowCount !== undefined) {
+              span.setAttribute('db.rows_affected', result.rowCount);
+            }
+          }
+
+          span.end();
+          actualCallback(err, result);
+        };
+
+        // Build query queryConfig object
+        const newQueryConfig: any =
+          typeof queryConfig === 'object'
+            ? { ...queryConfig, callback: wrappedCallback }
+            : { text: actualSql, values: actualValues, callback: wrappedCallback };
+
+        return originalQuery.call(this, newQueryConfig);
+      } else {
+        // Promise-based query
+        const queryPromise = originalQuery.call(this, queryConfig, values);
+
+        return queryPromise
+          .then((result: any) => {
+            span.setStatus(SpanStatus.OK);
+            if (result && result.rowCount !== undefined) {
+              span.setAttribute('db.rows_affected', result.rowCount);
+            }
+            span.end();
+            return result;
+          })
+          .catch((err: any) => {
+            span.setStatus(SpanStatus.ERROR, err.message);
+            span.setAttribute('error', true);
+            span.setAttribute('error.message', err.message);
+            span.setAttribute('error.type', err.code || 'Error');
+            span.end();
+            throw err;
+          });
+      }
+    };
+
+    if (agentConfig.debug) {
+      console.log('[DevSkin Agent] PostgreSQL instrumentation enabled');
+    }
+  } catch (error: any) {
+    if (agent.getConfig().debug) {
+      console.error('[DevSkin Agent] Failed to instrument PostgreSQL:', error.message);
+    }
+  }
+}
+
+/**
+ * Extract query type from SQL statement
+ */
+function extractQueryType(sql: string): string {
+  if (typeof sql !== 'string') return 'unknown';
+
+  const normalized = sql.trim().toUpperCase();
+
+  if (normalized.startsWith('SELECT')) return 'SELECT';
+  if (normalized.startsWith('INSERT')) return 'INSERT';
+  if (normalized.startsWith('UPDATE')) return 'UPDATE';
+  if (normalized.startsWith('DELETE')) return 'DELETE';
+  if (normalized.startsWith('CREATE')) return 'CREATE';
+  if (normalized.startsWith('DROP')) return 'DROP';
+  if (normalized.startsWith('ALTER')) return 'ALTER';
+  if (normalized.startsWith('TRUNCATE')) return 'TRUNCATE';
+  if (normalized.startsWith('BEGIN')) return 'BEGIN';
+  if (normalized.startsWith('COMMIT')) return 'COMMIT';
+  if (normalized.startsWith('ROLLBACK')) return 'ROLLBACK';
+
+  return 'unknown';
+}
+
+/**
+ * Normalize query for better grouping
+ */
+function normalizeQuery(sql: string): string {
+  if (typeof sql !== 'string') return String(sql);
+
+  // Limit length to avoid huge spans
+  let normalized = sql.substring(0, 10000);
+
+  // Remove extra whitespace
+  normalized = normalized.replace(/\s+/g, ' ').trim();
+
+  return normalized;
+}

package/src/instrumentation/redis.ts

@@ -0,0 +1,166 @@
+import { Agent } from '../agent';
+import { SpanBuilder } from '../span';
+import { SpanKind, SpanStatus } from '../types';
+
+/**
+ * Instrument Redis (ioredis and redis) for database monitoring
+ */
+export function instrumentRedis(agent: Agent): void {
+  try {
+    // Try ioredis first (more popular)
+    let ioredis: any;
+    try {
+      ioredis = require('ioredis');
+      instrumentIORedis(agent, ioredis);
+    } catch {}
+
+    // Try redis (node-redis)
+    let redis: any;
+    try {
+      redis = require('redis');
+      instrumentNodeRedis(agent, redis);
+    } catch {}
+  } catch (error: any) {
+    if (agent.getConfig().debug) {
+      console.error('[DevSkin Agent] Failed to instrument Redis:', error.message);
+    }
+  }
+}
+
+/**
+ * Instrument ioredis
+ */
+function instrumentIORedis(agent: Agent, ioredis: any): void {
+  const config = agent.getConfig();
+  const originalSendCommand = ioredis.prototype.sendCommand;
+
+  ioredis.prototype.sendCommand = function (command: any, ...args: any[]) {
+    if (!agent.shouldSample()) {
+      return originalSendCommand.call(this, command, ...args);
+    }
+
+    const commandName = command?.name || 'unknown';
+    const commandArgs = command?.args || [];
+
+    // Extract connection info
+    const host = this.options?.host || 'localhost';
+    const port = this.options?.port || 6379;
+    const db = this.options?.db || 0;
+
+    // Create span
+    const span = new SpanBuilder(
+      `redis.${commandName}`,
+      SpanKind.CLIENT,
+      config.serviceName!,
+      config.serviceVersion,
+      config.environment,
+      agent
+    );
+
+    span.setAttributes({
+      'db.system': 'redis',
+      'db.name': `${db}`,
+      'db.operation': commandName.toUpperCase(),
+      'db.statement': `${commandName} ${commandArgs.slice(0, 3).join(' ')}`.substring(0, 500),
+      'net.peer.name': host,
+      'net.peer.port': port,
+      'db.connection_string': `redis://${host}:${port}/${db}`,
+    });
+
+    span.setAttribute('span.kind', 'client');
+
+    // Execute command
+    const result = originalSendCommand.call(this, command, ...args);
+
+    if (result && typeof result.then === 'function') {
+      return result
+        .then((res: any) => {
+          span.setStatus(SpanStatus.OK);
+          span.end();
+          return res;
+        })
+        .catch((err: any) => {
+          span.setStatus(SpanStatus.ERROR, err.message);
+          span.setAttribute('error', true);
+          span.setAttribute('error.message', err.message);
+          span.end();
+          throw err;
+        });
+    }
+
+    span.end();
+    return result;
+  };
+
+  if (config.debug) {
+    console.log('[DevSkin Agent] IORedis instrumentation enabled');
+  }
+}
+
+/**
+ * Instrument node-redis
+ */
+function instrumentNodeRedis(agent: Agent, redis: any): void {
+  const config = agent.getConfig();
+
+  // Redis v4+ uses different API
+  if (redis.createClient) {
+    const originalCreateClient = redis.createClient;
+    redis.createClient = function (...args: any[]) {
+      const client = originalCreateClient(...args);
+
+      // Wrap command executor
+      const originalSendCommand = client.sendCommand;
+      if (originalSendCommand) {
+        client.sendCommand = function (command: any[]) {
+          if (!agent.shouldSample()) {
+            return originalSendCommand.call(this, command);
+          }
+
+          const commandName = command[0] || 'unknown';
+
+          const span = new SpanBuilder(
+            `redis.${commandName}`,
+            SpanKind.CLIENT,
+            config.serviceName!,
+            config.serviceVersion,
+            config.environment,
+            agent
+          );
+
+          span.setAttributes({
+            'db.system': 'redis',
+            'db.operation': commandName.toUpperCase(),
+            'db.statement': command.join(' ').substring(0, 500),
+          });
+
+          const result = originalSendCommand.call(this, command);
+
+          if (result && typeof result.then === 'function') {
+            return result
+              .then((res: any) => {
+                span.setStatus(SpanStatus.OK);
+                span.end();
+                return res;
+              })
+              .catch((err: any) => {
+                span.setStatus(SpanStatus.ERROR, err.message);
+                span.setAttribute('error', true);
+                span.end();
+                throw err;
+              });
+          }
+
+          span.end();
+          return result;
+        };
+      }
+
+      return client;
+    };
+  }
+
+  if (config.debug) {
+    console.log('[DevSkin Agent] Redis (node-redis) instrumentation enabled');
+  }
+}

package/src/types.ts

@@ -8,6 +8,9 @@ export interface AgentConfig {
   /** API key for authentication */
   apiKey: string;
 
+  /** Application ID (required for backend authentication) */
+  applicationId: string;
+
   /** Service name */
   serviceName: string;
 
@@ -29,6 +32,9 @@ export interface AgentConfig {
   /** Enable Express instrumentation */
   instrumentExpress?: boolean;
 
+  /** Enable Database instrumentation (MySQL, PostgreSQL, etc.) */
+  instrumentDatabase?: boolean;
+
   /** Batch size for sending data */
   batchSize?: number;