Merge pull request #238 from digma-ai/removing_duplicate_insights

Removing duplicate insights

Author: doppleware

src/analyticsCodeLens.ts

@@ -109,8 +109,10 @@ class CodelensProvider implements vscode.CodeLensProvider<vscode.CodeLens>
                     command: CodelensProvider.clickCommand,
                     arguments: [methodInfo, insight.environment]
                 }));
-    
+
             } 
+
+    
         }
 
         return lens;
@@ -181,7 +183,6 @@ class CodelensProvider implements vscode.CodeLensProvider<vscode.CodeLens>
         if(!documentInfo)
             return [];
 
-
         const codelens: vscode.CodeLens[] = [];
         for(let methodInfo of documentInfo.methods)
         {
@@ -196,6 +197,16 @@ class CodelensProvider implements vscode.CodeLensProvider<vscode.CodeLens>
                     codelens.push(lens);
                 }
 
+                if (lenses.length===0 && thisEnvInsights.length>0){
+                    codelens.push(new vscode.CodeLens(methodInfo.range, {
+                            title:  "Runtime data",
+                            tooltip: "Click to see this function's runtime data",
+                            command: CodelensProvider.clickCommand,
+                            arguments: [methodInfo, this._state.environment]
+                        }));
+                    
+            
+                }
 
             }
 
@@ -222,9 +233,11 @@ class CodelensProvider implements vscode.CodeLensProvider<vscode.CodeLens>
             }
 
             const endpoints = documentInfo.endpoints.filter(e => e.range.intersection(methodInfo.range) != undefined);
-            if(endpoints.length>0){
+            const uniqueEndpoints = [...new Map(endpoints.map(item =>
+                [item.id, item])).values()];
+            if(uniqueEndpoints.length>0){
                 const lenses = await this.getLensForCodeLocationObject(methodInfo,
-                                        endpoints,documentInfo.usageData.getAll(),documentInfo.insights.all.filter(x=>x.scope=="EntrySpan"|| x.scope=="Span"),
+                    uniqueEndpoints,documentInfo.usageData.getAll(),documentInfo.insights.all.filter(x=>x.scope=="EntrySpan"|| x.scope=="Span"),
                                         );
 
                 for (const lens of lenses){
@@ -254,6 +267,8 @@ class CodelensProvider implements vscode.CodeLensProvider<vscode.CodeLens>
 
         }
 
+  
+
         return codelens;
     }
 

src/services/analyticsProvider.ts

@@ -236,6 +236,7 @@ export interface CodeObjectUsageStatus {
     environment: string;
     type: string;
     name: string;
+    groupName: string;
     codeObjectId: string;
     lastRecordedTime: moment.Moment;
     firstRecordedTime: moment.Moment;

src/services/documentInfoProvider.ts

@@ -203,11 +203,13 @@ export class DocumentInfoProvider implements vscode.Disposable
                     .filter(x=>x.scope=="EntrySpan" && x.route)
                     .filter(x=>!endpoints.any(e=>e.id===x.codeObjectId));
 
-                const uniqueEndpoints = [...new Map(endPointsDiscoveredViaServer.map(item =>
-                    [item.codeObjectId, item])).values()];
+                // const uniqueEndpoints = [...new Map(endPointsDiscoveredViaServer.map(item =>
+                //     [item.codeObjectId, item])).values()];
 
+                const uniqueEndpoints = [...new Map(endPointsDiscoveredViaServer.map(item =>
+                    [item.route, item])).values()];
                 for ( const endpoint of uniqueEndpoints){
- 
+
                     if (endpoint.route){
 
                         const shortRouteName = EndpointSchema.getShortRouteName(endpoint.route);
@@ -581,7 +583,9 @@ export class CodeObjectInsightsAccessor{
         if (environment){
             insights = insights.filter(x=>x.environment===environment);
         }
-        return insights;
+        const uniqueInsights = [...new Map(insights.map(item =>
+            [item.type, item])).values()];
+        return uniqueInsights;
 
     }
     public get all(): CodeObjectInsight[]{

src/views/ListView/IListViewItem.ts

@@ -64,10 +64,10 @@ export class InsightListGroupItemsRenderer implements IItemsInGroup
             return this.group.getHtml()  + html;
 
         }
-        else if (this.emptyGroupItemtemplate){
-            html+=this.emptyGroupItemtemplate.getHtml();
-            return this.group.getHtml()  + html;
-        }
+        // 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 )

src/views/codeAnalytics/CodeObjectGroups/CodeObjectGroupDiscovery.ts

@@ -12,7 +12,7 @@ export class CodeObjectGroupDiscovery{
         const statusesByType =codeObjectUsagesStatus.groupBy(x=>x.type);
         const types = Object.keys(statusesByType);
         for (const type of types){
-            const constObjectsData = statusesByType[type].map(x=>x.name);
+            const constObjectsData = statusesByType[type].map(x=>x.groupName);
             const uniqueCodeObjects = [... new Set(constObjectsData)]
             for (const codeObjectGroup of uniqueCodeObjects){
                 const groupItem = await this._groupViewItemCreator.create(type, codeObjectGroup);

src/views/codeAnalytics/CodeObjectGroups/EndpointGroup.ts

@@ -39,13 +39,17 @@ export class HttpEndpointGroup {
 
         const shortRouteName = EndpointSchema.getShortRouteName(name);
         const parts = shortRouteName.split(' ');
+        var offset =1;
+        if (parts.length==3){
+            offset=0;
+        }
 
         return new GroupItem(shortRouteName, type, `
             <div class="group-item">
                 <span class="codicon codicon-symbol-interface" title="Endpoint"></span>
                 <span class="uppercase">
-                <strong>HTTP </strong>${parts[0]}&nbsp;</span>
-                <span>${parts[1]}</span>
+                <strong>HTTP </strong>${parts[1-offset]}&nbsp;</span>
+                <span>${parts[2-offset]}</span>
             </div>
         `);
     }