Feature/link to span percentiles (#110)

arik-dig · web-flow · commit 2a7386adf180 · 2022-08-02T17:02:16.000+03:00
diff --git a/analytics-provider/build.gradle.kts b/analytics-provider/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
     implementation(project(":model"))
     implementation(libs.retrofit.client)
     implementation(libs.retrofit.jackson)
+    implementation(libs.guava)
 }
 
 
diff --git a/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java b/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java
@@ -4,6 +4,7 @@
 import org.digma.intellij.plugin.model.rest.errors.CodeObjectError;
 import org.digma.intellij.plugin.model.rest.insights.CodeObjectInsight;
 import org.digma.intellij.plugin.model.rest.insights.InsightsRequest;
+import org.digma.intellij.plugin.model.rest.insights.SpanHistogramQuery;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummary;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummaryRequest;
 import org.digma.intellij.plugin.model.rest.usage.UsageStatusRequest;
@@ -26,4 +27,5 @@ public interface AnalyticsProvider extends Closeable {
 
     UsageStatusResult getUsageStatus(UsageStatusRequest usageStatusRequest);
 
+    String getHtmlGraphForSpanPercentiles(SpanHistogramQuery request);
 }
diff --git a/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java b/analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java
@@ -1,12 +1,15 @@
 package org.digma.intellij.plugin.analytics;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.io.CharStreams;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.ResponseBody;
 import org.digma.intellij.plugin.model.rest.errordetails.CodeObjectErrorDetails;
 import org.digma.intellij.plugin.model.rest.errors.CodeObjectError;
 import org.digma.intellij.plugin.model.rest.insights.CodeObjectInsight;
 import org.digma.intellij.plugin.model.rest.insights.InsightsRequest;
+import org.digma.intellij.plugin.model.rest.insights.SpanHistogramQuery;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummary;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummaryRequest;
 import org.digma.intellij.plugin.model.rest.usage.UsageStatusRequest;
@@ -15,11 +18,24 @@
 import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
-import retrofit2.http.*;
-
-import javax.net.ssl.*;
+import retrofit2.http.Body;
+import retrofit2.http.GET;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.http.Streaming;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.UncheckedIOException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -71,6 +87,20 @@ public UsageStatusResult getUsageStatus(UsageStatusRequest usageStatusRequest) {
         return execute(() -> client.analyticsProvider.getUsageStatus(usageStatusRequest));
     }
 
+    @Override
+    public String getHtmlGraphForSpanPercentiles(SpanHistogramQuery request) {
+        final ResponseBody responseBody = execute(() -> client.analyticsProvider.getHtmlGraphForSpanPercentiles(request));
+        return readEntire(responseBody);
+    }
+
+    protected static String readEntire(ResponseBody responseBody) {
+        try (Reader reader = responseBody.charStream()) {
+            return CharStreams.toString(reader);
+        } catch (IOException e) {
+            throw new UncheckedIOException("failed to read HTTP Response Body", e);
+        }
+    }
+
     public <T> T execute(Supplier<Call<T>> supplier) {
 
         Response<T> response;
@@ -262,6 +292,16 @@ private interface AnalyticsProviderRetrofit {
         @POST("/CodeAnalytics/codeobjects/status")
         Call<UsageStatusResult> getUsageStatus(@Body UsageStatusRequest usageStatusRequest);
 
+
+        @Headers({
+                "Accept: application/+json",
+                "Content-Type:application/json"
+        })
+        @POST("/Graphs/graphForSpanPercentiles")
+        // @Streaming means ResponseBody as is, without conversion
+        @Streaming
+        Call<ResponseBody> getHtmlGraphForSpanPercentiles(@Body SpanHistogramQuery request);
+
     }
 
 }
diff --git a/analytics-provider/src/test/java/org/digma/intellij/plugin/analytics/InsightsTests.java b/analytics-provider/src/test/java/org/digma/intellij/plugin/analytics/InsightsTests.java
@@ -3,7 +3,21 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import okhttp3.mockwebserver.MockResponse;
-import org.digma.intellij.plugin.model.rest.insights.*;
+import org.digma.intellij.plugin.model.rest.insights.CodeObjectInsight;
+import org.digma.intellij.plugin.model.rest.insights.Duration;
+import org.digma.intellij.plugin.model.rest.insights.ErrorInsight;
+import org.digma.intellij.plugin.model.rest.insights.ErrorInsightNamedError;
+import org.digma.intellij.plugin.model.rest.insights.HighUsageInsight;
+import org.digma.intellij.plugin.model.rest.insights.HotspotInsight;
+import org.digma.intellij.plugin.model.rest.insights.InsightsRequest;
+import org.digma.intellij.plugin.model.rest.insights.LowUsageInsight;
+import org.digma.intellij.plugin.model.rest.insights.NormalUsageInsight;
+import org.digma.intellij.plugin.model.rest.insights.Percentile;
+import org.digma.intellij.plugin.model.rest.insights.SlowEndpointInsight;
+import org.digma.intellij.plugin.model.rest.insights.SlowSpanInfo;
+import org.digma.intellij.plugin.model.rest.insights.SlowestSpansInsight;
+import org.digma.intellij.plugin.model.rest.insights.SpanHistogramQuery;
+import org.digma.intellij.plugin.model.rest.insights.SpanInfo;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -18,7 +32,7 @@ public class InsightsTests extends AbstractAnalyticsProviderTest {
 
     //run against running env just for local test
 //    @Test
-    public void getInsightsTemp() {
+    public void actualGetInsightsTemp() {
         {
             List<String> ids = new ArrayList<>();
             ids.add("method:Sample.MoneyTransfer.API.Domain.Services.MoneyTransferDomainService$_$TransferFunds");
@@ -34,7 +48,7 @@ public void getInsightsTemp() {
 
 
     //    @Test
-    public void getInsightsTempViaSsl() {
+    public void actualGetInsightsTempViaSsl() {
         {
             List<String> ids = new ArrayList<>();
             ids.add("method:Sample.MoneyTransfer.API.Controllers.TransferController$_$TransferFunds");
@@ -47,6 +61,16 @@ public void getInsightsTempViaSsl() {
         }
     }
 
+    //@Test
+    public void actualgetHtmlGraphForSpanPercentiles() {
+        final SpanHistogramQuery query = new SpanHistogramQuery(
+                "ARIK-LAPTOP[LOCAL]", "SampleInsights/Error", "OpenTelemetry.Instrumentation.AspNetCore", "");
+        AnalyticsProvider analyticsProvider = new RestAnalyticsProvider("https://localhost:5051");
+
+        String htmlBody = analyticsProvider.getHtmlGraphForSpanPercentiles(query);
+
+        System.out.println("htmlBody:" + htmlBody);
+    }
 
     @Test
     public void getInsights() throws JsonProcessingException {
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java b/ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java
@@ -11,6 +11,7 @@
 import org.digma.intellij.plugin.model.rest.errors.CodeObjectError;
 import org.digma.intellij.plugin.model.rest.insights.CodeObjectInsight;
 import org.digma.intellij.plugin.model.rest.insights.InsightsRequest;
+import org.digma.intellij.plugin.model.rest.insights.SpanHistogramQuery;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummary;
 import org.digma.intellij.plugin.model.rest.summary.CodeObjectSummaryRequest;
 import org.digma.intellij.plugin.model.rest.usage.UsageStatusRequest;
@@ -29,7 +30,12 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.ConnectException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class AnalyticsService implements Disposable {
@@ -161,6 +167,11 @@ public UsageStatusResult getUsageStatusOfErrors(List<String> objectIds) throws A
         return analyticsProviderProxy.getUsageStatus(new UsageStatusRequest(objectIds, List.of("Error")));
     }
 
+    public String getHtmlGraphForSpanPercentiles(String instrumentationLibrary, String spanName) throws AnalyticsServiceException {
+        final SpanHistogramQuery spanHistogramQuery = new SpanHistogramQuery(getCurrentEnvironment(), spanName, instrumentationLibrary, "");
+        return analyticsProviderProxy.getHtmlGraphForSpanPercentiles(spanHistogramQuery);
+    }
+
     @Override
     public void dispose() {
         try {
diff --git a/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/SpanHistogramQuery.kt b/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/SpanHistogramQuery.kt
@@ -0,0 +1,12 @@
+package org.digma.intellij.plugin.model.rest.insights
+
+import com.fasterxml.jackson.annotation.JsonCreator
+
+data class SpanHistogramQuery
+@JsonCreator
+constructor(
+    val environment: String,
+    val spanName: String,
+    val instrumentationLibrary: String,
+    val codeObjectId: String,
+)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -33,6 +33,7 @@ dependencyResolutionManagement {
             version("junit", "5.8.2")
             version("kotlin-stdlib", "1.6.20")
             library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin-stdlib")
+            library("guava", "com.google.guava", "guava").version("31.1-jre")
             version("retrofit", "2.9.0")
             library("retrofit-client", "com.squareup.retrofit2", "retrofit").versionRef("retrofit")
             library("retrofit-jackson","com.squareup.retrofit2","converter-jackson").versionRef("retrofit")
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/SpanPanels.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/SpanPanels.kt
@@ -1,15 +1,19 @@
 package org.digma.intellij.plugin.ui.list.insights
 
+import com.intellij.openapi.fileEditor.impl.HTMLEditorProvider
 import com.intellij.openapi.project.Project
+import com.intellij.ui.components.ActionLink
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.JBPanel
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.util.containers.isNullOrEmpty
 import com.intellij.util.ui.JBUI.Borders.empty
+import org.digma.intellij.plugin.analytics.AnalyticsService
 import org.digma.intellij.plugin.model.rest.insights.SpanDurationsInsight
 import org.digma.intellij.plugin.model.rest.insights.SpanDurationsPercentile
 import org.digma.intellij.plugin.model.rest.insights.SpanFlow
+import org.digma.intellij.plugin.model.rest.insights.SpanInfo
 import org.digma.intellij.plugin.model.rest.insights.SpanInsight
 import org.digma.intellij.plugin.settings.SettingsState
 import org.digma.intellij.plugin.ui.common.CopyableLabel
@@ -30,6 +34,7 @@ import java.awt.GridLayout
 import java.sql.Timestamp
 import java.util.Locale
 import java.util.concurrent.TimeUnit
+import javax.swing.JButton
 import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.SwingConstants
@@ -125,15 +130,15 @@ fun spanDurationPanel(
                 }
                 val h = ps.height
                 val w = ps.width
-                addCurrentLargestWidthDurationPLabel(panelsLayoutHelper,w)
-                return Dimension(getCurrentLargestWidthDurationPLabel(panelsLayoutHelper,w), h)
+                addCurrentLargestWidthDurationPLabel(panelsLayoutHelper, w)
+                return Dimension(getCurrentLargestWidthDurationPLabel(panelsLayoutHelper, w), h)
             }
         }
         pLabelPanel.layout = BorderLayout()
         pLabelPanel.border = empty()
         pLabelPanel.isOpaque = false
         pLabelPanel.add(pLabel, BorderLayout.WEST)
-        addCurrentLargestWidthDurationPLabel(panelsLayoutHelper,pLabelPanel.preferredSize.width)
+        addCurrentLargestWidthDurationPLabel(panelsLayoutHelper, pLabelPanel.preferredSize.width)
         durationsPanel.add(pLabelPanel, BorderLayout.WEST)
 
 
@@ -162,16 +167,17 @@ fun spanDurationPanel(
             evalPanel.layout = BorderLayout()
             evalPanel.add(evalLabel, BorderLayout.CENTER)
             evalPanel.isOpaque = false
-            addCurrentLargestWidthIconPanel(panelsLayoutHelper,evalPanel.preferredSize.width)
+            addCurrentLargestWidthIconPanel(panelsLayoutHelper, evalPanel.preferredSize.width)
             durationsPanel.add(evalPanel, BorderLayout.EAST)
         }
 
         durationsListPanel.add(durationsPanel)
 
     }
 
+    val buttonToGraph = buildButtonToPercentilesGraph(project, spanDurationsInsight.span)
     val settingsState = SettingsState.getInstance(project)
-    val iconPanel = buildIconPanelWithLinks(settingsState, traceSamples)
+    val iconPanel = buildIconPanelWithLinks(settingsState, traceSamples, buttonToGraph)
 
     val result = JBPanel<JBPanel<*>>()
     result.layout = BorderLayout()
@@ -182,13 +188,19 @@ fun spanDurationPanel(
     return insightItemPanel(result)
 }
 
-fun buildIconPanelWithLinks(settingsState: SettingsState, traceSamples: List<TraceSample>): JBPanel<*> {
+fun buildIconPanelWithLinks(
+    settingsState: SettingsState, traceSamples: List<TraceSample>, buttonToPercentilesGraph: JButton
+): JBPanel<*> {
+
     val jaegerUrl = buildLinkToJaeger(settingsState, traceSamples)
     val iconPanel = panel {
         row {
             icon(Laf.Icons.Insight.HISTOGRAM)
                 .horizontalAlign(HorizontalAlign.CENTER)
         }
+        row {
+            cell(buttonToPercentilesGraph)
+        }
         if (jaegerUrl.isNotBlank()) {
             row {
                 val bl = browserLink("Compare", jaegerUrl)
@@ -200,7 +212,10 @@ fun buildIconPanelWithLinks(settingsState: SettingsState, traceSamples: List<Tra
     return iconPanel
 }
 
-fun buildLinkToJaeger(settingsState: SettingsState, traceSamples: List<TraceSample>, embedLinks: Boolean = false): String {
+fun buildLinkToJaeger(
+    settingsState: SettingsState, traceSamples: List<TraceSample>, embedLinks: Boolean = false
+): String {
+
     val jaegerBaseUrl = settingsState.jaegerUrl?.trim()?.trimEnd('/')
     if (jaegerBaseUrl.isNullOrBlank() || traceSamples.isNullOrEmpty()) {
         return ""
@@ -221,6 +236,17 @@ fun buildLinkToJaeger(settingsState: SettingsState, traceSamples: List<TraceSamp
     return "${jaegerBaseUrl}/trace/${trace1}...${trace2}?cohort=${trace1}&cohort=${trace2}${embedPart}"
 }
 
+fun buildButtonToPercentilesGraph(project: Project, span: SpanInfo): ActionLink {
+    val analyticsService = AnalyticsService.getInstance(project)
+    val button = ActionLink("Histogram")
+    button.addActionListener {
+        val htmlContent = analyticsService.getHtmlGraphForSpanPercentiles(span.instrumentationLibrary, span.name)
+        HTMLEditorProvider.openEditor(project, "Percentiles Graph of Span ${span.name}", htmlContent)
+    }
+
+    return button
+}
+
 fun buildTraceSample(percentile: SpanDurationsPercentile): TraceSample {
     val percentileName = "P${(percentile.percentile * 100).toInt()}"
     var traceId = ""
@@ -261,7 +287,7 @@ private fun getCurrentLargestWidthDurationPLabel(layoutHelper: PanelsLayoutHelpe
     return max(width, currentLargest)
 }
 
-private fun addCurrentLargestWidthDurationPLabel(layoutHelper: PanelsLayoutHelper,width: Int) {
+private fun addCurrentLargestWidthDurationPLabel(layoutHelper: PanelsLayoutHelper, width: Int) {
     //this method should never throw NPE
     val currentLargest: Int =
         (layoutHelper.getObjectAttribute("SpanDurationsDurationPLabel", "largestWidth") ?: 0) as Int

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ dependencies {`
`8`	`8`	`implementation(project(":model"))`
`9`	`9`	`implementation(libs.retrofit.client)`
`10`	`10`	`implementation(libs.retrofit.jackson)`
	`11`	`+ implementation(libs.guava)`
`11`	`12`	`}`
`12`	`13`
`13`	`14`