fix: request apiCalleeNameCount only for API_TRACE (#739)

Author: arjunlalb

projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.test.ts

@@ -1,4 +1,5 @@
 import { ModelApi } from '@hypertrace/hyperdash';
+import { ObservabilityTraceType } from '@hypertrace/observability';
 import { spanIdKey } from '../../../../graphql/model/schema/span';
 import { traceIdKey, traceTypeKey, TRACE_SCOPE } from '../../../../graphql/model/schema/trace';
 import {
@@ -8,7 +9,7 @@ import {
 import { ObservedGraphQlRequest } from '../../../data/graphql/graphql-query-event.service';
 import { ApiTraceDetailDataSourceModel } from './api-trace-detail-data-source.model';
 
-describe('Trace detail data source model', () => {
+describe('API Trace detail data source model', () => {
   const testTimeRange = { startTime: new Date(1568907645141), endTime: new Date(1568911245141) };
   let model!: ApiTraceDetailDataSourceModel;
   let emittedQueries: unknown;
@@ -66,7 +67,11 @@ describe('Trace detail data source model', () => {
     });
   });
 
-  test('builds expected request', () => {
+  test('builds expected request for API_TRACE', () => {
+    model.trace = {
+      [traceIdKey]: 'test',
+      [traceTypeKey]: ObservabilityTraceType.Api
+    };
     const data$ = model.getData();
     data$.subscribe();
 
@@ -86,6 +91,25 @@ describe('Trace detail data source model', () => {
     );
   });
 
+  test('builds expected request', () => {
+    const data$ = model.getData();
+    data$.subscribe();
+
+    expect(emittedQueries).toEqual(
+      expect.objectContaining({
+        requestType: TRACE_GQL_REQUEST,
+        traceId: 'test',
+        spanLimit: 0,
+        timestamp: undefined,
+        traceProperties: expect.arrayContaining([
+          expect.objectContaining({ name: 'tags' }),
+          expect.objectContaining({ name: 'traceId' }),
+          expect.objectContaining({ name: 'statusCode' })
+        ])
+      })
+    );
+  });
+
   test('builds expected request with start time', () => {
     model.startTime = 1568907645141;
     const data$ = model.getData();
@@ -100,8 +124,7 @@ describe('Trace detail data source model', () => {
         traceProperties: expect.arrayContaining([
           expect.objectContaining({ name: 'tags' }),
           expect.objectContaining({ name: 'traceId' }),
-          expect.objectContaining({ name: 'statusCode' }),
-          expect.objectContaining({ name: 'apiCalleeNameCount' })
+          expect.objectContaining({ name: 'statusCode' })
         ])
       })
     );

projects/distributed-tracing/src/shared/dashboard/widgets/trace-detail/data/api-trace-detail-data-source.model.ts

@@ -1,15 +1,21 @@
 import { Model } from '@hypertrace/hyperdash';
-import { Trace, traceIdKey } from '../../../../graphql/model/schema/trace';
+import { Trace, traceIdKey, traceTypeKey } from '../../../../graphql/model/schema/trace';
 
 import { Dictionary } from '@hypertrace/common';
+import { ObservabilityTraceType } from '@hypertrace/observability';
 import { TraceDetailData, TraceDetailDataSourceModel } from './trace-detail-data-source.model';
 
 @Model({
   type: 'api-trace-detail-data-source'
 })
 export class ApiTraceDetailDataSourceModel extends TraceDetailDataSourceModel {
   protected getTraceAttributes(): string[] {
-    return [...super.getTraceAttributes(), 'traceId', 'apiCalleeNameCount'];
+    const attributes: string[] = [...super.getTraceAttributes(), 'traceId'];
+    if (this.trace[traceTypeKey] === ObservabilityTraceType.Api) {
+      attributes.push('apiCalleeNameCount');
+    }
+
+    return attributes;
   }
 
   protected constructTraceDetailData(trace: Trace): ApiTraceDetailData {