[supervisor] hide JAVA_TOOL_OPTIONS hack behind feature flag (#19630)

components/common-go/experiments/flags.go

@@ -16,6 +16,7 @@ const (
  SupervisorUsePublicAPIFlag = "supervisor_experimental_publicapi"
  ServiceWaiterSkipComponentsFlag = "service_waiter_skip_components"
  IdPClaimKeysFlag = "idp_claim_keys"
+ SetJavaXmxFlag = "supervisor_set_java_xmx"
 )
 
 func IsPersonalAccessTokensEnabled(ctx context.Context, client Client, attributes Attributes) bool {
@@ -41,3 +42,7 @@ func SupervisorPersistServerAPIChannelWhenStart(ctx context.Context, client Clie
 func SupervisorUsePublicAPI(ctx context.Context, client Client, attributes Attributes) bool {
  return client.GetBoolValue(ctx, SupervisorUsePublicAPIFlag, false, attributes)
 }
+
+func IsSetJavaXmx(ctx context.Context, client Client, attributes Attributes) bool {
+ return client.GetBoolValue(ctx, SetJavaXmxFlag, false, attributes)
+}

components/supervisor/pkg/supervisor/supervisor.go

@@ -186,9 +186,23 @@ func Run(options ...RunOption) {
  return
  }
 
+ endpoint, host, err := cfg.GitpodAPIEndpoint()
+ if err != nil {
+ log.WithError(err).Fatal("cannot find Gitpod API endpoint")
+ }
+
+ experimentsClientOpts := []experiments.ClientOpt{}
+ if cfg.ConfigcatEnabled {
+ experimentsClientOpts = append(experimentsClientOpts, experiments.WithGitpodProxy(host))
+ }
+ exps := experiments.NewClient(experimentsClientOpts...)
+
  // BEWARE: we can only call buildChildProcEnv once, because it might download env vars from a one-time-secret
  // URL, which would fail if we tried another time.
- childProcEnvvars = buildChildProcEnv(cfg, nil, opts.RunGP)
+ isSetJavaXmx := experiments.IsSetJavaXmx(context.Background(), exps, experiments.Attributes{
+ UserID: cfg.OwnerId,
+ })
+ childProcEnvvars = buildChildProcEnv(cfg, nil, opts.RunGP, isSetJavaXmx)
 
  err = AddGitpodUserIfNotExists()
  if err != nil {
@@ -246,17 +260,6 @@ func Run(options ...RunOption) {
  internalPorts = append(internalPorts, debugProxyPort)
  }
 
- endpoint, host, err := cfg.GitpodAPIEndpoint()
- if err != nil {
- log.WithError(err).Fatal("cannot find Gitpod API endpoint")
- }
-
- experimentsClientOpts := []experiments.ClientOpt{}
- if cfg.ConfigcatEnabled {
- experimentsClientOpts = append(experimentsClientOpts, experiments.WithGitpodProxy(host))
- }
- exps := experiments.NewClient(experimentsClientOpts...)
-
  var (
  ideReady = &ideReadyState{cond: sync.NewCond(&sync.Mutex{})}
  desktopIdeReady *ideReadyState = nil
@@ -952,7 +955,7 @@ func prepareIDELaunch(cfg *Config, ideConfig *IDEConfig) *exec.Cmd {
 // of envvars. If envvars is nil, os.Environ() is used.
 //
 // Beware: if config contains an OTS URL the results may differ on subsequent calls.
-func buildChildProcEnv(cfg *Config, envvars []string, runGP bool) []string {
+func buildChildProcEnv(cfg *Config, envvars []string, runGP bool, setJavaXmx bool) []string {
  if envvars == nil {
  envvars = os.Environ()
  }
@@ -1029,7 +1032,7 @@ func buildChildProcEnv(cfg *Config, envvars []string, runGP bool) []string {
  envs["USER"] = "gitpod"
 
  // Particular Java optimisation: Java pre v10 did not gauge it's available memory correctly, and needed explicitly setting "-Xmx" for all Hotspot/openJDK VMs
- if mem, ok := envs["GITPOD_MEMORY"]; ok {
+ if mem, ok := envs["GITPOD_MEMORY"]; ok && setJavaXmx {
  envs["JAVA_TOOL_OPTIONS"] += fmt.Sprintf(" -Xmx%sm", mem)
  }
 

components/supervisor/pkg/supervisor/supervisor_test.go

@@ -133,7 +133,7 @@ func TestBuildChildProcEnv(t *testing.T) {
  cfg.EnvvarOTS = srv.URL
  }
 
- act := buildChildProcEnv(cfg, test.Input, false)
+ act := buildChildProcEnv(cfg, test.Input, false, false)
  assert(t, act)
  })
  }