Fix latest editor build

Author: mustard-mh

components/ide/jetbrains/backend-plugin/gradle.properties

@@ -1,7 +1,7 @@
 pluginVersion=0.0.1
 gitpodVersion=dev
 # Supported environments: stable, latest (via https://github.com/stevesaliman/gradle-properties-plugin)
-environmentName=stable-rider
+environmentName=latest
 # IntelliJ Platform Artifacts Repositories
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 pluginGroup=io.gitpod.jetbrains

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/AbstractGitpodMetricControlProvider.kt

@@ -1,28 +1,31 @@
-// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Copyright (c) 2024 Gitpod GmbH. All rights reserved.
 // Licensed under the GNU Affero General Public License (AGPL).
 // See License.AGPL.txt in the project root for license information.
 
 package io.gitpod.jetbrains.remote
 
 import com.jetbrains.ide.model.uiautomation.BeControl
-import com.jetbrains.ide.model.uiautomation.BeMargin
 import com.jetbrains.ide.model.uiautomation.DefiniteProgress
 import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
 import com.jetbrains.rd.ui.bedsl.dsl.*
-import com.jetbrains.rd.ui.bedsl.dsl.util.BeMarginsBuilder
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.reactive.Property
-import com.jetbrains.rdserver.diagnostics.BackendDiagnosticsService
 import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.MetricControlProvider
 import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressBar
 
+interface IBackendDiagnosticsService {
+    fun getMetric(name: String): com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
+}
+
 abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
     override val id: String = "gitpodMetricsControl"
 
     abstract fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int): BeControl;
 
+    abstract fun getBackendDiagnosticsService(): IBackendDiagnosticsService
+
     override fun getControl(lifetime: Lifetime): BeControl {
-        val backendDiagnosticsService = BackendDiagnosticsService.Companion.getInstance()
+        val backendDiagnosticsService = this.getBackendDiagnosticsService()
         return verticalGrid {
             row {
                 horizontalGrid {
@@ -49,7 +52,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
         }
     }
 
-    private fun createWorkspaceHeaderRow(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
+    private fun createWorkspaceHeaderRow(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
         val labelProperty = Property("")
 
         val workspaceClassMetric = backendDiagnosticsService.getMetric("gitpod_workspace_class")
@@ -78,7 +81,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
         }
     }
 
-    private fun createCpuControl(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
+    private fun createCpuControl(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
         val cpuUsed = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_used")
         val cpuTotal = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_total")
         val cpuPercentage = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_percentage")
@@ -100,7 +103,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
         createProgressControl(ctx, lifetime, label, cpuPercentage, labelProperty, cpuPercentageProperty, progressBar)
     }
 
-    private fun createMemoryControl(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
+    private fun createMemoryControl(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
         val memoryUsed = backendDiagnosticsService.getMetric("gitpod_workspace_memory_used")
         val memoryTotal = backendDiagnosticsService.getMetric("gitpod_workspace_memory_total")
         val memoryPercentage = backendDiagnosticsService.getMetric("gitpod_workspace_memory_percentage")

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodMetricControlProvider.kt

@@ -7,15 +7,27 @@ package io.gitpod.jetbrains.remote.latest
 import com.jetbrains.ide.model.uiautomation.BeControl
 import com.jetbrains.ide.model.uiautomation.DefiniteProgress
 import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
-import com.jetbrains.rd.ui.bedsl.dsl.*
+import com.jetbrains.rd.ui.bedsl.dsl.VerticalGridBuilder
+import com.jetbrains.rd.ui.bedsl.dsl.withMargin
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.reactive.Property
 import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow
+import com.jetbrains.rdserver.unattendedHost.diagnostics.BackendDiagnosticsService
 import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider
+import io.gitpod.jetbrains.remote.IBackendDiagnosticsService
 
 class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
     override fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int) = element.withMargin(left, top, right, bottom)
 
+    override fun getBackendDiagnosticsService(): IBackendDiagnosticsService {
+        val obj = BackendDiagnosticsService.Companion.getInstance()
+        return object : IBackendDiagnosticsService {
+            override fun getMetric(name: String): Metric {
+                return obj.getMetric(name)
+            }
+        }
+    }
+
     override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property<String>, cpuPercentageProperty: Property<String>, progressBar: DefiniteProgress) {
         createProgressRow(ctx, id, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar)
     }

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodMetricControlProvider.kt

@@ -8,12 +8,15 @@ import com.jetbrains.ide.model.uiautomation.BeControl
 import com.jetbrains.ide.model.uiautomation.BeMargin
 import com.jetbrains.ide.model.uiautomation.DefiniteProgress
 import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
-import com.jetbrains.rd.ui.bedsl.dsl.*
+import com.jetbrains.rd.ui.bedsl.dsl.VerticalGridBuilder
 import com.jetbrains.rd.ui.bedsl.dsl.util.BeMarginsBuilder
+import com.jetbrains.rd.ui.bedsl.dsl.withMargin
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rd.util.reactive.Property
 import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow
+import com.jetbrains.rdserver.unattendedHost.diagnostics.BackendDiagnosticsService
 import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider
+import io.gitpod.jetbrains.remote.IBackendDiagnosticsService
 
 class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
     override fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int): BeControl {
@@ -22,6 +25,15 @@ class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
         return element
     }
 
+    override fun getBackendDiagnosticsService(): IBackendDiagnosticsService {
+        val obj = BackendDiagnosticsService.Companion.getInstance()
+        return object : IBackendDiagnosticsService {
+            override fun getMetric(name: String): Metric {
+                return obj.getMetric(name)
+            }
+        }
+    }
+
     override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property<String>, cpuPercentageProperty: Property<String>, progressBar: DefiniteProgress) {
         createProgressRow(ctx, id, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar)
     }