Merge pull request #2032 from digma-ai/feature/new-environment-api

Feature/new environment api

Author: shalom938

CHANGELOG.md

@@ -1,15 +1,6 @@
 # Changelog
 
-## [2.0.319] - 2024-04-15
-
-- refresh plugins metadata before update Closes #2005 by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2054
-- change-custom-event-to-user-action by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2056
-- update-rider-dependency-to-2024.1 by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2059
-- check response code in docker compose downloader Closes #2066 by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2067
-- small fix digmathon service by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2070
-- Update Digma overload warning link by @kshmidt-digma in https://github.com/digma-ai/digma-intellij-plugin/pull/2064
-
-## 2.0.318 - 2024-04-10
+## [2.0.318] - 2024-04-10
 
 - updated dates by @doppleware in https://github.com/digma-ai/digma-intellij-plugin/pull/2055
 
@@ -26,7 +17,8 @@
 ## 2.0.315 - 2024-04-07
 
 - force update Closes #2015 by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2035
-- Enhance instrumentation flavor for all configuration types by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2045
+- Enhance instrumentation flavor for all configuration types by @shalom938
+  in https://github.com/digma-ai/digma-intellij-plugin/pull/2045
 
 ## 2.0.314 - 2024-04-05
 

analytics-provider/build.gradle.kts

@@ -6,13 +6,32 @@ plugins {
 }
 
 
+abstract class OkhttpAlignmentRule : ComponentMetadataRule {
+    override fun execute(ctx: ComponentMetadataContext) {
+        ctx.details.run {
+            if (id.group.startsWith("com.squareup.okhttp3")) {
+                belongsTo("com.squareup.okhttp3:okhttp-virtual-platform:${id.version}")
+            }
+        }
+    }
+}
+
+
 dependencies {
+
+    //make sure all okhttp dependencies are of the same version.
+    //do not add a dependency to okhttp modules that is higher than what retrofit brings. check with dependencies task.
+    components.all<OkhttpAlignmentRule>()
+
     implementation(project(":model"))
     implementation(libs.retrofit.client)
     implementation(libs.retrofit.jackson)
     implementation(libs.retrofit.scalars)
     implementation(libs.jackson.datetime)
     implementation(libs.guava)
+    implementation(libs.okhttp.logging) {
+        isTransitive = false
+    }
 }
 
 

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

@@ -7,12 +7,13 @@
 import org.digma.intellij.plugin.model.rest.common.SpanHistogramQuery;
 import org.digma.intellij.plugin.model.rest.debugger.DebuggerEventRequest;
 import org.digma.intellij.plugin.model.rest.env.*;
+import org.digma.intellij.plugin.model.rest.environment.Env;
 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.event.*;
-import org.digma.intellij.plugin.model.rest.highlights.HighlightsPerformanceResponse;
 import org.digma.intellij.plugin.model.rest.insights.*;
 import org.digma.intellij.plugin.model.rest.livedata.*;
+import org.digma.intellij.plugin.model.rest.login.*;
 import org.digma.intellij.plugin.model.rest.lowlevel.*;
 import org.digma.intellij.plugin.model.rest.navigation.*;
 import org.digma.intellij.plugin.model.rest.notifications.*;
@@ -26,11 +27,15 @@
 
 public interface AnalyticsProvider extends Closeable {
 
-    List<String> getEnvironments();
+    LoginResponse login(LoginRequest loginRequest);
+
+    LoginResponse refreshToken(RefreshRequest loginRequest);
+
+    List<Env> getEnvironments();
 
     void sendDebuggerEvent(DebuggerEventRequest debuggerEventRequest);
 
-    List<InsightInfo> getInsightsInfo(InsightsRequest insightsRequest);
+    List<InsightTypesForJaegerResponse> getInsightsForJaeger(InsightTypesForJaegerRequest request);
 
     String getInsightBySpan(String environment, String spanCodeObjectId, String insightType);
 
@@ -100,6 +105,12 @@ public interface AnalyticsProvider extends Closeable {
 
     AssetNavigationResponse getAssetNavigation(String env, String spanCodeObjectId);
 
+    String createEnvironments(Map<String, Object> request);
+
+    String register(Map<String, Object> request);
+
+    void deleteEnvironmentV2(String id);
+
     void markInsightsAsRead(List<String> insightIds);
     void markAllInsightsAsRead(String environment, MarkInsightsAsReadScope scope);
 
@@ -111,7 +122,7 @@ public interface AnalyticsProvider extends Closeable {
 
     HttpResponse lowLevelCall(HttpRequest request);
 
-    List<HighlightsPerformanceResponse> getHighlightsPerformance(Map<String, Object> queryParams);
+    String getHighlightsPerformance(Map<String, Object> queryParams);
 
     String getHighlightsTopInsights(Map<String, Object> queryParams);
 }

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

@@ -28,4 +28,8 @@ public String getMessage() {
         }
         return super.getMessage();
     }
+
+    public String getDetailedMessage() {
+        return super.getMessage();
+    }
 }

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

@@ -0,0 +1,16 @@
+package org.digma.intellij.plugin.analytics;
+
+public class AuthenticationException extends AnalyticsProviderException {
+
+    public AuthenticationException(int code, String message) {
+        super(code, message);
+    }
+
+    public AuthenticationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public AuthenticationException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -0,0 +1,14 @@
+package org.digma.intellij.plugin.analytics;
+
+import javax.annotation.CheckForNull;
+
+public interface AuthenticationProvider {
+
+    @CheckForNull
+    String getHeaderName();
+
+    @CheckForNull
+    String getHeaderValue();
+
+
+}

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

@@ -0,0 +1,6 @@
+package org.digma.intellij.plugin.analytics;
+
+public class HTTPConstants {
+
+    public static final int UNAUTHORIZED = 401;
+}