Merge pull request #2514 from digma-ai/report

Report

Author: kshmidt-digma

analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java

@@ -74,6 +74,8 @@ public interface AnalyticsProvider extends Closeable {
 
     String getIssuesReportStats(Map<String, Object> queryParams);
 
+    String getServiceReport(String queryParams);
+
     String getNotifications(NotificationsRequest notificationsRequest);
 
     void setReadNotificationsTime(SetReadNotificationsRequest setReadNotificationsRequest);

analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java

@@ -238,6 +238,11 @@ public String getIssuesReportStats(Map<String, Object> queryParams) {
         return execute(() -> client.analyticsProvider.getIssuesReportStats(queryParams));
     }
 
+    @Override
+    public String getServiceReport(String queryParams) {
+        return execute(() -> client.analyticsProvider.getServiceReport(queryParams));
+    }
+
     @Override
     public String getAssetsReportStats(Map<String, Object> queryParams) {
         return execute(() -> client.analyticsProvider.getAssetsReportStats(queryParams));
@@ -875,6 +880,13 @@ Call<Void> setInsightCustomStartTime(
         @GET("reports/issues/statistics")
         Call<String> getIssuesReportStats(@QueryMap Map<String, Object> fields);
 
+        @Headers({
+                "Accept: application/+json",
+                "Content-Type:application/json"
+        })
+        @POST("reports/services/issues")
+        Call<String> getServiceReport(@Body String filters);
+
 
         @Headers({
                 "Accept: application/+json",

ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java

@@ -330,6 +330,11 @@ public String getIssuesReportStats(@NotNull Map<String, Object> queryParams) thr
                 analyticsProviderProxy.getIssuesReportStats(queryParams));
     }
 
+    public String getServiceReport(@NotNull String  queryParams) throws AnalyticsServiceException {
+        return executeCatching(() ->
+                analyticsProviderProxy.getServiceReport(queryParams));
+    }
+
     public void resetThrottlingStatus() throws AnalyticsServiceException {
         executeCatching(() -> {
             analyticsProviderProxy.resetThrottlingStatus();

src/main/java/org/digma/intellij/plugin/dashboard/DashboardMessageRouterHandler.java

@@ -55,6 +55,9 @@ public boolean doOnQuery(@NotNull Project project, @NotNull CefBrowser browser,
             case "DASHBOARD/GET_REPORT_ASSETS_STATS" -> {
                 pushAssetsReportStats(browser, requestJsonNode);
             }
+            case "DASHBOARD/GET_METRICS_REPORT_DATA" -> {
+                pushMetricsData(browser, requestJsonNode);
+            }
             case "GLOBAL/GET_BACKEND_INFO" -> {
                 //do nothing, dashboard app sends that for some reason, but it's not necessary
             }
@@ -116,6 +119,20 @@ private void pushIssuesReportStats(CefBrowser browser, JsonNode requestJsonNode)
         }
     }
 
+    private void pushMetricsData(CefBrowser browser, JsonNode requestJsonNode) {
+        var project = getProject();
+        var requestPayload = getPayloadFromRequestNonNull(requestJsonNode);
+        Log.log(logger::trace, project, "pushMetricsData called");
+        try {
+            var payload = AnalyticsService.getInstance(project).getServiceReport(requestPayload.toString());
+            var message = new SetMetricsReportMessage(payload);
+            Log.log(logger::trace, project, "sending DASHBOARD/GET_METRICS_REPORT_DATA message");
+            serializeAndExecuteWindowPostMessageJavaScript(browser, message);
+        } catch (AnalyticsServiceException ex) {
+            Log.log(logger::trace, getProject(), "sending DASHBOARD/GET_METRICS_REPORT_DATA message with error");
+        }
+    }
+
     private void getData(CefBrowser browser, JsonNode requestJsonNode) throws JsonProcessingException {
 
         var payload = getPayloadFromRequestNonNull(requestJsonNode);

src/main/kotlin/org/digma/intellij/plugin/ui/dashboard/reports/model/SetMetricsReportMessage.kt

@@ -0,0 +1,9 @@
+package org.digma.intellij.plugin.ui.dashboard.reports.model
+
+import com.fasterxml.jackson.annotation.JsonRawValue
+import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
+
+data class SetMetricsReportMessage(@JsonRawValue val payload: String) {
+    val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
+    val action = "DASHBOARD/SET_METRICS_REPORT_DATA"
+}