From e8221177107393b96cc07e797d7348a4ce18fee9 Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:12:56 -0400
Subject: [PATCH 1/9] Adding plugin files for redis.

---
 src/plugins/redis.js      | 142 ++++++++++++++++++++++
 src/plugins/redis.test.js | 249 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 391 insertions(+)
 create mode 100644 src/plugins/redis.js
 create mode 100644 src/plugins/redis.test.js

diff --git a/src/plugins/redis.js b/src/plugins/redis.js
new file mode 100644
index 0000000..4bf6584
--- /dev/null
+++ b/src/plugins/redis.js
@@ -0,0 +1,142 @@
+import { debuglog } from 'util';
+import shimmer from 'shimmer';
+import redis from 'redis';
+import Perf from 'performance-node';
+import uuid from 'uuid/v4';
+
+const debug = debuglog('@iopipe/trace');
+
+/*eslint-disable babel/no-invalid-this*/
+/*eslint-disable func-name-matching */
+/*eslint-disable prefer-rest-params */
+/*eslint-disable prefer-spread */
+
+const createId = () => `redis-${uuid()}`;
+
+const filterRequest = (command, context) => {
+  const { args } = command;
+  if (!context) {
+    return null;
+  }
+
+  const { db } = context.options;
+  const { host, port } = context.connection_options;
+  return {
+    command: command.command,
+    key: args[0] ? args[0] : null,
+    hostname: host,
+    port,
+    db
+  };
+};
+
+function wrap({ timeline, data = {} } = {}) {
+  const target = redis.RedisClient && redis.RedisClient.prototype;
+
+  if (!(timeline instanceof Perf)) {
+    debug(
+      'Timeline passed to plugins/ioredis.wrap not an instance of performance-node. Skipping.'
+    );
+    return false;
+  }
+
+  if (!redis.__iopipeShimmer) {
+    if (process.env.IOPIPE_TRACE_REDIS_CB) {
+      shimmer.wrap(target, 'send_command', wrapSendCommand); // redis < 2.5.3
+    } else {
+      shimmer.wrap(target, 'internal_send_command', wrapInternalSendCommand);
+    }
+    target.__iopipeShimmer = true;
+  }
+
+  return true;
+
+  function wrapSendCommand(original) {
+    return function wrappedSendCommand() {
+      const context = this;
+      const args = Array.prototype.slice.call(arguments);
+      const id = createId();
+      const cb = args[2];
+
+      if (!data[id]) {
+        data[id] = {
+          name: args[0],
+          dbType: 'Redis',
+          request: filterRequest({ command: args[0], args: args[1] }, context)
+        };
+      }
+
+      timeline.mark(`start:${id}`);
+
+      if (typeof cb === 'function' && !cb.__iopipeTraceId) {
+        this.callback = function wrappedCallback(err) {
+          if (err) {
+            data[id].error = err.message;
+            data[id].errorStack = err.stack;
+          }
+          timeline.mark(`end:${id}`);
+
+          return this.callback.apply(this, arguments);
+        };
+        this.callback.__iopipeTraceId = id;
+      }
+      return original.apply(this, arguments);
+    };
+  }
+  function wrapInternalSendCommand(original) {
+    return function wrappedInternalSendCommand(cmd) {
+      const context = this;
+      const id = createId();
+      const cb = cmd.callback;
+
+      if (!cmd.__iopipeTraceId) {
+        // console.log('applying id to command!', id);
+        cmd.__iopipeTraceId = id;
+      }
+
+      if (!data[id]) {
+        data[id] = {
+          name: cmd.command,
+          dbType: 'Redis',
+          request: filterRequest(cmd, context)
+        };
+      }
+
+      // console.log('@@@@@');
+      // console.log('timestamp', new Date().getTime());
+      // console.log(id, data[id].name, data[id].request.key);
+      // console.log('cmd,', cmd);
+      // console.log('@@@@@');
+      //
+      if (typeof cb === 'function' && !cb.__iopipeTraceId) {
+        timeline.mark(`start:${id}`);
+
+        cmd.callback = function wrappedInternalCallback(err) {
+          if (err) {
+            data[id].error = err.message;
+            data[id].errorStack = err.stack;
+          }
+          //console.log('CALLED!', id, cmd, arguments)
+          timeline.mark(`end:${id}`);
+          return cb.apply(cmd, arguments);
+        };
+        cmd.callback.__iopipeTraceId = id;
+      }
+
+      return original.apply(this, arguments);
+    };
+  }
+}
+
+function unwrap() {
+  const target = redis.RedisClient && redis.RedisClient.prototype;
+
+  if (process.env.IOPIPE_TRACE_REDIS_CB) {
+    shimmer.unwrap(target, 'send_command');
+  } else {
+    shimmer.unwrap(target, 'internal_send_command');
+  }
+  delete redis.__iopipeShimmer;
+}
+
+export { unwrap, wrap };
diff --git a/src/plugins/redis.test.js b/src/plugins/redis.test.js
new file mode 100644
index 0000000..30d040a
--- /dev/null
+++ b/src/plugins/redis.test.js
@@ -0,0 +1,249 @@
+import _ from 'lodash';
+import Perf from 'performance-node';
+import redis from 'redis';
+import { wrap, unwrap } from './redis';
+
+const { promisify } = require('util');
+
+const mockRedisStore = {};
+
+const mockGet = key => {
+  const keyArray = Object.keys(mockRedisStore);
+  if (keyArray.indexOf(key) === -1) {
+    return undefined;
+  }
+  return mockRedisStore[key];
+};
+
+const mockSet = (key, val) => {
+  mockRedisStore[key] = val;
+  return { key: val };
+};
+
+//jest.mock('redis').default;
+
+function timelineExpect({ timeline, data }) {
+  const dataValues = _.values(data);
+  expect(dataValues.length).toBeGreaterThan(0);
+  const [obj] = dataValues;
+
+  expect(obj.name).toBe('set');
+  expect(obj.request).toBeDefined();
+  expect(obj.request.key).toBeDefined();
+
+  const entries = timeline.getEntries();
+  expect(entries.length).toBeGreaterThan(0);
+  expect(entries[0].name).toMatch(/^start:redis-(.){36}$/);
+}
+
+xtest('Basic Redis mock works as normal if wrap is not called', () => {
+  const client = redis.createClient();
+  client.set = jest.fn((key, val) => mockSet(key, val));
+  client.get = jest.fn(key => mockGet(key));
+
+  const expectedStr = 'mock redis test';
+  expect(client.set.__wrapped).toBeUndefined();
+  client.set('testString', expectedStr);
+
+  const returnedValue = client.get('testString');
+  expect(returnedValue).toBe(expectedStr);
+});
+
+test('Redis works as normal if wrap is not called', done => {
+  const client = redis.createClient();
+  const expectedStr = 'unwrapped redis';
+  expect(client.set.__wrapped).toBeUndefined();
+
+  const getCb = (err, response) => {
+    expect(response).toBe(expectedStr);
+    return done(err);
+  };
+
+  const setCb = (err, response) => {
+    if (err) {
+      return done(err);
+    }
+    expect(response).toBe('OK');
+    return client.get('testString', getCb);
+  };
+
+  client.set('testString', expectedStr, setCb);
+});
+
+test('Bails if timeline is not instance of performance-node', () => {
+  const bool = wrap({ timeline: [] });
+  expect(bool).toBe(false);
+});
+
+xdescribe('Wrapping redis Mock', () => {
+  let client;
+
+  afterEach(() => {
+    unwrap();
+  });
+
+  test('Mocking redis to pass CircleCI', () => {
+    const timeline = new Perf({ timestamp: true });
+    const data = {};
+
+    wrap({ timeline, data });
+
+    client = redis.createClient({ db: 2 });
+
+    client.set = jest.fn((key, val) => mockSet(key, val));
+    client.get = jest.fn(key => mockGet(key));
+
+    const expectedStr = 'wrapping redis mock';
+    client.set('testString', expectedStr);
+
+    const returnedValue = client.get('testString');
+    expect(returnedValue).toBe(expectedStr);
+
+    // not doing timelineExpect because mock doesn't affect timeline
+  });
+});
+
+describe('Wrapping redis', () => {
+  let client;
+
+  afterEach(() => {
+    try {
+      unwrap();
+    } catch (err) {
+      client.quit();
+      throw err;
+    }
+  });
+
+  afterAll(() => {
+    try {
+      client.flushdb(() => {
+        client.quit();
+      });
+    } catch (err) {
+      client.quit();
+      throw err;
+    }
+  });
+
+  test('Wrap works with redis set and get using callbacks.', done => {
+    const timeline = new Perf({ timestamp: true });
+    const data = {};
+
+    wrap({ timeline, data });
+
+    client = redis.createClient({
+      host: '0.0.0.0',
+      db: 2
+    });
+
+    expect(client.__iopipeShimmer).toBeDefined();
+    expect(client.internal_send_command.__wrapped).toBeDefined();
+
+    const expectedStr = 'wrapping redis with callbacks';
+    const getCb = (err, response) => {
+      expect(response).toBe(expectedStr);
+      timelineExpect({ timeline, data });
+      return done(err);
+    };
+
+    const setCb = (err, response) => {
+      if (err) {
+        client.quit();
+        return done(err);
+      }
+      expect(response).toBe('OK');
+      return client.get('testString', getCb);
+    };
+
+    client.set('testString', expectedStr, setCb);
+  });
+
+  test(
+    'Wrap works with promisified redis.set/.get using async/await syntax',
+    async () => {
+      const timeline = new Perf({ timestamp: true });
+      const data = {};
+
+      wrap({ timeline, data });
+
+      client = redis.createClient({
+        host: '0.0.0.0',
+        db: 2
+      });
+
+      const setAsync = promisify(client.set).bind(client);
+      const getAsync = promisify(client.get).bind(client);
+
+      expect(client.__iopipeShimmer).toBeDefined();
+      expect(client.internal_send_command.__wrapped).toBeDefined();
+
+      const expectedStr = 'wrapping promisified redis with async/await';
+
+      await setAsync('testString', expectedStr)
+        .then(response => {
+          return response;
+        })
+        .catch(err => {
+          throw err;
+        });
+
+      const getValue = await getAsync('testString')
+        .then(response => {
+          return response;
+        })
+        .catch(err => {
+          throw err;
+        });
+
+      const getValuePromise = await getAsync('testString').then(
+        response =>
+          new Promise(resolve => {
+            return resolve(response);
+          })
+      );
+
+      expect(getValue).toBe(expectedStr);
+      expect(getValuePromise).toBe(expectedStr);
+
+      timelineExpect({ timeline, data });
+    },
+    15000
+  );
+
+  test(
+    'Wrap works with promisified redis.set/get using promise syntax',
+    async () => {
+      const timeline = new Perf({ timestamp: true });
+      const data = {};
+
+      wrap({ timeline, data });
+
+      client = redis.createClient({ host: '127.0.0.1', db: 2 });
+
+      const setAsync = promisify(client.set).bind(client);
+      const getAsync = promisify(client.get).bind(client);
+
+      expect(client.__iopipeShimmer).toBeDefined();
+      expect(client.internal_send_command.__wrapped).toBeDefined();
+
+      const expectedStr = 'wrapping promisified redis with promise syntax';
+
+      setAsync('testString', expectedStr);
+
+      const returnedValue = await getAsync('testString')
+        .then(result => {
+          expect(result).toBeDefined();
+          expect(result).toBe(expectedStr);
+          return result;
+        })
+        .catch(err => {
+          expect(err).toBeNull();
+        });
+
+      expect(returnedValue).toBe(expectedStr);
+      timelineExpect({ timeline, data });
+    },
+    15000
+  );
+});

From 6c7e6544ca1c3c0f3de0b181385ee4ddcce05dcb Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:19:29 -0400
Subject: [PATCH 2/9] Renaming ioredis timeline ids to differentiate from
 node_redis, and altering test strings for clarity/debugging.

---
 src/plugins/ioredis.js      |  3 +--
 src/plugins/ioredis.test.js | 43 +++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/plugins/ioredis.js b/src/plugins/ioredis.js
index 877a0e0..c3bf35a 100644
--- a/src/plugins/ioredis.js
+++ b/src/plugins/ioredis.js
@@ -10,7 +10,7 @@ const debug = debuglog('@iopipe/trace');
 /*eslint-disable func-name-matching */
 /*eslint-disable prefer-rest-params */
 
-const createId = () => `redis-${uuid()}`;
+const createId = () => `ioredis-${uuid()}`;
 
 const filterRequest = (command, context) => {
   const { name, args } = command;
@@ -18,7 +18,6 @@ const filterRequest = (command, context) => {
     return null;
   }
   const { hostname, port, connectionName, db } = context.options;
-
   return {
     command: name,
     key: args[0] ? args[0] : null,
diff --git a/src/plugins/ioredis.test.js b/src/plugins/ioredis.test.js
index 57d5715..2382134 100644
--- a/src/plugins/ioredis.test.js
+++ b/src/plugins/ioredis.test.js
@@ -3,7 +3,7 @@ import Perf from 'performance-node';
 import Redis from 'ioredis';
 import { wrap, unwrap } from './ioredis';
 
-jest.mock('ioredis');
+//jest.mock('ioredis');
 
 const mockRedisStore = {};
 const mockGet = key => {
@@ -29,15 +29,15 @@ function timelineExpect({ timeline, data }) {
 
   const entries = timeline.getEntries();
   expect(entries.length).toBeGreaterThan(0);
-  expect(entries[0].name).toMatch(/^start:redis-(.){36}$/);
+  expect(entries[0].name).toMatch(/^start:ioredis-(.){36}$/);
 }
 
-test('Basic Redis mock works as normal if wrap is not called', () => {
+xtest('Basic Redis mock works as normal if wrap is not called', () => {
   const redis = new Redis();
   redis.set = jest.fn((key, val) => mockSet(key, val));
   redis.get = jest.fn(key => mockGet(key));
 
-  const expectedStr = 'iopipe';
+  const expectedStr = 'iopipe: ioredis';
   expect(redis.set.__wrapped).toBeUndefined();
 
   redis.set('testString', expectedStr);
@@ -46,9 +46,9 @@ test('Basic Redis mock works as normal if wrap is not called', () => {
   expect(returnedValue).toBe(expectedStr);
 });
 
-xtest('Redis works as normal if wrap is not called', done => {
+test('Redis works as normal if wrap is not called', done => {
   const redis = new Redis();
-  const expectedStr = 'iopipe';
+  const expectedStr = 'iopipe: unwrapped ioredis';
   expect(redis.set.__wrapped).toBeUndefined();
 
   redis
@@ -69,7 +69,9 @@ test('Bails if timeline is not instance of performance-node', () => {
   expect(bool).toBe(false);
 });
 
-describe('Wrapping Redis Mock', () => {
+xdescribe('Wrapping Redis Mock', () => {
+  let redis;
+
   afterEach(() => {
     unwrap();
   });
@@ -80,11 +82,11 @@ describe('Wrapping Redis Mock', () => {
 
     wrap({ timeline, data });
 
-    const redis = new Redis();
+    redis = new Redis();
     redis.set = jest.fn((key, val) => mockSet(key, val));
     redis.get = jest.fn(key => mockGet(key));
 
-    const expectedStr = 'iopipeSecondTest';
+    const expectedStr = 'mock wrapped ioredis';
     redis.set('testString', expectedStr);
 
     const returnedValue = redis.get('testString');
@@ -94,9 +96,18 @@ describe('Wrapping Redis Mock', () => {
   });
 });
 
-xdescribe('Wrapping Redis', () => {
+describe('Wrapping Redis', () => {
+  let redis;
+
   afterEach(() => {
     unwrap();
+    redis.flushdb();
+  });
+
+  afterAll(() => {
+    redis.flushdb().then(() => {
+      redis.quit();
+    });
   });
 
   test(
@@ -107,7 +118,7 @@ xdescribe('Wrapping Redis', () => {
 
       wrap({ timeline, data });
 
-      const redis = new Redis({
+      redis = new Redis({
         host: '0.0.0.0',
         connectionName: 'Test 1',
         db: 1
@@ -115,7 +126,7 @@ xdescribe('Wrapping Redis', () => {
 
       expect(redis.sendCommand.__wrapped).toBeDefined();
 
-      const expectedStr = 'iopipeSecondTest';
+      const expectedStr = 'wrapped ioredis, async/await';
 
       redis.set('testString', expectedStr);
 
@@ -135,11 +146,11 @@ xdescribe('Wrapping Redis', () => {
 
       wrap({ timeline, data });
 
-      const redis = new Redis({ host: '127.0.0.1', connectionName: 'Test 2' });
+      redis = new Redis({ host: '127.0.0.1', connectionName: 'Test 2', db: 1 });
 
       expect(redis.sendCommand.__wrapped).toBeDefined();
 
-      const expectedStr = 'iopipeThirdTest';
+      const expectedStr = 'wrapped ioredis, promise syntax';
 
       redis.set('testString', expectedStr);
 
@@ -168,11 +179,11 @@ xdescribe('Wrapping Redis', () => {
 
       wrap({ timeline, data });
 
-      const redis = new Redis({ host: 'localhost', connectionName: 'Test 3' });
+      redis = new Redis({ host: 'localhost', connectionName: 'Test 3', db: 1 });
 
       expect(redis.sendCommand.__wrapped).toBeDefined();
 
-      const expectedStr = 'iopipeFourthTest';
+      const expectedStr = 'wrapped ioredis, callback syntax';
       redis.set('testString', expectedStr);
 
       expect(timeline.data).toHaveLength(1);

From 494b7a09c943ac9a3218eeb92496d3ffb890bc6c Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:20:04 -0400
Subject: [PATCH 3/9] Correcting typo in test comment

---
 src/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.test.js b/src/index.test.js
index fe67720..4eff154 100644
--- a/src/index.test.js
+++ b/src/index.test.js
@@ -232,7 +232,7 @@ test('autoHttp works with got(url) and options', async () => {
     const result = await context.Promise;
     expect(result).toBe(200);
     const traces = getTracesFromInspectableInv(inspectableInv);
-    // we excluded traces for http calls that have ?exlude=true in url, so only 1 trace total should be present
+    // we excluded traces for http calls that have ?exclude=true in url, so only 1 trace total should be present
     expect(traces).toHaveLength(1);
     expect(traces).toMatchSnapshot();
   } catch (err) {

From c88515d18ad18a5df276db13cfabe75846c69d74 Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:21:34 -0400
Subject: [PATCH 4/9] Extensive refactoring of index.js and addToReport.js to
 reduce duplication as we add plugins, and allow lazy-loading of plugins.

---
 src/addToReport.js |  30 +++--------
 src/index.js       | 128 ++++++++++++++++++++++++++-------------------
 2 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/src/addToReport.js b/src/addToReport.js
index c7b2580..a821f7d 100644
--- a/src/addToReport.js
+++ b/src/addToReport.js
@@ -16,11 +16,14 @@ export function addToReport(pluginInstance, timelineArg) {
   ];
 }
 
-export function addHttpTracesToReport(plugin) {
-  const { autoHttpData: { timeline = {} } } = plugin;
+export function addTraceData(plugin, type) {
+  const namespace = `${type.config}Data`;
+
+  const { [namespace]: { timeline = {} } } = plugin;
   const { report: { report = {} } = {} } = plugin.invocationInstance;
-  Object.keys(plugin.autoHttpData.data).forEach(id => {
-    const obj = unflatten(plugin.autoHttpData.data[id] || {});
+
+  Object.keys(plugin[namespace].data).forEach(id => {
+    const obj = unflatten(plugin[namespace].data[id] || {});
     if (obj.request) {
       obj.request.headers = headersObjToArray(obj.request.headers);
     }
@@ -34,23 +37,6 @@ export function addHttpTracesToReport(plugin) {
     obj.timestamp = startMark.timestamp || 0;
     obj.startTime = startMark.startTime || 0;
     obj.duration = measureMark.duration || 0;
-    report.httpTraceEntries.push(obj);
-  });
-}
-
-export function addIoRedisTracesToReport(plugin) {
-  const { autoIoRedisData: { timeline = {} } } = plugin;
-  const { report: { report = {} } = {} } = plugin.invocationInstance;
-  Object.keys(plugin.autoIoRedisData.data).forEach(id => {
-    const obj = unflatten(plugin.autoIoRedisData.data[id] || {});
-    // use start mark for startTime in case the call did not finish / no callback
-    // and we do not have a measurement
-    const [startMark = {}] = timeline.getEntriesByName(`start:${id}`) || [];
-    const [measureMark = {}] = timeline.getEntriesByName(`measure:${id}`) || [];
-    obj.timestamp = startMark.timestamp || 0;
-    obj.startTime = startMark.startTime || 0;
-    obj.duration = measureMark.duration || 0;
-
-    report.dbTraceEntries.push(obj);
+    report[type.entries].push(obj);
   });
 }
diff --git a/src/index.js b/src/index.js
index 314c7d0..45196d5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,16 +1,25 @@
 import Perf from 'performance-node';
 
 import pkg from '../package.json'; // eslint-disable-line import/extensions
-import {
-  addToReport,
-  addHttpTracesToReport,
-  addIoRedisTracesToReport
-} from './addToReport';
-import { wrap as httpWrap, unwrap as httpUnwrap } from './plugins/https';
-import {
-  wrap as ioRedisWrap,
-  unwrap as ioRedisUnwrap
-} from './plugins/ioredis';
+import { addToReport, addTraceData } from './addToReport';
+
+const plugins = {
+  https: {
+    config: 'autoHttp',
+    enabled: true,
+    entries: 'httpTraceEntries'
+  },
+  ioredis: {
+    config: 'autoIoRedis',
+    flag: 'IOPIPE_TRACE_IOREDIS',
+    entries: 'dbTraceEntries'
+  },
+  redis: {
+    config: 'autoRedis',
+    flag: 'IOPIPE_TRACE_REDIS',
+    entries: 'dbTraceEntries'
+  }
+};
 
 function getBooleanFromEnv(key = '') {
   const isFalsey =
@@ -27,7 +36,8 @@ function getConfig(config = {}) {
   const {
     autoMeasure = true,
     autoHttp = { enabled: true },
-    autoIoRedis = { enabled: getBooleanFromEnv('IOPIPE_TRACE_IOREDIS') }
+    autoIoRedis = { enabled: getBooleanFromEnv('IOPIPE_TRACE_IOREDIS') },
+    autoRedis = { enabled: getBooleanFromEnv('IOPIPE_TRACE_REDIS') }
   } = config;
   return {
     autoHttp: {
@@ -43,6 +53,12 @@ function getConfig(config = {}) {
           ? autoIoRedis.enabled
           : getBooleanFromEnv('IOPIPE_TRACE_IOREDIS')
     },
+    autoRedis: {
+      enabled:
+        typeof autoRedis.enabled === 'boolean'
+          ? autoRedis.enabled
+          : getBooleanFromEnv('IOPIPE_TRACE_REDIS')
+    },
     autoMeasure
   };
 }
@@ -58,6 +74,7 @@ function addTimelineMeasures(pluginInstance, timelineArg) {
     .map(entry => entry.name);
   // loop through each mark and make sure there is a start and end
   // if so, measure
+  // console.log('NAMES', names);
   names.forEach(name => {
     if (name.match(/^(start):.+/)) {
       const baseName = name.replace(/(start|end):(.+)/, '$2');
@@ -74,18 +91,12 @@ function addTimelineMeasures(pluginInstance, timelineArg) {
   return true;
 }
 
-function recordAutoHttpData(plugin) {
-  addTimelineMeasures(plugin, plugin.autoHttpData.timeline);
-  addHttpTracesToReport(plugin);
-  plugin.autoHttpData.timeline.clear();
-  plugin.autoHttpData.data = {};
-}
-
-function recordAutoIoRedisData(plugin) {
-  addTimelineMeasures(plugin, plugin.autoIoRedisData.timeline);
-  addIoRedisTracesToReport(plugin);
-  plugin.autoIoRedisData.timeline.clear();
-  plugin.autoIoRedisData.data = {};
+function recordData(plugin, type) {
+  const namespace = `${plugins[type].config}Data`;
+  addTimelineMeasures(plugin, plugin[namespace].timeline);
+  addTraceData(plugin, plugins[type]);
+  plugin[namespace].timeline.clear();
+  plugin[namespace].data = {};
 }
 
 class TracePlugin {
@@ -99,24 +110,28 @@ class TracePlugin {
       'post:invoke': this.postInvoke.bind(this),
       'pre:report': this.preReport.bind(this)
     };
-    if (this.config.autoHttp.enabled) {
-      this.autoHttpData = {
-        timeline: new Perf({ timestamp: true }),
-        // object to store data about traces that will make it into the report later
-        data: {},
-        config: this.config.autoHttp
-      };
-      httpWrap(this.autoHttpData);
-    }
-    if (this.config.autoIoRedis.enabled) {
-      this.autoIoRedisData = {
-        timeline: new Perf({ timestamp: true }),
-        // object to store data about traces that will make it into the report later
-        data: {},
-        config: this.config.autoIoRedis
-      };
-      ioRedisWrap(this.autoIoRedisData);
-    }
+
+    const context = this;
+    const pluginKeys = Object.keys(plugins);
+    pluginKeys.forEach(k => {
+      const conf = plugins[k].config;
+      const namespace = `${conf}Data`;
+
+      if (context.config[conf].enabled) {
+        // getting plugin; allows this to be loaded only if enabled.
+        const module = require(`./plugins/${k}`);
+        plugins[k].wrap = module.wrap;
+        plugins[k].unwrap = module.unwrap;
+
+        context[namespace] = {
+          timeline: new Perf({ timestamp: true }),
+          // object to store data about traces that will make it into the report later
+          data: {},
+          config: context.config[conf]
+        };
+        plugins[k].wrap(context[namespace]);
+      }
+    });
 
     return this;
   }
@@ -133,12 +148,17 @@ class TracePlugin {
     this.invocationInstance.report.report.dbTraceEntries = [];
   }
   postInvoke() {
-    if (this.config.autoHttp.enabled) {
-      httpUnwrap();
-    }
-    if (this.config.autoIoRedis.enabled) {
-      ioRedisUnwrap();
-    }
+    const context = this;
+    const pluginKeys = Object.keys(plugins);
+    pluginKeys.forEach(k => {
+      const conf = plugins[k].config;
+      if (context.config[conf].enabled) {
+        if (context.config[conf].enabled) {
+          plugins[k].unwrap();
+        }
+      }
+    });
+
     if (
       typeof this.invocationInstance.context.iopipe.label === 'function' &&
       this.timeline.getEntries().length > 0
@@ -150,12 +170,14 @@ class TracePlugin {
     if (this.config.autoMeasure) {
       addTimelineMeasures(this);
     }
-    if (this.config.autoHttp.enabled) {
-      recordAutoHttpData(this);
-    }
-    if (this.config.autoIoRedis.enabled) {
-      recordAutoIoRedisData(this);
-    }
+    const context = this;
+    const pluginKeys = Object.keys(plugins);
+    pluginKeys.forEach(k => {
+      const conf = plugins[k].config;
+      if (this.config[conf].enabled) {
+        recordData(context, k);
+      }
+    });
     addToReport(this);
   }
   start(name) {

From a61d76d2d4065364143a87fa4fdffb64683dcb3d Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:28:34 -0400
Subject: [PATCH 5/9] Moving wrapped dependencies into devDependencies Updating
 dependency versions for more flexibility Removing unneeded module-specific
 yarn test commands

---
 package.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6d1751b..79ef13e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "prepare": "npm run build",
     "release": "iopipe-scripts release",
     "test": "iopipe-scripts test",
-    "testRedis": "yarn run jest src/plugins/ioredis.test.js --forceExit --verbose",
     "validate": "iopipe-scripts validate"
   },
   "repository": {
@@ -36,21 +35,21 @@
   },
   "homepage": "https://github.com/iopipe/iopipe-plugin-trace#readme",
   "devDependencies": {
-    "@iopipe/core": "^1.x",
+    "@iopipe/core": "^1",
     "@iopipe/scripts": "^1.4.1",
     "aws-lambda-mock-context": "^3.0.0",
     "delay": "^2.0.0",
     "got": "^8.3.1",
+    "ioredis": "^4",
     "lodash": "^4.17.4",
+    "redis": "^2",
     "superagent": "^3.8.3"
   },
   "dependencies": {
     "flat": "^4.0.0",
-    "ioredis": "^4.9.0",
     "isarray": "^2.0.4",
     "lodash.pickby": "^4.6.0",
-    "performance-node": "^0.2.0",
-    "semver": "^6.0.0",
+    "performance-node": "^0",
     "shimmer": "^1.2.1",
     "uuid": "^3.2.1"
   },

From 119fda184226ce2db893f03204f09a2b90a94930 Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:29:29 -0400
Subject: [PATCH 6/9] Restoring semver dependency

---
 package.json |   1 +
 yarn.lock    | 103 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 79ef13e..36b205d 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "isarray": "^2.0.4",
     "lodash.pickby": "^4.6.0",
     "performance-node": "^0",
+    "semver": "^6.3.0",
     "shimmer": "^1.2.1",
     "uuid": "^3.2.1"
   },
diff --git a/yarn.lock b/yarn.lock
index e6bb99d..68480c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -78,12 +78,14 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@iopipe/core@^1.x":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@iopipe/core/-/core-1.11.1.tgz#6107d55831ffc429ff613f9e3f78c691a02a9102"
+"@iopipe/core@^1":
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/@iopipe/core/-/core-1.19.1.tgz#19da388f0c900f4551915c71993b4c1269979970"
+  integrity sha512-JyEcARVnE+TMYodEu9jV61CpWGqmBaAqfvUWX1m5ot1kzbXDS5gvnD/opYsNRteALluiLcb42TRxlEuPCTmijQ==
   dependencies:
     cosmiconfig "^4"
     lodash.uniqby "^4.7.0"
+    simple-get "^3.0.2"
 
 "@iopipe/eslint-config-iopipe@1.0.2":
   version "1.0.2"
@@ -1935,10 +1937,10 @@ clone@~0.1.9:
   version "0.1.19"
   resolved "https://registry.yarnpkg.com/clone/-/clone-0.1.19.tgz#613fb68639b26a494ac53253e15b1a6bd88ada85"
 
-cluster-key-slot@^1.0.6:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.0.12.tgz#d5deff2a520717bc98313979b687309b2d368e29"
-  integrity sha512-21O0kGmvED5OJ7ZTdqQ5lQQ+sjuez33R+d35jZKLwqUb5mqcPHUsxOSzj61+LHVtxGZd1kShbQM3MjB/gBJkVg==
+cluster-key-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d"
+  integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
 
 co@^4.6.0:
   version "4.6.0"
@@ -2366,6 +2368,13 @@ debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -2586,6 +2595,11 @@ dotenv@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
+
 duplexer2@~0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -3312,11 +3326,6 @@ flat@^4.0.0:
   dependencies:
     is-buffer "~1.1.5"
 
-flexbuffer@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/flexbuffer/-/flexbuffer-0.0.6.tgz#039fdf23f8823e440c38f3277e6fef1174215b30"
-  integrity sha1-A5/fI/iCPkQMOPMnfm/vEXQhWzA=
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4095,18 +4104,17 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-ioredis@^4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.9.0.tgz#0c52de498363309ebd48b5f6695d9d432b0f6669"
-  integrity sha512-YzfCLsN++Ct43QqGK9CWxaEK6OUvJ7rnENieAPNw3DVp/oF2uBrP2NJChbhO74Ng3LWA+i5zdIEUsZYr6dKDIQ==
+ioredis@^4:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.14.0.tgz#d0e83b1d308ca1ba6e849798bfe91583b560eaac"
+  integrity sha512-vGzyW9QTdGMjaAPUhMj48Z31mIO5qJLzkbsE5dg+orNi7L5Ph035htmkBZNDTDdDk7kp7e9UJUr+alhRuaWp8g==
   dependencies:
-    cluster-key-slot "^1.0.6"
-    debug "^3.1.0"
+    cluster-key-slot "^1.1.0"
+    debug "^4.1.1"
     denque "^1.1.0"
-    flexbuffer "0.0.6"
     lodash.defaults "^4.2.0"
     lodash.flatten "^4.4.0"
-    redis-commands "1.4.0"
+    redis-commands "1.5.0"
     redis-errors "^1.2.0"
     redis-parser "^3.0.0"
     standard-as-callback "^2.0.1"
@@ -5578,6 +5586,11 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 mute-stream@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
@@ -5885,9 +5898,10 @@ octal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b"
 
-once@^1.3.0, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
@@ -6172,9 +6186,10 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-performance-node@^0.2.0:
+performance-node@^0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-node/-/performance-node-0.2.0.tgz#03abf74ac0c455f333be505165dacab9110ef5b3"
+  integrity sha1-A6v3SsDEVfMzvlBRZdrKuREO9bM=
 
 performance-now@^0.2.0:
   version "0.2.0"
@@ -6536,16 +6551,21 @@ redeyed@~1.0.0:
   dependencies:
     esprima "~3.0.0"
 
-redis-commands@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
-  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
+redis-commands@1.5.0, redis-commands@^1.2.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.5.0.tgz#80d2e20698fe688f227127ff9e5164a7dd17e785"
+  integrity sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==
 
 redis-errors@^1.0.0, redis-errors@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad"
   integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=
 
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
+
 redis-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"
@@ -6553,6 +6573,15 @@ redis-parser@^3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
+redis@^2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"
+
 regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
@@ -7016,10 +7045,10 @@ semver-diff@^2.0.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
-  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 semver@~2.3.1:
   version "2.3.2"
@@ -7093,6 +7122,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+simple-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
+  integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
+
+simple-get@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.0.3.tgz#924528ac3f9d7718ce5e9ec1b1a69c0be4d62efa"
+  integrity sha512-Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==
+  dependencies:
+    decompress-response "^3.3.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"

From e0ed6baa53e53dcf8d8e93dc48848402355ea8e9 Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 17:33:05 -0400
Subject: [PATCH 7/9] Restoring redis/ioredis mocks to pass CircleCI

---
 src/plugins/ioredis.test.js | 14 +++++++++-----
 src/plugins/redis.test.js   | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/plugins/ioredis.test.js b/src/plugins/ioredis.test.js
index 2382134..1a18aa6 100644
--- a/src/plugins/ioredis.test.js
+++ b/src/plugins/ioredis.test.js
@@ -3,7 +3,7 @@ import Perf from 'performance-node';
 import Redis from 'ioredis';
 import { wrap, unwrap } from './ioredis';
 
-//jest.mock('ioredis');
+jest.mock('ioredis');
 
 const mockRedisStore = {};
 const mockGet = key => {
@@ -32,7 +32,7 @@ function timelineExpect({ timeline, data }) {
   expect(entries[0].name).toMatch(/^start:ioredis-(.){36}$/);
 }
 
-xtest('Basic Redis mock works as normal if wrap is not called', () => {
+test('Basic Redis mock works as normal if wrap is not called', () => {
   const redis = new Redis();
   redis.set = jest.fn((key, val) => mockSet(key, val));
   redis.get = jest.fn(key => mockGet(key));
@@ -46,7 +46,7 @@ xtest('Basic Redis mock works as normal if wrap is not called', () => {
   expect(returnedValue).toBe(expectedStr);
 });
 
-test('Redis works as normal if wrap is not called', done => {
+xtest('Redis works as normal if wrap is not called', done => {
   const redis = new Redis();
   const expectedStr = 'iopipe: unwrapped ioredis';
   expect(redis.set.__wrapped).toBeUndefined();
@@ -69,13 +69,17 @@ test('Bails if timeline is not instance of performance-node', () => {
   expect(bool).toBe(false);
 });
 
-xdescribe('Wrapping Redis Mock', () => {
+describe('Wrapping Redis Mock', () => {
   let redis;
 
   afterEach(() => {
     unwrap();
   });
 
+  afterAll(() => {
+    redis.quit();
+  });
+
   test('Mocking redis to pass CircleCI', () => {
     const timeline = new Perf({ timestamp: true });
     const data = {};
@@ -96,7 +100,7 @@ xdescribe('Wrapping Redis Mock', () => {
   });
 });
 
-describe('Wrapping Redis', () => {
+xdescribe('Wrapping Redis', () => {
   let redis;
 
   afterEach(() => {
diff --git a/src/plugins/redis.test.js b/src/plugins/redis.test.js
index 30d040a..296b5d8 100644
--- a/src/plugins/redis.test.js
+++ b/src/plugins/redis.test.js
@@ -20,7 +20,7 @@ const mockSet = (key, val) => {
   return { key: val };
 };
 
-//jest.mock('redis').default;
+jest.mock('redis').default;
 
 function timelineExpect({ timeline, data }) {
   const dataValues = _.values(data);
@@ -36,7 +36,7 @@ function timelineExpect({ timeline, data }) {
   expect(entries[0].name).toMatch(/^start:redis-(.){36}$/);
 }
 
-xtest('Basic Redis mock works as normal if wrap is not called', () => {
+test('Basic Redis mock works as normal if wrap is not called', () => {
   const client = redis.createClient();
   client.set = jest.fn((key, val) => mockSet(key, val));
   client.get = jest.fn(key => mockGet(key));
@@ -49,7 +49,7 @@ xtest('Basic Redis mock works as normal if wrap is not called', () => {
   expect(returnedValue).toBe(expectedStr);
 });
 
-test('Redis works as normal if wrap is not called', done => {
+xtest('Redis works as normal if wrap is not called', done => {
   const client = redis.createClient();
   const expectedStr = 'unwrapped redis';
   expect(client.set.__wrapped).toBeUndefined();
@@ -75,13 +75,17 @@ test('Bails if timeline is not instance of performance-node', () => {
   expect(bool).toBe(false);
 });
 
-xdescribe('Wrapping redis Mock', () => {
+describe('Wrapping redis Mock', () => {
   let client;
 
   afterEach(() => {
     unwrap();
   });
 
+  afterAll(() => {
+    client.quit();
+  });
+
   test('Mocking redis to pass CircleCI', () => {
     const timeline = new Perf({ timestamp: true });
     const data = {};
@@ -103,7 +107,7 @@ xdescribe('Wrapping redis Mock', () => {
   });
 });
 
-describe('Wrapping redis', () => {
+xdescribe('Wrapping redis', () => {
   let client;
 
   afterEach(() => {

From 61ceaecd99697779d02117aef7f07276c8da22cf Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Fri, 16 Aug 2019 18:30:45 -0400
Subject: [PATCH 8/9] Fix to catch redis module's double-submit of wrapped
 commands.  ID mismatch was preventing trace ends from being detected.

---
 src/plugins/redis.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/plugins/redis.js b/src/plugins/redis.js
index 4bf6584..10cd3a9 100644
--- a/src/plugins/redis.js
+++ b/src/plugins/redis.js
@@ -89,12 +89,9 @@ function wrap({ timeline, data = {} } = {}) {
       const id = createId();
       const cb = cmd.callback;
 
-      if (!cmd.__iopipeTraceId) {
-        // console.log('applying id to command!', id);
+      if (!data[id] && !cmd.__iopipeTraceId) {
         cmd.__iopipeTraceId = id;
-      }
 
-      if (!data[id]) {
         data[id] = {
           name: cmd.command,
           dbType: 'Redis',
@@ -102,12 +99,6 @@ function wrap({ timeline, data = {} } = {}) {
         };
       }
 
-      // console.log('@@@@@');
-      // console.log('timestamp', new Date().getTime());
-      // console.log(id, data[id].name, data[id].request.key);
-      // console.log('cmd,', cmd);
-      // console.log('@@@@@');
-      //
       if (typeof cb === 'function' && !cb.__iopipeTraceId) {
         timeline.mark(`start:${id}`);
 
@@ -116,13 +107,11 @@ function wrap({ timeline, data = {} } = {}) {
             data[id].error = err.message;
             data[id].errorStack = err.stack;
           }
-          //console.log('CALLED!', id, cmd, arguments)
           timeline.mark(`end:${id}`);
           return cb.apply(cmd, arguments);
         };
         cmd.callback.__iopipeTraceId = id;
       }
-
       return original.apply(this, arguments);
     };
   }

From d573f82c4d903fa5ca1703f72472f4fecef967ce Mon Sep 17 00:00:00 2001
From: Maurice Rickard <maurice@mauricerickard.com>
Date: Tue, 20 Aug 2019 12:13:01 -0400
Subject: [PATCH 9/9] Adding redis information to README

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a559d16..799ac2c 100644
--- a/README.md
+++ b/README.md
@@ -108,9 +108,15 @@ const iopipe = iopipeLib({
   ]
 });
 ```
+#### `autoRedis` Automatically trace Redis commands using redis (node_redis)
+
+Set the environment variable `IOPIPE_TRACE_REDIS` to `true`, and IOpipe will trace Redis commands automatically: which command, which key is being read or written, and information about the connection: hostname, port, and connection name (if defined in your connection options).  Commands batched with multi/exec are traced individually, so you can measure individual performance within batch operations.  
+
+If you're using redis@2.5.3 or earlier, turn on auto-tracing with the `IOPIPE_TRACE_REDIS_CB` environment variable set to true.  
+
 #### `autoIoRedis` Automatically trace Redis commands using ioredis
 
-Setting the environment variable `IOPIPE_TRACE_IOREDIS` to `true` for your function will enable automatic traces on Redis commands: the name of the command, name of the host, port, and connection (if defined in your connection options), and the key being written or read.  Commands batched with multi/exec are traced individually, so you can measure individual performance within batch operations.
+Set the environment variable `IOPIPE_TRACE_IOREDIS` to `true`, and your function will enable automatic traces on Redis commands: the name of the command, name of the host, port, and connection (if defined in your connection options), and the key being written or read.  Commands batched with multi/exec are traced individually, so you can measure individual performance within batch operations.
 
 #### `autoMeasure` (bool: optional = true)