Skip to content

Commit 6f7298d

Browse files
mustard-mhroboquat
mustard-mh
and
roboquat
authored
Upgrade platform version of JetBrains Backend Plugin (EAP) (#20236)
* Update Platform Version of JetBrains Backend Plugin (EAP) to * Fix latest editor build * Fixup * revert year changes * fix rider build * 1 --------- Co-authored-by: Robo Quat <[email protected]>
1 parent cfe795c commit 6f7298d

File tree

7 files changed

+51
-17
lines changed

7 files changed

+51
-17
lines changed

‎components/ide/jetbrains/backend-plugin/BUILD.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ packages:
147147
- "build.sh"
148148
env:
149149
- JB_QUALIFIER=stable-rider
150-
- NO_VERIFY_JB_PLUGIN=${noVerifyJBPlugin}
150+
# Force skip plugin verification for Rider
151+
- NO_VERIFY_JB_PLUGIN=true
151152
config:
152153
commands:
153154
- ["mv", "build.gradle-stable.kts", "build.gradle.kts"]

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Code generated by gha-update-image/index-jb-platform-update.ts. DO NOT EDIT.
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
4-
pluginSinceBuild=242.19533
5-
pluginUntilBuild=242.*
4+
# revert pluginSinceBuild if it's unnecessary
5+
pluginSinceBuild=243.15521
6+
pluginUntilBuild=243.*
67
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
78
# See https://jb.gg/intellij-platform-builds-list for available build versions.
8-
pluginVerifierIdeVersions=2024.2
9+
pluginVerifierIdeVersions=2024.3
910
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
10-
platformVersion=242.21829.142
11+
platformVersion=243.15521.24

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pluginVersion=0.0.1
22
gitpodVersion=dev
33
# Supported environments: stable, latest (via https://github.com/stevesaliman/gradle-properties-plugin)
4-
environmentName=stable-rider
4+
environmentName=latest
55
# IntelliJ Platform Artifacts Repositories
66
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
77
pluginGroup=io.gitpod.jetbrains

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,27 @@
55
package io.gitpod.jetbrains.remote
66

77
import com.jetbrains.ide.model.uiautomation.BeControl
8-
import com.jetbrains.ide.model.uiautomation.BeMargin
98
import com.jetbrains.ide.model.uiautomation.DefiniteProgress
109
import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
1110
import com.jetbrains.rd.ui.bedsl.dsl.*
12-
import com.jetbrains.rd.ui.bedsl.dsl.util.BeMarginsBuilder
1311
import com.jetbrains.rd.util.lifetime.Lifetime
1412
import com.jetbrains.rd.util.reactive.Property
15-
import com.jetbrains.rdserver.diagnostics.BackendDiagnosticsService
1613
import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.MetricControlProvider
1714
import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressBar
1815

16+
interface IBackendDiagnosticsService {
17+
fun getMetric(name: String): com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
18+
}
19+
1920
abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
2021
override val id: String = "gitpodMetricsControl"
2122

2223
abstract fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int): BeControl;
2324

25+
abstract fun getBackendDiagnosticsService(): IBackendDiagnosticsService
26+
2427
override fun getControl(lifetime: Lifetime): BeControl {
25-
val backendDiagnosticsService = BackendDiagnosticsService.Companion.getInstance()
28+
val backendDiagnosticsService = this.getBackendDiagnosticsService()
2629
return verticalGrid {
2730
row {
2831
horizontalGrid {
@@ -49,7 +52,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
4952
}
5053
}
5154

52-
private fun createWorkspaceHeaderRow(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
55+
private fun createWorkspaceHeaderRow(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
5356
val labelProperty = Property("")
5457

5558
val workspaceClassMetric = backendDiagnosticsService.getMetric("gitpod_workspace_class")
@@ -78,7 +81,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
7881
}
7982
}
8083

81-
private fun createCpuControl(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
84+
private fun createCpuControl(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
8285
val cpuUsed = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_used")
8386
val cpuTotal = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_total")
8487
val cpuPercentage = backendDiagnosticsService.getMetric("gitpod_workspace_cpu_percentage")
@@ -100,7 +103,7 @@ abstract class AbstractGitpodMetricControlProvider : MetricControlProvider {
100103
createProgressControl(ctx, lifetime, label, cpuPercentage, labelProperty, cpuPercentageProperty, progressBar)
101104
}
102105

103-
private fun createMemoryControl(ctx: VerticalGridBuilder, backendDiagnosticsService: BackendDiagnosticsService, lifetime: Lifetime) {
106+
private fun createMemoryControl(ctx: VerticalGridBuilder, backendDiagnosticsService: IBackendDiagnosticsService, lifetime: Lifetime) {
104107
val memoryUsed = backendDiagnosticsService.getMetric("gitpod_workspace_memory_used")
105108
val memoryTotal = backendDiagnosticsService.getMetric("gitpod_workspace_memory_total")
106109
val memoryPercentage = backendDiagnosticsService.getMetric("gitpod_workspace_memory_percentage")

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import io.netty.channel.ChannelHandlerContext
2727
import io.netty.handler.codec.http.FullHttpRequest
2828
import io.netty.handler.codec.http.QueryStringDecoder
2929
import io.prometheus.client.exporter.common.TextFormat
30-
import kotlinx.coroutines.*
30+
import kotlinx.coroutines.GlobalScope
31+
import kotlinx.coroutines.delay
32+
import kotlinx.coroutines.launch
33+
import kotlinx.coroutines.runBlocking
3134
import org.jetbrains.ide.RestService
3235
import org.jetbrains.io.response
3336
import java.io.OutputStreamWriter
@@ -113,7 +116,9 @@ class GitpodCLIService : RestService() {
113116
GlobalScope.launch {
114117
getClientSessionAndProjectAsync().let { (session, project) ->
115118
ClientId.withClientId(session.clientId) {
116-
action(project)
119+
runBlocking {
120+
action(project)
121+
}
117122
sendOk(request, context)
118123
}
119124
}

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,27 @@ package io.gitpod.jetbrains.remote.latest
77
import com.jetbrains.ide.model.uiautomation.BeControl
88
import com.jetbrains.ide.model.uiautomation.DefiniteProgress
99
import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
10-
import com.jetbrains.rd.ui.bedsl.dsl.*
10+
import com.jetbrains.rd.ui.bedsl.dsl.VerticalGridBuilder
11+
import com.jetbrains.rd.ui.bedsl.dsl.withMargin
1112
import com.jetbrains.rd.util.lifetime.Lifetime
1213
import com.jetbrains.rd.util.reactive.Property
1314
import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow
15+
import com.jetbrains.rdserver.unattendedHost.diagnostics.BackendDiagnosticsService
1416
import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider
17+
import io.gitpod.jetbrains.remote.IBackendDiagnosticsService
1518

1619
class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
1720
override fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int) = element.withMargin(left, top, right, bottom)
1821

22+
override fun getBackendDiagnosticsService(): IBackendDiagnosticsService {
23+
val obj = BackendDiagnosticsService.Companion.getInstance()
24+
return object : IBackendDiagnosticsService {
25+
override fun getMetric(name: String): Metric {
26+
return obj.getMetric(name)
27+
}
28+
}
29+
}
30+
1931
override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property<String>, cpuPercentageProperty: Property<String>, progressBar: DefiniteProgress) {
2032
createProgressRow(ctx, id, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar)
2133
}

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ import com.jetbrains.ide.model.uiautomation.BeControl
88
import com.jetbrains.ide.model.uiautomation.BeMargin
99
import com.jetbrains.ide.model.uiautomation.DefiniteProgress
1010
import com.jetbrains.rd.platform.codeWithMe.unattendedHost.metrics.Metric
11-
import com.jetbrains.rd.ui.bedsl.dsl.*
11+
import com.jetbrains.rd.ui.bedsl.dsl.VerticalGridBuilder
1212
import com.jetbrains.rd.ui.bedsl.dsl.util.BeMarginsBuilder
13+
import com.jetbrains.rd.ui.bedsl.dsl.withMargin
1314
import com.jetbrains.rd.util.lifetime.Lifetime
1415
import com.jetbrains.rd.util.reactive.Property
1516
import com.jetbrains.rdserver.unattendedHost.customization.controlCenter.performance.createProgressRow
17+
import com.jetbrains.rdserver.diagnostics.BackendDiagnosticsService
1618
import io.gitpod.jetbrains.remote.AbstractGitpodMetricControlProvider
19+
import io.gitpod.jetbrains.remote.IBackendDiagnosticsService
1720

1821
class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
1922
override fun setMargin(element: BeControl, left: Int, top: Int, right: Int, bottom: Int): BeControl {
@@ -22,6 +25,15 @@ class GitpodMetricControlProvider: AbstractGitpodMetricControlProvider() {
2225
return element
2326
}
2427

28+
override fun getBackendDiagnosticsService(): IBackendDiagnosticsService {
29+
val obj = BackendDiagnosticsService.Companion.getInstance()
30+
return object : IBackendDiagnosticsService {
31+
override fun getMetric(name: String): Metric {
32+
return obj.getMetric(name)
33+
}
34+
}
35+
}
36+
2537
override fun createProgressControl(ctx: VerticalGridBuilder, lifetime: Lifetime, label: String, cpuPercentage: Metric, labelProperty: Property<String>, cpuPercentageProperty: Property<String>, progressBar: DefiniteProgress) {
2638
createProgressRow(ctx, id, lifetime, label, cpuPercentage.statusProperty, labelProperty, cpuPercentageProperty, progressBar)
2739
}

0 commit comments

Comments
 (0)