55import com .intellij .openapi .project .Project ;
66import com .intellij .ui .JBColor ;
77import org .apache .commons .lang3 .time .StopWatch ;
8- import org .apache .maven .artifact .versioning .ComparableVersion ;
98import org .digma .intellij .plugin .auth .AuthManager ;
109import org .digma .intellij .plugin .common .*;
1110import org .digma .intellij .plugin .errorreporting .ErrorReporter ;
4241import java .util .concurrent .TimeUnit ;
4342import java .util .function .*;
4443
44+ import static org .digma .intellij .plugin .analytics .BackendUtilsKt .backendVersionOlderThen ;
4545import static org .digma .intellij .plugin .analytics .EnvUtilsKt .getAllEnvironmentsIds ;
4646import static org .digma .intellij .plugin .analytics .EnvironmentRefreshSchedulerKt .scheduleEnvironmentRefresh ;
4747import static org .digma .intellij .plugin .common .JsonUtilsKt .objectToJsonNoException ;
4848import static org .digma .intellij .plugin .common .StringUtilsKt .argsToString ;
4949import static org .digma .intellij .plugin .log .Log .API_LOGGER_NAME ;
50- import static org .digma .intellij .plugin .model .rest .AboutResultKt .UNKNOWN_APPLICATION_VERSION ;
5150
5251
5352public class AnalyticsService implements Disposable {
@@ -566,7 +565,7 @@ public HttpResponse proxyCall(HttpRequest request) throws AnalyticsServiceExcept
566565 @ Nullable
567566 public SpanInfoByUid resolveSpanByUid (@ NotNull String uid ) throws AnalyticsServiceException {
568567
569- if (backendVersionOlderThen ("0.3.155" )) {
568+ if (backendVersionOlderThen (project , "0.3.155" )) {
570569 return null ;
571570 }
572571
@@ -576,29 +575,14 @@ public SpanInfoByUid resolveSpanByUid(@NotNull String uid) throws AnalyticsServi
576575
577576 @ Nullable
578577 public EnvironmentInfoByErrorId resolveEnvironmentByErrorId (@ NotNull String errorId ) throws AnalyticsServiceException {
579- if (backendVersionOlderThen ("0.3.318 " )) {
578+ if (backendVersionOlderThen (project , "0.3.155 " )) {
580579 return null ;
581580 }
582581
583582 return executeCatching (() -> analyticsProviderProxy .resolveEnvironmentByErrorId (errorId ));
584583 }
585584
586585
587- private boolean backendVersionOlderThen (String version ) {
588- String backendVersion = BackendInfoHolder .getInstance (project ).getAbout ().getApplicationVersion ();
589-
590- //dev environment may return unknown
591- if (UNKNOWN_APPLICATION_VERSION .equalsIgnoreCase (backendVersion )) {
592- return false ;
593- }
594-
595- ComparableVersion currentBackendVersion = new ComparableVersion (backendVersion );
596- ComparableVersion requiredBackendVersion = new ComparableVersion (version );
597-
598- return currentBackendVersion .compareTo (requiredBackendVersion ) < 0 ;
599- }
600-
601-
602586 @ Override
603587 public void dispose () {
604588 try {
0 commit comments