Replace Reselect with Memoize

packages/jaeger-ui/package.json

@@ -93,7 +93,6 @@
     "redux-first-history": "^5.1.1",
     "redux-form": "^8.3.10",
     "redux-promise-middleware": "^6.1.3",
-    "reselect": "^4.1.6",
     "store": "^2.0.12",
     "ts-key-enum": "^2.0.0",
     "tween-functions": "^1.2.0",

packages/jaeger-ui/src/components/DependencyGraph/index.jsx

@@ -17,6 +17,7 @@
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
+import memoizeOne from 'memoize-one';
 
 import DAG from './DAG';
 import DependencyForceGraph from './DependencyForceGraph';
@@ -25,7 +26,6 @@
 import * as jaegerApiActions from '../../actions/jaeger-api';
 import { FALLBACK_DAG_MAX_NUM_SERVICES } from '../../constants';
 import { nodesPropTypes, linksPropTypes } from '../../propTypes/dependencies';
-import { formatDependenciesAsNodesAndLinks } from '../../selectors/dependencies';
 import { getConfigValue } from '../../utils/config/get-config';
 
 import './index.css';
@@ -128,13 +128,56 @@
   }
 }
 
+const formatDependenciesAsNodesAndLinks = memoizeOne(dependencies => {
+  const data = dependencies.reduce(
+    (response, link) => {
+      const { nodeMap } = response;
+      let { links } = response;
+
+      // add both the parent and child to the node map, or increment their
+      // call count.
+      nodeMap[link.parent] = nodeMap[link.parent] ? nodeMap[link.parent] + link.callCount : link.callCount;
+      nodeMap[link.child] = nodeMap[link.child]
+        ? response.nodeMap[link.child] + link.callCount
+        : link.callCount;
+
+      // filter out self-dependent
+      if (link.parent !== link.child) {
+        links = links.concat([
+          {
+            source: link.parent,
+            target: link.child,
+            callCount: link.callCount,
+            value: Math.max(Math.sqrt(link.callCount / 10000), 1),
+            target_node_size: Math.max(Math.log(nodeMap[link.child] / 1000), 3),
+          },
+        ]);
+      }
+
+      return { nodeMap, links };
+    },
+    { nodeMap: {}, links: [] }
+  );
+
+  data.nodes = Object.keys(data.nodeMap).map(id => ({
+    callCount: data.nodeMap[id],
+    radius: Math.max(Math.log(data.nodeMap[id] / 1000), 3),
+    orphan: data.links.findIndex(link => id === link.source || id === link.target) === -1,
+    id,
+  }));
+
+  const { nodes, links } = data;
+
+  return { nodes, links };
+});
+
 // export for tests
 export function mapStateToProps(state) {
   const { dependencies, error, loading } = state.dependencies;
   let links;
   let nodes;
   if (dependencies && dependencies.length > 0) {
-    const formatted = formatDependenciesAsNodesAndLinks({ dependencies });
+    const formatted = formatDependenciesAsNodesAndLinks(dependencies);
     links = formatted.links;
     nodes = formatted.nodes;
   }

packages/jaeger-ui/tsconfig.lint.json

@@ -49,7 +49,6 @@
     "src/reducers/index.js",
     "src/reducers/services.js",
     "src/reducers/trace.js",
-    "src/selectors/dependencies.js",
     "src/utils/configure-store.js",
     "src/utils/sort.js",
     "package.json"

yarn.lock

@@ -8943,11 +8943,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-reselect@^4.1.6:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
-  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
-
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"