Fix rider

Author: mustard-mh

components/ide/jetbrains/backend-plugin/build.gradle.kts

@@ -41,6 +41,9 @@ project(":") {
             print("Rider: exclude unnecessary files")
             sourceSets["main"].kotlin.exclude("**/GitpodForceUpdateMavenProjectsActivity.kt")
             sourceSets["main"].kotlin.exclude("**/maven.xml")
+            sourceSets["main"].kotlin.exclude("io/gitpod/jetbrains/remote/common/**")
+        } else {
+            sourceSets["main"].kotlin.exclude("io/gitpod/jetbrains/remote/rider/**")
         }
     }
 

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

@@ -226,7 +226,7 @@ abstract class AbstractGitpodClientProjectSessionTracker(private val project: Pr
     private fun trackEvent(eventName: String, props: Map<String, Any?>) {
         if (session == null) return
         manager.trackEvent(eventName, mapOf(
-                "sessionId" to session.clientId.value
+                "sessionId" to session?.clientId?.value
         ).plus(props))
     }
 }

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

@@ -2,7 +2,7 @@
 // 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
+package io.gitpod.jetbrains.remote.common
 
 import com.jetbrains.ide.model.uiautomation.BeControl
 import com.jetbrains.ide.model.uiautomation.DefiniteProgress

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

@@ -0,0 +1,35 @@
+// Copyright (c) 2025 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.rider
+
+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.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.diagnostics.BackendDiagnosticsService
+import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow
+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/resources-rider/META-INF/plugin.xml

@@ -54,6 +54,8 @@
         <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService"
                             serviceImplementation="io.gitpod.jetbrains.remote.internal.GitpodIgnoredPortsForNotificationServiceImpl"
                             preload="true"/>
+        <gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
+                                           implementation="io.gitpod.jetbrains.remote.rider.GitpodMetricControlProvider"/>
     </extensions>
 
     <actions>

components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml

@@ -57,7 +57,7 @@
                             serviceImplementation="io.gitpod.jetbrains.remote.GitpodPortForwardingServiceImpl"
                             client="controller" preload="true"/>
         <gateway.customization.performance id="gitpodMetricsControl" order="before cpuControl"
-                                           implementation="io.gitpod.jetbrains.remote.GitpodMetricControlProvider"/>
+                                           implementation="io.gitpod.jetbrains.remote.common.GitpodMetricControlProvider"/>
     </extensions>
 
     <actions>