Feature/link to Jaeger (compare traces) (#107)

arik-dig · web-flow · commit dd993cf88ec1 · 2022-08-01T11:33:38.000+03:00
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/settings/ProjectSettings.java b/ide-common/src/main/java/org/digma/intellij/plugin/settings/ProjectSettings.java
@@ -41,7 +41,7 @@ public JComponent getPreferredFocusedComponent() {
     @Override
     public boolean isModified() {
         SettingsState settings = SettingsState.getInstance(project);
-        return isUrlChanged(settings) || isApiTokenChanged(settings) || isRefreshDelayChanged(settings);
+        return isUrlChanged(settings) || isApiTokenChanged(settings) || isRefreshDelayChanged(settings) || isJaegerUrlChanged(settings);
     }
 
     private boolean isRefreshDelayChanged(SettingsState settings) {
@@ -56,6 +56,10 @@ private boolean isApiTokenChanged(SettingsState settings){
         return !Objects.equals(settings.apiToken,mySettingsComponent.getApiToken());
     }
 
+    private boolean isJaegerUrlChanged(SettingsState settings) {
+        return !Objects.equals(settings.jaegerUrl, mySettingsComponent.getJaegerUrl());
+    }
+
     @Override
     public void apply() throws ConfigurationException {
         SettingsState settings = SettingsState.getInstance(project);
@@ -79,6 +83,7 @@ public void apply() throws ConfigurationException {
         settings.apiUrl = mySettingsComponent.getApiUrlText();
         settings.apiToken = theApiToken;
         settings.refreshDelay = Integer.parseInt(mySettingsComponent.getRefreshDelayText());
+        settings.jaegerUrl = mySettingsComponent.getJaegerUrl();
         settings.fireChanged();
     }
 
@@ -88,6 +93,7 @@ public void reset() {
         mySettingsComponent.setApiUrlText(settings.apiUrl);
         mySettingsComponent.setApiToken(settings.apiToken);
         mySettingsComponent.setRefreshDelayText(String.valueOf(settings.refreshDelay));
+        mySettingsComponent.setJaegerUrl(settings.jaegerUrl);
     }
 
     @Override
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsComponent.java b/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsComponent.java
@@ -1,5 +1,3 @@
-// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
 package org.digma.intellij.plugin.settings;
 
 import com.intellij.openapi.project.Project;
@@ -19,10 +17,11 @@
  */
 public class SettingsComponent {
 
-  private JPanel myMainPanel;
+  private final JPanel myMainPanel;
   private final JBTextField myApiUrlText = new JBTextField();
   private final JBTextField myApiToken = new JBTextField();
   private final JBTextField myRefreshDelay = new JBTextField();
+  private final JBTextField myJaegerUrlText = new JBTextField();
 
   public SettingsComponent(Project project) {
 
@@ -32,7 +31,7 @@ public SettingsComponent(Project project) {
       @Override
       public boolean verify(JComponent input) {
         try {
-          new URL(myApiUrlText.getText());
+          new URL(myApiUrlText.getText().trim());
           myUrlLabel.setForeground(myUrlLabelForeground);
           return true;
         } catch (MalformedURLException e) {
@@ -48,7 +47,7 @@ public boolean verify(JComponent input) {
       @Override
       public boolean verify(JComponent input) {
         try {
-          Integer.parseInt(myRefreshDelay.getText());
+          Integer.parseInt(myRefreshDelay.getText().trim());
           myRefreshLabel.setForeground(myRefreshLabelForeground);
           return true;
         } catch (NumberFormatException e) {
@@ -58,6 +57,25 @@ public boolean verify(JComponent input) {
       }
     });
 
+    var myJaegerUrlLabel = new JBLabel("Jaeger URL: ");
+    var myJaegerUrlForeground = myUrlLabel.getForeground();
+    myJaegerUrlText.setInputVerifier(new InputVerifier() {
+      @Override
+      public boolean verify(JComponent input) {
+        if (myJaegerUrlText.getText().isBlank()) {
+          myJaegerUrlLabel.setForeground(myJaegerUrlForeground);
+          return true;
+        }
+        try {
+          new URL(myJaegerUrlText.getText().trim());
+          myJaegerUrlLabel.setForeground(myJaegerUrlForeground);
+          return true;
+        } catch (MalformedURLException e) {
+          myJaegerUrlLabel.setForeground(JBColor.RED);
+          return false;
+        }
+      }
+    });
 
 
     var resetButton = new JButton("Reset to defaults");
@@ -67,6 +85,7 @@ public boolean verify(JComponent input) {
             .addLabeledComponent(myUrlLabel, myApiUrlText, 1, false)
             .addLabeledComponent(new JBLabel("Api token:"), myApiToken, 1, false)
             .addLabeledComponent(myRefreshLabel, myRefreshDelay, 1, false)
+            .addLabeledComponent(myJaegerUrlLabel, myJaegerUrlText, 1, false)
             .addComponent(resetButton)
             .addComponentFillVertically(new JPanel(), 0)
             .getPanel();
@@ -82,34 +101,47 @@ public JComponent getPreferredFocusedComponent() {
 
   @NotNull
   public String getApiUrlText() {
-    return myApiUrlText.getText();
+    return myApiUrlText.getText().trim();
   }
 
   public void setApiUrlText(@NotNull String newText) {
-    myApiUrlText.setText(newText);
+    myApiUrlText.setText(newText.trim());
   }
 
   @Nullable
   public String getApiToken() {
-    return myApiToken.getText();
+    return myApiToken.getText().trim();
   }
 
   public void setApiToken(@Nullable String newText) {
-    myApiToken.setText(newText);
+    if (newText == null) {
+      myApiToken.setText("");
+    } else {
+      myApiToken.setText(newText.trim());
+    }
+  }
+
+  public String getJaegerUrl() {
+    return myJaegerUrlText.getText().trim();
+  }
+
+  public void setJaegerUrl(String newText) {
+    myJaegerUrlText.setText(newText.trim());
   }
 
   @NotNull
   public String getRefreshDelayText() {
-    return myRefreshDelay.getText();
+    return myRefreshDelay.getText().trim();
   }
 
   public void setRefreshDelayText(@NotNull String newText) {
-    myRefreshDelay.setText(newText);
+    myRefreshDelay.setText(newText.trim());
   }
 
   private void resetToDefaults(){
     this.setApiUrlText(SettingsState.DEFAULT_API_URL);
     this.setApiToken(null);
     this.setRefreshDelayText(String.valueOf(SettingsState.DEFAULT_REFRESH_DELAY));
+    this.setJaegerUrl(SettingsState.DEFAULT_JAEGER_URL);
   }
 }
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsState.java b/ide-common/src/main/java/org/digma/intellij/plugin/settings/SettingsState.java
@@ -1,5 +1,3 @@
-// Copyright 2000-2022 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
 package org.digma.intellij.plugin.settings;
 
 import com.intellij.openapi.Disposable;
@@ -27,11 +25,13 @@ public class SettingsState implements PersistentStateComponent<SettingsState> ,
 
   public static final String DEFAULT_API_URL = "https://localhost:5051";
   public static final int DEFAULT_REFRESH_DELAY = 30;
+  public static final String DEFAULT_JAEGER_URL = "http://localhost:16686";
   public String apiUrl = DEFAULT_API_URL;
-
   public int refreshDelay = DEFAULT_REFRESH_DELAY;
   @Nullable
   public String apiToken = null;
+  @Nullable
+  public String jaegerUrl = DEFAULT_API_URL;
   private final List<SettingsChangeListener> listeners = new ArrayList<>();
 
   public static SettingsState getInstance(Project project) {
diff --git a/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/SpanDurationsPercentile.kt b/model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/SpanDurationsPercentile.kt
@@ -8,9 +8,12 @@ import java.sql.Timestamp
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class SpanDurationsPercentile
 @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-@ConstructorProperties("percentile", "currentDuration","previousDuration","changeTime","changeVerified")
-constructor(val percentile: Float,
-            val currentDuration: Duration,
-            val previousDuration: Duration?,
-            val changeTime: Timestamp?,
-            val changeVerified: Boolean?)
+@ConstructorProperties("percentile", "currentDuration", "previousDuration", "changeTime", "changeVerified", "traceIds")
+constructor(
+    val percentile: Float,
+    val currentDuration: Duration,
+    val previousDuration: Duration?,
+    val changeTime: Timestamp?,
+    val changeVerified: Boolean?,
+    val traceIds: List<String>,
+)
diff --git a/model/src/main/kotlin/org/digma/intellij/plugin/ui/model/TraceSample.kt b/model/src/main/kotlin/org/digma/intellij/plugin/ui/model/TraceSample.kt
@@ -0,0 +1,8 @@
+package org.digma.intellij.plugin.ui.model
+
+data class TraceSample(val traceName: String, val traceId: String?) {
+
+    fun hasTraceId(): Boolean {
+        return !traceId.isNullOrBlank()
+    }
+}
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/Laf.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/Laf.kt
@@ -91,6 +91,7 @@ object Laf  {
                 @JvmStatic val SLOW = loadAndScaleInsightIcon("/icons/slow.png")
                 @JvmStatic val WAITING_DATA = loadAndScaleInsightIcon("/icons/waiting-data.png")
                 @JvmStatic val HOTSPOT = loadAndScaleInsightIcon("/icons/target.png")
+                @JvmStatic val HISTOGRAM = loadAndScaleInsightIcon("/icons/histogram.png")
                 @JvmStatic val SPAN_DURATION_DROPPED = loadAndScaleIconByWidth("/icons/dropped.png", 8)
                 @JvmStatic val SPAN_DURATION_ROSE = loadAndScaleIconByWidth("/icons/rose.png", 8)
             }
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/InsightsListCellRenderer.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/InsightsListCellRenderer.kt
@@ -4,8 +4,23 @@ import com.intellij.openapi.project.Project
 import com.intellij.ui.dsl.builder.RightGap
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign
-import org.digma.intellij.plugin.model.rest.insights.*
-import org.digma.intellij.plugin.ui.common.*
+import org.digma.intellij.plugin.model.rest.insights.EndpointSchema
+import org.digma.intellij.plugin.model.rest.insights.ErrorInsight
+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.LowUsageInsight
+import org.digma.intellij.plugin.model.rest.insights.NormalUsageInsight
+import org.digma.intellij.plugin.model.rest.insights.SlowEndpointInsight
+import org.digma.intellij.plugin.model.rest.insights.SlowestSpansInsight
+import org.digma.intellij.plugin.model.rest.insights.SpanDurationsInsight
+import org.digma.intellij.plugin.model.rest.insights.SpanInsight
+import org.digma.intellij.plugin.model.rest.insights.UnmappedInsight
+import org.digma.intellij.plugin.ui.common.CopyableLabelHtml
+import org.digma.intellij.plugin.ui.common.Laf
+import org.digma.intellij.plugin.ui.common.asHtml
+import org.digma.intellij.plugin.ui.common.span
+import org.digma.intellij.plugin.ui.common.spanBold
+import org.digma.intellij.plugin.ui.common.spanGrayed
 import org.digma.intellij.plugin.ui.list.AbstractPanelListCellRenderer
 import org.digma.intellij.plugin.ui.list.PanelsLayoutHelper
 import org.digma.intellij.plugin.ui.model.insights.InsightGroupType.HttpEndpoint
@@ -44,7 +59,7 @@ class InsightsListCellRenderer : AbstractPanelListCellRenderer() {
             is SlowestSpansInsight -> slowestSpansPanel(project,
                 value.modelObject as SlowestSpansInsight, value.moreData, panelsLayoutHelper)
             is SpanInsight -> spanPanel(value.modelObject as SpanInsight)
-            is SpanDurationsInsight -> spanDurationPanel(value.modelObject as SpanDurationsInsight,
+            is SpanDurationsInsight -> spanDurationPanel(project, value.modelObject as SpanDurationsInsight,
                 panelsLayoutHelper)
             is UnmappedInsight -> unmappedInsightPanel(value.modelObject as UnmappedInsight,
                 panelsLayoutHelper)
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
diff --git a/src/main/resources/icons/histogram.png b/src/main/resources/icons/histogram.png

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ object Laf {`
`91`	`91`	`@JvmStatic val SLOW = loadAndScaleInsightIcon("/icons/slow.png")`
`92`	`92`	`@JvmStatic val WAITING_DATA = loadAndScaleInsightIcon("/icons/waiting-data.png")`
`93`	`93`	`@JvmStatic val HOTSPOT = loadAndScaleInsightIcon("/icons/target.png")`
	`94`	`+ @JvmStatic val HISTOGRAM = loadAndScaleInsightIcon("/icons/histogram.png")`
`94`	`95`	`@JvmStatic val SPAN_DURATION_DROPPED = loadAndScaleIconByWidth("/icons/dropped.png", 8)`
`95`	`96`	`@JvmStatic val SPAN_DURATION_ROSE = loadAndScaleIconByWidth("/icons/rose.png", 8)`
`96`	`97`	`}`