remove debug log

Author: sagor999

components/content-service/pkg/layer/provider.go

@@ -233,8 +233,6 @@ func (s *Provider) GetContentLayerPVC(ctx context.Context, owner, workspaceID st
 	defer tracing.FinishSpan(span, &err)
 	tracing.ApplyOWI(span, log.OWI(owner, workspaceID, ""))
 
-	log.Info("GetContentLayerPVC")
-
 	defer func() {
 		// we never return a nil manifest, just maybe an empty one
 		if manifest == nil {

components/supervisor/pkg/supervisor/supervisor.go

@@ -150,7 +150,6 @@ func (s IDEKind) String() string {
 
 // Run serves as main entrypoint to the supervisor.
 func Run(options ...RunOption) {
-	log.Info("supervisor run")
 	exitCode := 0
 	defer handleExit(&exitCode)
 
@@ -237,11 +236,9 @@ func Run(options ...RunOption) {
 	}
 	tokenService.provider[KindGit] = []tokenProvider{NewGitTokenProvider(gitpodService, cfg.WorkspaceConfig, notificationService)}
 
-	log.Info("gitpodConfigService")
 	gitpodConfigService := config.NewConfigService(cfg.RepoRoot+"/.gitpod.yml", cstate.ContentReady(), log.Log)
 	go gitpodConfigService.Watch(ctx)
 
-	log.Info("starting ports manager")
 	portMgmt := ports.NewManager(
 		createExposedPortsImpl(cfg, gitpodService),
 		&ports.PollingServedPortsObserver{
@@ -252,7 +249,6 @@ func Run(options ...RunOption) {
 		internalPorts...,
 	)
 
-	log.Info("finished ports manager")
 	if opts.RunGP {
 		cstate.MarkContentReady(csapi.WorkspaceInitFromOther)
 	} else {
@@ -261,8 +257,6 @@ func Run(options ...RunOption) {
 		go analyseConfigChanges(ctx, cfg, analytics, gitpodConfigService, gitpodService)
 	}
 
-	log.Info("termMux")
-
 	termMux := terminal.NewMux()
 	termMuxSrv := terminal.NewMuxTerminalService(termMux)
 	termMuxSrv.DefaultWorkdir = cfg.RepoRoot
@@ -284,8 +278,6 @@ func Run(options ...RunOption) {
 		Gid: gitpodGID,
 	}
 
-	log.Info("taskManager")
-
 	taskManager := newTasksManager(cfg, termMuxSrv, cstate, nil)
 
 	apiServices := []RegisterableService{
@@ -305,14 +297,12 @@ func Run(options ...RunOption) {
 	}
 	apiServices = append(apiServices, additionalServices...)
 
-	log.Info("installDotfiles")
 	if !cfg.isHeadless() {
 		// We need to checkout dotfiles first, because they may be changing the path which affects the IDE.
 		// TODO(cw): provide better feedback if the IDE start fails because of the dotfiles (provide any feedback at all).
 		installDotfiles(ctx, cfg, tokenService, childProcEnvvars)
 	}
 
-	log.Info("ideWG")
 	var ideWG sync.WaitGroup
 	ideWG.Add(1)
 	go startAndWatchIDE(ctx, cfg, &cfg.IDE, childProcEnvvars, &ideWG, cstate, ideReady, WebIDE)
@@ -1312,7 +1302,6 @@ func startSSHServer(ctx context.Context, cfg *Config, wg *sync.WaitGroup, childP
 }
 
 func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst ContentState) {
-	log.Info("starting content init")
 	defer wg.Done()
 	defer log.Info("supervisor: workspace content available")
 
@@ -1338,8 +1327,6 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 		log.Info("Detected content.json in /.workspace folder, assuming PVC feature enabled")
 	}
 
-	log.Infof("waiting for content.json to be available at %s", fn)
-
 	var contentFile *os.File
 
 	contentFile, err = os.Open(fn)
@@ -1354,7 +1341,6 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 		// TODO: rewrite using fsnotify
 		t := time.NewTicker(100 * time.Millisecond)
 		for range t.C {
-			log.Infof("waiting for %s to be available", fnReady)
 			b, err := os.ReadFile(fnReady)
 			if err != nil {
 				if !os.IsNotExist(err) {
@@ -1382,14 +1368,12 @@ func startContentInit(ctx context.Context, cfg *Config, wg *sync.WaitGroup, cst
 
 	defer contentFile.Close()
 
-	log.Info("supervisor: workspace content available")
 	var src csapi.WorkspaceInitSource
 	src, err = executor.Execute(ctx, "/workspace", contentFile, true)
 	if err != nil {
 		return
 	}
 
-	log.Infof("supervisor: remove %s", fn)
 	err = os.Remove(fn)
 	if os.IsNotExist(err) {
 		// file is gone - we're good

components/ws-manager/pkg/manager/imagespec.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/gitpod-io/gitpod/common-go/kubernetes"
 	wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
-	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	"github.com/gitpod-io/gitpod/content-service/pkg/layer"
@@ -48,8 +47,6 @@ func (m *Manager) GetImageSpec(ctx context.Context, req *regapi.GetImageSpecRequ
 	_, fullWorkspaceBackupEnabled := pod.Labels[fullWorkspaceBackupLabel]
 	_, pvcFeatureEnabled := pod.Labels[pvcWorkspaceFeatureLabel]
 
-	log.Infof("GetImageSpec, workspace %s, pvcFeatureEnabled: %v", req.Id, pvcFeatureEnabled)
-
 	if fullWorkspaceBackupEnabled || pvcFeatureEnabled {
 		owner := pod.Labels[wsk8s.OwnerLabel]
 		workspaceID := pod.Labels[wsk8s.MetaIDLabel]

components/ws-manager/pkg/manager/manager.go

@@ -171,12 +171,6 @@ type (
 func (m *Manager) StartWorkspace(ctx context.Context, req *api.StartWorkspaceRequest) (res *api.StartWorkspaceResponse, err error) {
 	startWorkspaceTime := time.Now()
 
-	if req.Spec.IdeImage != nil {
-		log.Infof("Starting workspace %s with supervisor image %s", req.Id, req.Spec.IdeImage.SupervisorRef)
-		req.Spec.IdeImage.SupervisorRef = "eu.gcr.io/gitpod-core-dev/build/supervisor:pavel-pvc-enable.5"
-		log.Infof("Overwrote supervisor image")
-	}
-
 	// We cannot use the passed context because we need to decouple the timeouts
 	// Create a context with a high timeout value to be able to wait for scale-up events in the cluster (slow operation)
 	// Important!!!: this timeout must be lower than https://github.com/gitpod-io/gitpod/blob/main/components/ws-manager-api/typescript/src/promisified-client.ts#L122