grpctest: minor improvements to the test logger implementation

internal/grpctest/grpctest.go

@@ -53,7 +53,7 @@ type Tester struct{}
 
 // Setup updates the tlogger.
 func (Tester) Setup(t *testing.T) {
-	tLogr.Update(t)
+	tLogr.update(t)
 	// TODO: There is one final leak around closing connections without completely
 	//  draining the recvBuffer that has yet to be resolved. All other leaks have been
 	//  completely addressed, and this can be turned back on as soon as this issue is
@@ -75,7 +75,7 @@ func (Tester) Teardown(t *testing.T) {
 	if atomic.LoadUint32(&lcFailed) == 1 {
 		t.Log("Goroutine leak check disabled for future tests")
 	}
-	tLogr.EndTest(t)
+	tLogr.endTest(t)
 }
 
 // Interface defines Tester's methods for use in this package.

internal/grpctest/tlogger.go

@@ -73,15 +73,21 @@
 }
 
 func init() {
-	tLogr = &tLogger{errors: map[*regexp.Regexp]int{}}
-	vLevel := os.Getenv("GRPC_GO_LOG_VERBOSITY_LEVEL")
-	if vl, err := strconv.Atoi(vLevel); err == nil {
-		tLogr.v = vl
+	vLevel := 0 // Default verbosity level
+
+	if vLevelEnv, found := os.LookupEnv("GRPC_GO_LOG_VERBOSITY_LEVEL"); found {
+		// If found, attempt to convert. If conversion is successful, update vLevel.
+		// If conversion fails, log a warning, but vLevel remains its default of 0.
+		if val, err := strconv.Atoi(vLevelEnv); err == nil {
+			vLevel = val
+		} else {
+			// Log the error if the environment variable is not a valid integer.
+			fmt.Printf("Warning: GRPC_GO_LOG_VERBOSITY_LEVEL environment variable '%s' is not a valid integer. "+
+				"Using default verbosity level 0. Error: %v\n", vLevelEnv, err)
+		}
 	}
-}
-
-func getLogger() *tLogger {
-	return tLogr
+	// Initialize tLogr with the determined verbosity level.
+	tLogr = &tLogger{errors: make(map[*regexp.Regexp]int), v: vLevel}
 }
 
 // getCallingPrefix returns the <file:line> at the given depth from the stack.
@@ -99,7 +105,7 @@
 	defer tl.mu.Unlock()
 	prefix, err := getCallingPrefix(callingFrame + depth)
 	if err != nil {
 		tl.t.Error(err)
 		return
 	}
 	args = append([]any{ltype.String() + " " + prefix}, args...)
@@ -112,7 +118,7 @@
 			if tl.expected(fmt.Sprintln(args...)) {
 				tl.t.Log(args...)
 			} else {
 				tl.t.Error(args...)
 			}
 		case fatalLog:
 			panic(fmt.Sprint(args...))
@@ -127,7 +133,7 @@
 			if tl.expected(fmt.Sprintf(format, args...)) {
 				tl.t.Logf(format, args...)
 			} else {
 				tl.t.Errorf(format, args...)
 			}
 		case fatalLog:
 			panic(fmt.Sprintf(format, args...))
@@ -137,9 +143,9 @@
 	}
 }
 
-// Update updates the testing.T that the testing logger logs to. Should be done
+// update updates the testing.T that the testing logger logs to. Should be done
 // before every test. It also initializes the tLogger if it has not already.
-func (tl *tLogger) Update(t *testing.T) {
+func (tl *tLogger) update(t *testing.T) {
 	tl.mu.Lock()
 	defer tl.mu.Unlock()
 	if !tl.initialized {
@@ -162,19 +168,18 @@
 
 // ExpectErrorN declares an error to be expected n times.
 func ExpectErrorN(expr string, n int) {
-	tl := getLogger()
-	tl.mu.Lock()
-	defer tl.mu.Unlock()
+	tLogr.mu.Lock()
+	defer tLogr.mu.Unlock()
 	re, err := regexp.Compile(expr)
 	if err != nil {
-		tl.t.Error(err)
+		tLogr.t.Error(err)
 		return
 	}
-	tl.errors[re] += n
+	tLogr.errors[re] += n
 }
 
-// EndTest checks if expected errors were not encountered.
-func (tl *tLogger) EndTest(t *testing.T) {
+// endTest checks if expected errors were not encountered.
+func (tl *tLogger) endTest(t *testing.T) {
 	tl.mu.Lock()
 	defer tl.mu.Unlock()
 	for re, count := range tl.errors {
@@ -247,16 +252,16 @@
 	tl.log(errorLog, depth, "", args...)
 }
 
 func (tl *tLogger) Fatal(args ...any) {
 	tl.log(fatalLog, 0, "", args...)
 }
 
 func (tl *tLogger) Fatalln(args ...any) {
 	tl.log(fatalLog, 0, "", args...)
 }
 
 func (tl *tLogger) Fatalf(format string, args ...any) {
 	tl.log(fatalLog, 0, format, args...)
 }
 
 func (tl *tLogger) FatalDepth(depth int, args ...any) {