Address review comments

Signed-off-by: Kanahathi Mohideen <kpmfazal@gmail.com>
jaegertracing · Feb 8, 2023 · 4d507da · 4d507da
1 parent d3980bc
commit 4d507da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.test.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.test.js
@@ -22,7 +22,7 @@ import { DEFAULT_HEIGHTS, VirtualizedTraceViewImpl } from './VirtualizedTraceVie
 import traceGenerator from '../../../demo/trace-generators';
 import transformTraceData from '../../../model/transform-trace-data';
 import updateUiFindSpy from '../../../utils/update-ui-find';
-import * as getLinks from '../../../model/link-patterns';
+import * as linkPatterns from '../../../model/link-patterns';
 
 jest.mock('./SpanTreeOffset');
 jest.mock('../../../utils/update-ui-find');
@@ -436,28 +436,28 @@ describe('<VirtualizedTraceViewImpl>', () => {
     const span = trace.spans[1];
     const key = span.tags[0].key;
     const val = encodeURIComponent(span.tags[0].value);
-    const origLinkPatterns = [...getLinks.processedLinks];
+    const origLinkPatterns = [...linkPatterns.processedLinks];
 
     beforeEach(() => {
-      getLinks.processedLinks.splice(0, getLinks.processedLinks.length);
+      linkPatterns.processedLinks.splice(0, linkPatterns.processedLinks.length);
     });
 
     afterAll(() => {
-      getLinks.processedLinks.splice(0, getLinks.processedLinks.length);
-      getLinks.processedLinks.push(...origLinkPatterns);
+      linkPatterns.processedLinks.splice(0, linkPatterns.processedLinks.length);
+      linkPatterns.processedLinks.push(...origLinkPatterns);
     });
 
-    it('calls getLinks with expected params', () => {
-      const linkPatterns = [
+    it('linksGetter is expected to receive url and text for a given link pattern', () => {
+      const linkPatternConfig = [
         {
           key,
           type: 'tags',
           url: `http://example.com/?key1=#{${key}}&traceID=#{trace.traceID}&startTime=#{trace.startTime}`,
           text: `For first link traceId is - #{trace.traceID}`,
         },
-      ].map(getLinks.processLinkPattern);
+      ].map(linkPatterns.processLinkPattern);
 
-      getLinks.processedLinks.push(...linkPatterns);
+      linkPatterns.processedLinks.push(...linkPatternConfig);
 
       expect(instance.linksGetter(span, span.tags, 0)).toEqual([
         {

diff --git a/packages/jaeger-ui/src/model/link-patterns.tsx b/packages/jaeger-ui/src/model/link-patterns.tsx
@@ -191,10 +191,7 @@ export function computeLinks(
         let entry;
 
         if (parameter.startsWith('trace.')) {
-          const traceKV = getParameterInTrace(parameter.split('trace.')[1], trace);
-          if (traceKV) {
-            entry = traceKV;
-          }
+          entry = getParameterInTrace(parameter.split('trace.')[1], trace);
         } else {
           entry = getParameterInArray(parameter, items);