Merge branch 'ndyakov/feature/CAE-1313-maint-cluster' into ndyakov/CAE-1910-proxy-tests

Author: ndyakov

extra/redisotel/metrics.go

@@ -330,6 +330,9 @@ func milliseconds(d time.Duration) float64 {
 
 func statusAttr(err error) attribute.KeyValue {
 	if err != nil {
+		if  err == redis.Nil {
+			return attribute.String("status", "nil")
+		}
 		return attribute.String("status", "error")
 	}
 	return attribute.String("status", "ok")

internal/maintnotifications/logs/log_messages.go

@@ -293,19 +293,29 @@ func OperationNotTracked(connID uint64, seqID int64) string {
 
 // Connection pool functions
 func RemovingConnectionFromPool(connID uint64, reason error) string {
-	message := fmt.Sprintf("conn[%d] %s due to: %v", connID, RemovingConnectionFromPoolMessage, reason)
-	return appendJSONIfDebug(message, map[string]interface{}{
+	metadata := map[string]interface{}{
 		"connID": connID,
-		"reason": reason.Error(),
-	})
+		"reason": "unknown", // this will be overwritten if reason is not nil
+	}
+	if reason != nil {
+		metadata["reason"] = reason.Error()
+	}
+
+	message := fmt.Sprintf("conn[%d] %s due to: %v", connID, RemovingConnectionFromPoolMessage, reason)
+	return appendJSONIfDebug(message, metadata)
 }
 
 func NoPoolProvidedCannotRemove(connID uint64, reason error) string {
-	message := fmt.Sprintf("conn[%d] %s due to: %v", connID, NoPoolProvidedMessageCannotRemoveMessage, reason)
-	return appendJSONIfDebug(message, map[string]interface{}{
+	metadata := map[string]interface{}{
 		"connID": connID,
-		"reason": reason.Error(),
-	})
+		"reason": "unknown", // this will be overwritten if reason is not nil
+	}
+	if reason != nil {
+		metadata["reason"] = reason.Error()
+	}
+
+	message := fmt.Sprintf("conn[%d] %s due to: %v", connID, NoPoolProvidedMessageCannotRemoveMessage, reason)
+	return appendJSONIfDebug(message, metadata)
 }
 
 // Circuit breaker functions

maintnotifications/e2e/scenario_endpoint_types_test.go

@@ -332,7 +332,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
 			p("Bind action completed for %s: %s %s", endpointTest.name, bindStatus.Status, actionOutputIfFailed(bindStatus))
 
 			// Continue traffic for analysis
-			time.Sleep(30 * time.Second)
+			time.Sleep(60 * time.Second)
 			commandsRunner.Stop()
 
 			// Analyze results for this endpoint type

maintnotifications/e2e/scenario_tls_configs_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/redis/go-redis/v9/maintnotifications"
 )
 
-// TODO ADD TLS CONFIGS
 // TestTLSConfigurationsPushNotifications tests push notifications with different TLS configurations
-func ТestTLSConfigurationsPushNotifications(t *testing.T) {
+func TestTLSConfigurationsPushNotifications(t *testing.T) {
+	t.Skip("Test disabled due to tls environment missing in test environment")
 	if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
 		t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
 	}

maintnotifications/handoff_worker.go

@@ -501,9 +501,9 @@ func (hwm *handoffWorkerManager) closeConnFromRequest(ctx context.Context, reque
 			internal.Logger.Printf(ctx, logs.RemovingConnectionFromPool(conn.GetID(), err))
 		}
 	} else {
-		err := conn.Close() // Close the connection if no pool provided
-		if err != nil {
-			internal.Logger.Printf(ctx, "redis: failed to close connection: %v", err)
+		errClose := conn.Close() // Close the connection if no pool provided
+		if errClose != nil {
+			internal.Logger.Printf(ctx, "redis: failed to close connection: %v", errClose)
 		}
 		if internal.LogLevel.WarnOrAbove() {
 			internal.Logger.Printf(ctx, logs.NoPoolProvidedCannotRemove(conn.GetID(), err))