[test] Fix RPC retries & improve logging (#18210)

* [test] Fix RPC retries & improve logging

* Fix panic

Author: WVerlaek

test/pkg/integration/integration.go

@@ -206,32 +206,30 @@ type RpcClient struct {
 
 func (r *RpcClient) Call(serviceMethod string, args any, reply any) error {
 	var err error
-	var new *RpcClient
+	cl := r
 	for i := 0; i < connectFailureMaxTries; i++ {
-		if r != nil {
-			if err = r.client.Call(serviceMethod, args, reply); err != nil {
-				log.Warnf("rpc call %s failed (attempt %d): %v", serviceMethod, i, err)
-				if i == connectFailureMaxTries-1 {
-					return err
-				}
-
-				time.Sleep(10 * time.Second)
-				r.Close()
-				new, _, err = Instrument(r.component, r.agentName, r.namespace, r.kubeconfig, r.kclient, r.opts...)
-				if err != nil {
-					time.Sleep(10 * time.Second)
-					continue
-				}
-				r = new
-			}
-		} else {
-			new, _, err = Instrument(r.component, r.agentName, r.namespace, r.kubeconfig, r.kclient, r.opts...)
+		if cl == nil {
+			cl, _, err = Instrument(r.component, r.agentName, r.namespace, r.kubeconfig, r.kclient, r.opts...)
 			if err != nil {
+				log.Warnf("failed to re-instrument (attempt %d): %v", i, err)
 				time.Sleep(10 * time.Second)
 				continue
 			}
-			r = new
 		}
+
+		err = cl.client.Call(serviceMethod, args, reply)
+		if err == nil {
+			return nil
+		}
+
+		log.Warnf("rpc call %s failed (attempt %d): %v", serviceMethod, i, err)
+		if i == connectFailureMaxTries-1 {
+			return err
+		}
+
+		time.Sleep(10 * time.Second)
+		cl.Close()
+		cl = nil // Try to Instrument again next attempt
 	}
 	return err
 }
@@ -446,7 +444,10 @@ L:
 func shutdownAgent(podExec *PodExec, kubeconfig string, podName string, namespace string, containerName string) error {
 	cmd := []string{"curl", "localhost:8080/shutdown"}
 	_, _, _, err := podExec.ExecCmd(cmd, podName, namespace, containerName)
-	return err
+	if err != nil {
+		return fmt.Errorf("curl failed: %v", err)
+	}
+	return nil
 }
 
 func getFreePort() (int, error) {

test/tests/components/ws-daemon/cpu_burst_test.go

@@ -14,7 +14,6 @@ import (
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
 
-	"github.com/gitpod-io/gitpod/common-go/log"
 	csapi "github.com/gitpod-io/gitpod/content-service/api"
 	daemon "github.com/gitpod-io/gitpod/test/pkg/agent/daemon/api"
 	wsapi "github.com/gitpod-io/gitpod/test/pkg/agent/workspace/api"
@@ -140,7 +139,7 @@ func TestCpuBurst(t *testing.T) {
 			}, &cpuResp)
 
 			if err != nil && err.Error() != "unexpected EOF" {
-				log.WithError(err).Error("could not perform cpu burn")
+				t.Logf("error performing cpu burn: %q", err)
 			}
 		}()