From d94c034f074d3e70d7587f306a14789906ef6bfa Mon Sep 17 00:00:00 2001
From: Zalmoxisus <zalmoxisus@gmail.com>
Date: Mon, 10 Dec 2018 19:03:35 +0200
Subject: [PATCH] Exclude instrumentation calls from stack trace

---
 .../redux-devtools-instrument/src/instrument.js  | 16 +++++++++++-----
 .../test/instrument.spec.js                      |  3 +--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/redux-devtools-instrument/src/instrument.js b/packages/redux-devtools-instrument/src/instrument.js
index c0209a09..ea9a38c9 100644
--- a/packages/redux-devtools-instrument/src/instrument.js
+++ b/packages/redux-devtools-instrument/src/instrument.js
@@ -23,7 +23,7 @@ export const ActionTypes = {
  * Action creators to change the History state.
  */
 export const ActionCreators = {
-  performAction(action, trace) {
+  performAction(action, trace, toExcludeFromTrace) {
     if (!isPlainObject(action)) {
       throw new Error(
         'Actions must be plain objects. ' +
@@ -39,9 +39,15 @@ export const ActionCreators = {
     }
 
     let stack;
+    let error;
     if (trace) {
       if (typeof trace === 'function') stack = trace(action);
-      else stack = Error().stack;
+      else {
+        error = Error();
+        // https://v8.dev/docs/stack-trace-api#stack-trace-collection-for-custom-exceptions
+        if (Error.captureStackTrace) Error.captureStackTrace(error, toExcludeFromTrace);
+        stack = error.stack;
+      }
     }
 
     return { type: ActionTypes.PERFORM_ACTION, action, timestamp: Date.now(), stack };
@@ -191,8 +197,8 @@ function recomputeStates(
 /**
  * Lifts an app's action into an action on the lifted store.
  */
-export function liftAction(action, trace) {
-  return ActionCreators.performAction(action, trace);
+export function liftAction(action, trace, toExcludeFromTrace) {
+  return ActionCreators.performAction(action, trace, toExcludeFromTrace);
 }
 
 /**
@@ -614,7 +620,7 @@ export function unliftStore(liftedStore, liftReducer, options) {
     liftedStore,
 
     dispatch(action) {
-      liftedStore.dispatch(liftAction(action, trace));
+      liftedStore.dispatch(liftAction(action, trace, this.dispatch));
       return action;
     },
 
diff --git a/packages/redux-devtools-instrument/test/instrument.spec.js b/packages/redux-devtools-instrument/test/instrument.spec.js
index 11027dd9..428c6308 100644
--- a/packages/redux-devtools-instrument/test/instrument.spec.js
+++ b/packages/redux-devtools-instrument/test/instrument.spec.js
@@ -710,8 +710,7 @@ describe('instrument', () => {
       expect(exportedState.actionsById[0].stack).toBe(undefined);
       expect(exportedState.actionsById[1].stack).toBeA('string');
       expect(exportedState.actionsById[1].stack).toMatch(/^Error/);
-      expect(exportedState.actionsById[1].stack).toContain('at Object.performAction');
-      expect(exportedState.actionsById[1].stack).toContain('instrument.js');
+      expect(exportedState.actionsById[1].stack).toNotMatch(/instrument.js/);
       expect(exportedState.actionsById[1].stack).toContain('instrument.spec.js');
       expect(exportedState.actionsById[1].stack).toContain('/mocha/');
     });