diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index 24cd06ed9cd2d9..8a97b9e7e70fc8 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -7,7 +7,7 @@ defaultArgs: jbMarketplacePublishTrigger: "false" publishToJBMarketplace: true localAppVersion: unknown - codeCommit: 43d126af25499c63c7462d0b7a961dfd797f896e + codeCommit: e2c3ab18a37bed1b4e43609a2c5a771ed4f07dbc codeQuality: stable noVerifyJBPlugin: false intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.2.2.tar.gz" diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile index 7442e9ac96cd81..a8b84ab9932f07 100644 --- a/components/ide/code/leeway.Dockerfile +++ b/components/ide/code/leeway.Dockerfile @@ -71,7 +71,8 @@ RUN yarn --cwd extensions compile \ # Check pkg/blobserve/blobserve.go, `inlineVars` method RUN cp /vscode-web/out/vs/gitpod/browser/workbench/workbench.html /vscode-web/index.html \ && cp /vscode-web/out/vs/gitpod/browser/workbench/callback.html /vscode-web/callback.html \ - && sed -i -e 's#static/##g' /vscode-web/index.html + && sed -i -e 's#static/##g' /vscode-web/index.html \ + && sed -i -e "s/{{VERSION}}/$CODE_QUALITY-$CODE_COMMIT/g" /vscode-web/index.html # cli config: alises to gitpod-code RUN cp /vscode-reh-linux-x64/bin/remote-cli/gitpod-code /vscode-reh-linux-x64/bin/remote-cli/code \ diff --git a/components/supervisor/frontend/src/ide/ide-metrics-service-client.ts b/components/supervisor/frontend/src/ide/ide-metrics-service-client.ts index cae31e2fcc7a05..49edddfd6eade6 100644 --- a/components/supervisor/frontend/src/ide/ide-metrics-service-client.ts +++ b/components/supervisor/frontend/src/ide/ide-metrics-service-client.ts @@ -10,7 +10,8 @@ const commit = require('../../config.json').commit; export enum MetricsName { SupervisorFrontendClientTotal = "gitpod_supervisor_frontend_client_total", - SupervisorFrontendErrorTotal = "gitpod_supervisor_frontend_error_total" + SupervisorFrontendErrorTotal = "gitpod_supervisor_frontend_error_total", + SupervisorFrontendLoadTotal = "gitpod_vscode_web_load_total", } const MetricsUrl = serverUrl.asIDEMetrics().toString(); diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index c2119a76d4683d..c0cb9ee0d604c1 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -3276,6 +3276,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -3882,7 +3896,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -7654,7 +7669,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 18f01f1d792b7f..122fb107a5a28d 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -3194,6 +3194,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -3800,7 +3814,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -7488,7 +7503,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 58f3bd7796e468..171b3780efdc37 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -4001,6 +4001,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4607,7 +4621,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8916,7 +8931,7 @@ spec: metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: 8beda82ff6c689641e3e3d74cfa333942daf49ba5617133a5c6ec21a44408f22 + gitpod.io/checksum_config: 0d75796644892a36da75b624bf044967e89dc5da8a59facaee2aa094372e7e79 hello: world creationTimestamp: null labels: diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index 471bfe353d77bf..c508dd1fd61b19 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -3335,6 +3335,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -3941,7 +3955,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -7929,7 +7944,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index 8d15802a30fd4e..1c47797e333336 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -3165,6 +3165,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -3771,7 +3785,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -7543,7 +7558,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index 38e9c30131bae4..46b78963240da0 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -3504,6 +3504,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4110,7 +4124,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8894,7 +8909,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 0750e78a25a86f..04075de4b018ce 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -3501,6 +3501,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4107,7 +4121,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8209,7 +8224,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 2ca67c2671e1f5..56e65812550898 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -3513,6 +3513,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4119,7 +4133,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8221,7 +8236,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index 9700dd11885c7e..bc6ad12854bacf 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -3834,6 +3834,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4440,7 +4454,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8653,7 +8668,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index b9536c7f34b1aa..b2c23fbb5e1460 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -3504,6 +3504,20 @@ data: } ] }, + { + "name": "gitpod_vscode_web_load_total", + "help": "Total count of attempts to load VS Code Web workbench", + "labels": [ + { + "name": "status", + "allowValues": [ + "loading", + "failed" + ], + "defaultValue": "" + } + ] + }, { "name": "gitpod_supervisor_frontend_client_total", "help": "Total count of supervisor frontend client", @@ -4110,7 +4124,8 @@ data: ], "errorReporting": { "allowComponents": [ - "supervisor-frontend" + "supervisor-frontend", + "vscode-workbench" ] } }, @@ -8212,7 +8227,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 5f647d019f026f04a85e04ad8e695083db2a70f97ee7199143859879d5d40ebe + gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c creationTimestamp: null labels: app: gitpod diff --git a/install/installer/pkg/components/ide-metrics/configmap.go b/install/installer/pkg/components/ide-metrics/configmap.go index 6db5908983d328..ba35c2d9f545c0 100644 --- a/install/installer/pkg/components/ide-metrics/configmap.go +++ b/install/installer/pkg/components/ide-metrics/configmap.go @@ -46,6 +46,16 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { }, }, }, + { + Name: "gitpod_vscode_web_load_total", + Help: "Total count of attempts to load VS Code Web workbench", + Labels: []config.LabelAllowList{ + { + Name: "status", + AllowValues: []string{"loading", "failed"}, + }, + }, + }, { Name: "gitpod_supervisor_frontend_client_total", Help: "Total count of supervisor frontend client", @@ -112,6 +122,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { errorReporting := config.ErrorReportingConfiguration{ AllowComponents: []string{ "supervisor-frontend", + "vscode-workbench", }, }