feat: use postgres

mail/internal/app/bootstrap.go

@@ -11,22 +11,13 @@ import (
 	"galaxy/mail/internal/config"
 	"galaxy/mail/internal/ports"
 	"galaxy/mail/internal/telemetry"
+	"galaxy/redisconn"
 
-	"github.com/redis/go-redis/extra/redisotel/v9"
 	"github.com/redis/go-redis/v9"
 )
 
 func newRedisClient(cfg config.RedisConfig) *redis.Client {
-	return redis.NewClient(&redis.Options{
-		Addr:         cfg.Addr,
-		Username:     cfg.Username,
-		Password:     cfg.Password,
-		DB:           cfg.DB,
-		TLSConfig:    cfg.TLSConfig(),
-		DialTimeout:  cfg.OperationTimeout,
-		ReadTimeout:  cfg.OperationTimeout,
-		WriteTimeout: cfg.OperationTimeout,
-	})
+	return redisconn.NewMasterClient(cfg.Conn)
 }
 
 func instrumentRedisClient(client *redis.Client, telemetryRuntime *telemetry.Runtime) error {
@@ -37,20 +28,12 @@ func instrumentRedisClient(client *redis.Client, telemetryRuntime *telemetry.Run
 		return nil
 	}
 
-	if err := redisotel.InstrumentTracing(
-		client,
-		redisotel.WithTracerProvider(telemetryRuntime.TracerProvider()),
-		redisotel.WithDBStatement(false),
+	if err := redisconn.Instrument(client,
+		redisconn.WithTracerProvider(telemetryRuntime.TracerProvider()),
+		redisconn.WithMeterProvider(telemetryRuntime.MeterProvider()),
 	); err != nil {
-		return fmt.Errorf("instrument redis client tracing: %w", err)
+		return fmt.Errorf("instrument redis client: %w", err)
 	}
-	if err := redisotel.InstrumentMetrics(
-		client,
-		redisotel.WithMeterProvider(telemetryRuntime.MeterProvider()),
-	); err != nil {
-		return fmt.Errorf("instrument redis client metrics: %w", err)
-	}
-
 	return nil
 }
 
@@ -58,14 +41,9 @@ func pingRedis(ctx context.Context, cfg config.RedisConfig, client *redis.Client
 	if client == nil {
 		return fmt.Errorf("ping redis: nil client")
 	}
-
-	pingCtx, cancel := context.WithTimeout(ctx, cfg.OperationTimeout)
-	defer cancel()
-
-	if err := client.Ping(pingCtx).Err(); err != nil {
+	if err := redisconn.Ping(ctx, client, cfg.Conn.OperationTimeout); err != nil {
 		return fmt.Errorf("ping redis: %w", err)
 	}
-
 	return nil
 }