will not show 'missing data' when errors not reported by span, added more text to trace compare'

Author: doppleware

src/views-ui/codeAnalytics/contracts.ts

@@ -35,7 +35,7 @@ export namespace UiMessage
         }
 
         export class OpenTracePanel {
-            constructor(public traceIds?: string[], public span?:string, public jaegerAddress?:string){}
+            constructor(public traceIds?: string[], public traceLabels?:string[],  public span?:string, public jaegerAddress?:string){}
         }
         export class OpenRawTrace {
             constructor(public content?: string) {}

src/views-ui/codeAnalytics/main.ts

@@ -139,10 +139,12 @@ window.addEventListener("load", () =>
 
     $(document).on("click", ".trace-link", function () {
         const traceIds = $(this).data("trace-id").split(",");
+        const traceLabels = $(this).data("trace-label")?.split(",");
+        
         const span = $(this).data("span-name");
         const jaeger = $(this).data("jaeger-address");
 
-        publish(new UiMessage.Notify.OpenTracePanel(traceIds,span, jaeger));
+        publish(new UiMessage.Notify.OpenTracePanel(traceIds,traceLabels,span, jaeger));
     });
 
     consume(UiMessage.Set.TracePanel, (event) => {

src/views/ListView/IListViewItem.ts

@@ -27,11 +27,10 @@ export interface IItemsInGroup extends IListViewItemBase
 
 export class InsightItemGroupRendererFactory {
 
-    public constructor( private emptyGroupItemtemplate: IListViewItemBase, private codeObjectEnvironments : CodeObjectGroupEnvironments,
-        private usageResults: UsageStatusResults){}
+    public constructor( private emptyGroupItemtemplate: IListViewItemBase|undefined){}
 
     public getRenderer(group: IListGroupItemBase, sortIndex: number|undefined = undefined): InsightListGroupItemsRenderer{
-        return new InsightListGroupItemsRenderer(group,sortIndex,this.emptyGroupItemtemplate,this.codeObjectEnvironments,this.usageResults);
+        return new InsightListGroupItemsRenderer(group,sortIndex,this.emptyGroupItemtemplate);
 
     }
 }
@@ -41,8 +40,7 @@ export class InsightListGroupItemsRenderer implements IItemsInGroup
     private _items: IListViewItem [] = [];
 
     constructor(public group: IListGroupItemBase, public sortIndex: number|undefined = undefined,
-        private emptyGroupItemtemplate: IListViewItemBase, private codeObjectEnvironments : CodeObjectGroupEnvironments,
-        private usageResults: UsageStatusResults)
+        private emptyGroupItemtemplate: IListViewItemBase|undefined)
     {
         this.groupId=group.groupId;
     }
@@ -63,14 +61,16 @@ export class InsightListGroupItemsRenderer implements IItemsInGroup
                     .map(o=>o.getHtml())
                     .filter((o)=>o)
                     .join("");
-                    
+            return this.group.getHtml()  + html;
+
         }
-        else{
+        else if (this.emptyGroupItemtemplate){
             html+=this.emptyGroupItemtemplate.getHtml();
+            return this.group.getHtml()  + html;
         }
+        return html;
 
         //+ this.codeObjectEnvironments.getUsageHtml(this.group.groupId, this.group.type, this.usageResults )
-        return this.group.getHtml()  + html;
     }
 }
 

src/views/codeAnalytics/CodeObjectGroups/EndpointGroup.ts

@@ -29,7 +29,7 @@ export class EndpointGroup implements ICodeObjectScopeGroupCreator{
         const shortRouteName = EndpointSchema.getShortRouteName(name);
         const parts = shortRouteName.split(' ');        
 
-        return new GroupItem(fullRoute, "Endpoint", `
+        return new GroupItem(fullRoute.replace("ep","").replace(":", " "), "Endpoint", `
         <div class="group-item">
             <span class="scope">REST: </span>
             <span class="codicon codicon-symbol-interface" title="Endpoint"></span>

src/views/codeAnalytics/InsightListView/EndpointInsight.ts

@@ -74,7 +74,7 @@ export class LowUsageListViewItemsCreator implements IInsightListViewItemsCreato
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint low traffic", "Servicing a low number of requests", "gauge_low.png"),
             sortIndex: 0,
-            groupId: codeObjectsInsight.route
+            groupId: codeObjectsInsight.route.replace("ep","").replace(":", " ")
         };
     }
 
@@ -100,7 +100,7 @@ export class NormalUsageListViewItemsCreator implements IInsightListViewItemsCre
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint normal level of traffic", "Servicing an average number of requests", "guage_normal.png"),
             sortIndex: 0,
-            groupId: codeObjectsInsight.route
+            groupId: codeObjectsInsight.route.replace("ep","").replace(":", " ")
         };
     }
 
@@ -135,7 +135,7 @@ export class HighUsageListViewItemsCreator implements IInsightListViewItemsCreat
         return {
             getHtml: () => this.template.generateHtml(codeObjectsInsight.maxCallsIn1Min, "Endpoint high traffic", "Servicing a high number of requests", "guage_high.png"),
             sortIndex: 0,
-            groupId: codeObjectsInsight.route
+            groupId: codeObjectsInsight.route.replace("ep","").replace(":", " ")
         };
     }
 
@@ -205,7 +205,7 @@ export class SlowestSpansListViewItemsCreator implements IInsightListViewItemsCr
         return {
             getHtml: () => html,
             sortIndex: 0,
-            groupId: codeObjectsInsight.route
+            groupId: codeObjectsInsight.route.replace("ep","").replace(":", " ")
         };
     }
 
@@ -283,7 +283,7 @@ export class SlowEndpointListViewItemsCreator implements IInsightListViewItemsCr
         return {
             getHtml: () => html,
             sortIndex: 0,
-            groupId: codeObjectsInsight.route
+            groupId: codeObjectsInsight.route.replace("ep","").replace(":", " ")
         };
     }
 

src/views/codeAnalytics/InsightListView/ItemRender/SpanItemRendering.ts

@@ -108,7 +108,7 @@ export class SpanItemHtmlRendering{
             const traceIdAtt = `data-trace-id="${traceIds.join(",")}"`;
 
             traceHtml=`
-            <span  class="insight-main-value trace-link link" data-jaeger-address="${Settings.jaegerAddress.value}" data-span-name="${insight.span}" 
+            <span  class="insight-main-value trace-link link" data-jaeger-address="${Settings.jaegerAddress.value}" data-span-name="${insight.span.name}" 
                 ${traceLabelsAtt} ${traceIdAtt} >
             Compare
             </span> 

src/views/codeAnalytics/Traces/tracePanel.ts

@@ -21,7 +21,7 @@ export class TracePanel {
 
     }
 
-    public async getHtml(traceIds: string[], traceIdLabels :string[], span:string, jaegerAddress:string):Promise<string>{
+    public async getHtml(traceIds: string[], traceIdLabels :string[]|undefined, span:string, jaegerAddress:string):Promise<string>{
 
 
         // const traceHtmlResponse = await fetch(`${jaegerAddress}/trace/${traceId}?uiEmbed=v0`);
@@ -47,7 +47,7 @@ export class TracePanel {
 
         }
 
-        else if (traceIds.length===2){
+        else if (traceIds.length===2 && traceIdLabels!=null){
 
             const trace1  = traceIds[0].toLocaleLowerCase();
             const trace2  = traceIds[1].toLocaleLowerCase();
@@ -56,6 +56,9 @@ export class TracePanel {
             html =`
             <body>
             <h1>Trace: ${span}</h1>
+            
+            <h3>Comparing: A sample ${traceIdLabels[0]} trace  with a ${traceIdLabels[1]} trace</h3>
+            <br></br>
             <iframe style="width:100%; height:500px;"src="${src}" title="Trace" ></iframe>
             </body>`;
         }

src/views/codeAnalytics/codeAnalyticsView.ts

@@ -218,7 +218,7 @@ class CodeAnalyticsViewProvider implements vscode.WebviewViewProvider,vscode.Dis
               );
 
             const tracePanel = new TracePanel(this._channel);
-            panel.webview.html=await tracePanel.getHtml(e.traceIds,[], e.span, e.jaegerAddress);
+            panel.webview.html=await tracePanel.getHtml(e.traceIds,e.traceLabels, e.span, e.jaegerAddress);
             //tracePanel.loadData(e.traceId, e.jaegerAddress);
 
         }

src/views/codeAnalytics/errorsViewTab.ts

@@ -172,7 +172,7 @@ export class ErrorsViewTab implements ICodeAnalyticsViewTab
             const groupItems = await new CodeObjectGroupDiscovery(this._groupViewItemCreator).getGroups(codeObjectStatuses);
             const listViewItems = ErrorsHtmlBuilder.createListViewItem(errors);
             const codeObjectGroupEnv = new CodeObjectGroupEnvironments(this._webViewUris, this._workspaceState);
-            const groupRenderer = new InsightItemGroupRendererFactory(new EmptyGroupItemTemplate(this._webViewUris, this._workspaceState), codeObjectGroupEnv, usageResults);
+            const groupRenderer = new InsightItemGroupRendererFactory(undefined);
             const html = codeObjectGroupEnv.getUsageHtml(undefined,undefined,usageResults) + new ListViewRender(listViewItems, groupItems, groupRenderer).getHtml();
             this._channel.publish(new UiMessage.Set.ErrorsList(html));
             this._viewedCodeObjectId = codeObject.id;

src/views/codeAnalytics/insightsViewTab.ts

@@ -111,10 +111,12 @@ export class InsightsViewTab implements ICodeAnalyticsViewTab
         }
         try{
 
-            const groupItems = await new CodeObjectGroupDiscovery(this._groupViewItemCreator).getGroups(usageResults.codeObjectStatuses);
+            let groupItems = await new CodeObjectGroupDiscovery(this._groupViewItemCreator).getGroups(usageResults.codeObjectStatuses);
+            groupItems = groupItems.filter((item,index)=> groupItems.findIndex(x=>x.groupId===item.groupId) === index);
+          
             const listViewItems = await this._listViewItemsCreator.create( responseItems);
             const codeObjectGroupEnv = new CodeObjectGroupEnvironments(this._viewUris, this._workspaceState);
-            const groupRenderer = new InsightItemGroupRendererFactory(new EmptyGroupItemTemplate(this._viewUris,this._workspaceState), codeObjectGroupEnv, usageResults);
+            const groupRenderer = new InsightItemGroupRendererFactory(new EmptyGroupItemTemplate(this._viewUris,this._workspaceState));
 
             const html = codeObjectGroupEnv.getUsageHtml(undefined,undefined,usageResults) + new ListViewRender(listViewItems, groupItems, groupRenderer).getHtml();