Checks for both Producer and Client

Signed-off-by: wck-iipi <21dcs006@nith.ac.in>
jaegertracing · Aug 14, 2023 · dcee235 · dcee235
1 parent fe8348c
commit dcee235
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 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
@@ -357,21 +357,33 @@ describe('<VirtualizedTraceViewImpl>', () => {
       ).toBe(true);
     });
 
-    it('renders a SpanBarRow with a client span and no instrumented server span', () => {
+    it('renders a SpanBarRow with a client or producer span and no instrumented server span', () => {
       const externServiceName = 'externalServiceTest';
       const leafSpan = trace.spans.find(span => !span.hasChildren);
       const leafSpanIndex = trace.spans.indexOf(leafSpan);
-      const clientTags = [
-        { key: 'span.kind', value: 'client' },
-        { key: 'peer.service', value: externServiceName },
-        ...leafSpan.tags,
+      const tags = [
+        [
+          // client span
+          { key: 'span.kind', value: 'client' },
+          { key: 'peer.service', value: externServiceName },
+          ...leafSpan.tags,
+        ],
+        [
+          // producer span
+          { key: 'span.kind', value: 'producer' },
+          { key: 'peer.service', value: externServiceName },
+          ...leafSpan.tags,
+        ],
       ];
-      const altTrace = updateSpan(trace, leafSpanIndex, { tags: clientTags });
-      wrapper.setProps({ trace: altTrace });
-      const rowWrapper = mount(instance.renderRow('some-key', {}, leafSpanIndex, {}));
-      const spanBarRow = rowWrapper.find(SpanBarRow);
-      expect(spanBarRow.length).toBe(1);
-      expect(spanBarRow.prop('noInstrumentedServer')).not.toBeNull();
+
+      tags.forEach(tag => {
+        const altTrace = updateSpan(trace, leafSpanIndex, { tags: tag });
+        wrapper.setProps({ trace: altTrace });
+        const rowWrapper = mount(instance.renderRow('some-key', {}, leafSpanIndex, {}));
+        const spanBarRow = rowWrapper.find(SpanBarRow);
+        expect(spanBarRow.length).toBe(1);
+        expect(spanBarRow.prop('noInstrumentedServer')).not.toBeNull();
+      });
     });
   });
 

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -32,6 +32,7 @@ import {
   findServerChildSpan,
   isErrorSpan,
   isKindClient,
+  isKindProducer,
   spanContainsErredSpan,
   ViewedBoundsFunctionType,
 } from './utils';
@@ -369,7 +370,7 @@ export class VirtualizedTraceViewImpl extends React.Component<VirtualizedTraceVi
     // Leaf, kind == client and has peer.service tag, is likely a client span that does a request
     // to an uninstrumented/external service
     let noInstrumentedServer = null;
-    if (!span.hasChildren && peerServiceKV && isKindClient(span)) {
+    if (!span.hasChildren && peerServiceKV && (isKindClient(span) || isKindProducer(span))) {
       noInstrumentedServer = {
         serviceName: peerServiceKV.value,
         color: colorGenerator.getColorByKey(peerServiceKV.value),

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/utils.tsx b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/utils.tsx
@@ -120,4 +120,7 @@ export function findServerChildSpan(spans: Span[]) {
 export const isKindClient = (span: Span): Boolean =>
   span.tags.some(({ key, value }) => key === 'span.kind' && value === 'client');
 
+export const isKindProducer = (span: Span): Boolean =>
+  span.tags.some(({ key, value }) => key === 'span.kind' && value === 'producer');
+
 export { formatDuration } from '../../../utils/date';