user-service deploy fix.

Author: omerada

redis-client-lib/src/main/java/com/craftpilot/redis/config/RedisClientAutoConfiguration.java

@@ -57,6 +57,7 @@ public ReactiveStringRedisTemplate reactiveStringRedisTemplate(
     @Bean
     @ConditionalOnMissingBean
     public CircuitBreakerRegistry circuitBreakerRegistry(RedisClientProperties properties) {
+        // Bu konfigürasyon, tüm projeler için merkezi devre kesici konfigürasyonu olacak
         CircuitBreakerConfig circuitBreakerConfig = CircuitBreakerConfig.custom()
                 .slidingWindowType(CircuitBreakerConfig.SlidingWindowType.COUNT_BASED)
                 .slidingWindowSize(10)
@@ -98,6 +99,8 @@ public ReactiveRedisService reactiveRedisService(
             ReactiveStringRedisTemplate redisTemplate,
             CircuitBreakerRegistry circuitBreakerRegistry,
             RedisClientProperties properties) {
+        // "redis" ismindeki devre kesici burada yaratılıyor
+        // Bu isim, tüm mikroservislerde tek bir isim olacak
         return new ReactiveRedisService(
                 redisTemplate, 
                 circuitBreakerRegistry,

redis-client-lib/src/main/java/com/craftpilot/redis/service/ReactiveRedisService.java

@@ -16,15 +16,17 @@ public class ReactiveRedisService {
 
     protected final ReactiveStringRedisTemplate redisTemplate;
     protected final CircuitBreaker circuitBreaker;
-    protected final AtomicBoolean redisHealthy = new AtomicBoolean(true);
     protected final Duration defaultTtl;
+    protected final AtomicBoolean redisHealthy = new AtomicBoolean(true);
+    private static final String CIRCUIT_BREAKER_NAME = "redisCircuitBreaker"; // Sabit bir isim kullanıyoruz
 
     public ReactiveRedisService(
             ReactiveStringRedisTemplate redisTemplate,
             CircuitBreakerRegistry circuitBreakerRegistry,
             Duration defaultTtl) {
         this.redisTemplate = redisTemplate;
-        this.circuitBreaker = circuitBreakerRegistry.circuitBreaker("redis");
+        // Burada sabit bir isim kullanıyoruz ve bu sayede çakışmaları önlüyoruz
+        this.circuitBreaker = circuitBreakerRegistry.circuitBreaker(CIRCUIT_BREAKER_NAME);
         this.defaultTtl = defaultTtl;
 
         // Devre kesici durumu değişim olaylarını dinle

user-service/src/main/java/com/craftpilot/userservice/config/CircuitBreakerConfig.java

@@ -43,10 +43,11 @@ public RateLimiterConfigCustomizer userServiceRateLimiterConfig() {
             );
     }
 
+    // Redis devre kesicisi için özel bir isim kullanalım (userRedis)
     @Bean
-    public CircuitBreakerConfigCustomizer redisCircuitBreakerConfig() {
+    public CircuitBreakerConfigCustomizer userRedisCircuitBreakerConfig() {
         return CircuitBreakerConfigCustomizer
-            .of("redis", builder -> builder
+            .of("userRedis", builder -> builder
                 .slidingWindowSize(10)
                 .slidingWindowType(SlidingWindowType.COUNT_BASED)
                 .waitDurationInOpenState(Duration.ofSeconds(30))

user-service/src/main/java/com/craftpilot/userservice/config/RedisConfig.java

@@ -3,8 +3,6 @@
 import com.craftpilot.redis.RedisClientAutoConfiguration;
 import com.craftpilot.redis.metrics.RedisMetricsService;
 import com.craftpilot.redis.service.ReactiveRedisService;
-import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
-import io.github.resilience4j.common.circuitbreaker.configuration.CircuitBreakerConfigCustomizer;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -13,8 +11,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 
-import java.time.Duration;
-
 /**
  * Redis özelleştirmeleri için konfigürasyon sınıfı.
  * 
@@ -27,24 +23,7 @@
 public class RedisConfig {
 
     /**
-     * Redis için devre kesici (circuit breaker) özelleştirmesi
-     */
-    @Bean
-    public CircuitBreakerConfigCustomizer redisCircuitBreakerCustomizer() {
-        return CircuitBreakerConfigCustomizer
-            .of("redis", builder -> builder
-                .slidingWindowType(CircuitBreakerConfig.SlidingWindowType.COUNT_BASED)
-                .slidingWindowSize(10)
-                .failureRateThreshold(50.0f)
-                .waitDurationInOpenState(Duration.ofSeconds(30))
-                .permittedNumberOfCallsInHalfOpenState(3)
-                .minimumNumberOfCalls(5)
-                .recordExceptions(Exception.class)
-            );
-    }
-    
-    /**
-     * ReactiveRedisService bean'i için primary tanımlaması.
+     * ReactiveRedisService için primary bean tanımı.
      * Bu, ReactiveCacheService ile çakışmaları önler.
      */
     @Bean 
@@ -54,9 +33,9 @@ public ReactiveRedisService primaryRedisService(ReactiveRedisService reactiveRed
     }
 
     /**
-     * RedisMetricsService bean'i için özelleştirilmiş yapılandırma.
-     * Bu, birden fazla ReactiveRedisService tipindeki bean çakışmasını önlemek için
-     * primary olan ReactiveRedisService bean'ini kullanmasını sağlar.
+     * RedisMetricsService için özel bir bean tanımı yapmak yerine
+     * varolan RedisMetricsService bean'ini override ediyoruz ve doğrudan
+     * primary olan ReactiveRedisService bean'ini kullanmasını sağlıyoruz.
      */
     @Bean
     @ConditionalOnBean(MeterRegistry.class)

user-service/src/main/resources/application.yml

@@ -92,15 +92,22 @@ springdoc:
 
 resilience4j:
   circuitbreaker:
+    configs:
+      default:
+        slidingWindowSize: 10
+        failureRateThreshold: 50
+        waitDurationInOpenState: 10s
+        permittedNumberOfCallsInHalfOpenState: 3
     instances:
       userPreferences:
+        baseConfig: default
+      userRedis: # UserService için özel Redis devre kesici
+        baseConfig: default
+      redisCircuitBreaker: # Kütüphane için ortak Redis devre kesici
         slidingWindowSize: 10
         failureRateThreshold: 50
-        waitDurationInOpenState: 5s
+        waitDurationInOpenState: 10s
         permittedNumberOfCallsInHalfOpenState: 3
-        registerHealthIndicator: true
-        allowHealthIndicatorToFail: true
-        automaticTransitionFromOpenToHalfOpenEnabled: true
   retry:
     instances:
       userPreferences:
@@ -133,16 +140,16 @@ craftpilot:
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PASSWORD:13579ada}
     database: 0
-    connect-timeout: 3000
-    timeout: 3000
-    cache-ttl-hours: 1
-    pool-max-active: 16
-    pool-max-idle: 8
-    pool-min-idle: 4
+    connect-timeout: 2000ms
+    timeout: 1000ms
+    cache-ttl-hours: 24
+    pool-max-active: 32
+    pool-max-idle: 16
+    pool-min-idle: 8
     pool-max-wait: 1000ms
     circuit-breaker-enabled: true
     circuit-breaker-failure-rate-threshold: 50.0
-    circuit-breaker-wait-duration-in-open-state: 30s
+    circuit-breaker-wait-duration-in-open-state: 10s
     circuit-breaker-permitted-calls-in-half-open-state: 3
     retry-enabled: true
     max-retry-attempts: 2