feat: MongoDB yapılandırmasında iyileştirmeler yapıldı; bağlantı kontrolü eklendi ve gereksiz dosyalar kaldırıldı

Author: omerada

.github/workflows/activity-log-service-ci-cd.yml

@@ -36,15 +36,7 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-
-      - name: Check and remove Firestore configuration if exists
-        run: |
-          FIRESTORE_CONFIG_PATH="activity-log-service/src/main/java/com/craftpilot/activitylogservice/config/FirestoreConfig.java"
-          if [ -f "$FIRESTORE_CONFIG_PATH" ]; then
-            echo "Removing FirestoreConfig.java file"
-            rm "$FIRESTORE_CONFIG_PATH"
-          fi
-
+          
       - name: Build commons library (if needed)
         run: |
           if [ -d "craft-pilot-commons" ]; then
@@ -196,7 +188,7 @@ jobs:
             echo "=== MongoDB'nin hazır olduğunu kontrol ediliyor ==="
             mongo_ready=false
             for i in {1..10}; do
-              if docker exec -t activity-log-service curl -s mongodb:27017 > /dev/null 2>&1; then
+              if docker exec -t activity-log-service wget -q --spider --timeout=2 http://mongodb:27017 > /dev/null 2>&1 || docker exec -t activity-log-service nc -z -w2 mongodb 27017 > /dev/null 2>&1; then
                 echo "✓ MongoDB erişilebilir durumdadır"
                 mongo_ready=true
                 break

.github/workflows/analytics-service-ci-cd.yml

@@ -103,6 +103,9 @@ jobs:
               -e MANAGEMENT_HEALTH_VALIDATE_GROUP_MEMBERSHIP=false \
               -e LOGGING_LEVEL_COM_CRAFTPILOT=DEBUG \
               -e LOGGING_LEVEL_COM_GOOGLE_CLOUD=DEBUG \
+              -e MONGODB_URI=${{ secrets.MONGODB_URI }} \
+              -e KAFKA_BOOTSTRAP_SERVERS=kafka:9092 \
+              -e KAFKA_ENABLED=${KAFKA_ENABLED:-false} \
               ${{ secrets.DOCKERHUB_USERNAME }}/analytics-service:latest-arm64
 
             echo "=== Waiting for Container to Start ==="

analytics-service/src/main/java/com/craftpilot/analyticsservice/config/MongoIndexConfig.java

@@ -14,12 +14,17 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 
+import com.mongodb.MongoSocketException;
 import com.mongodb.MongoSocketOpenException;
 import com.mongodb.MongoTimeoutException;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ServerSettings;
 
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 import java.time.Duration;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 @Configuration
 @Slf4j
@@ -44,6 +49,9 @@ public class MongoIndexConfig {
 
     @Value("${mongodb.indexes.creation.startup-fail-fast:false}")
     private boolean startupFailFast;
+    
+    @Value("${spring.data.mongodb.uri}")
+    private String mongoUri;
 
     @Autowired
     public MongoIndexConfig(ReactiveMongoTemplate mongoTemplate) {
@@ -62,9 +70,52 @@ public void initIndexesAfterStartup() {
             return;
         }
 
+        // MongoDB URI'dan host adresini çıkar ve bağlantı kontrolü yap
+        try {
+            String host = extractHostFromUri(mongoUri);
+            if (host != null) {
+                log.info("Testing connection to MongoDB host: {}", host);
+                boolean hostResolvable = isHostResolvable(host);
+                log.info("MongoDB host resolution test: {}", hostResolvable ? "SUCCESS" : "FAILED");
+                if (!hostResolvable) {
+                    log.warn("MongoDB host cannot be resolved. This may cause connection problems.");
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Could not extract or validate MongoDB host: {}", e.getMessage());
+        }
+        
         // Indeks oluşturmayı async olarak başlat
         asyncCreateIndexes(0);
     }
+    
+    private String extractHostFromUri(String uri) {
+        try {
+            // mongodb://username:password@host:port/database
+            if (uri != null && uri.contains("@")) {
+                String hostPart = uri.split("@")[1];
+                if (hostPart.contains("/")) {
+                    hostPart = hostPart.split("/")[0];
+                }
+                if (hostPart.contains(":")) {
+                    return hostPart.split(":")[0];
+                }
+                return hostPart;
+            }
+        } catch (Exception e) {
+            log.warn("Error extracting host from MongoDB URI: {}", e.getMessage());
+        }
+        return null;
+    }
+    
+    private boolean isHostResolvable(String host) {
+        try {
+            InetAddress.getByName(host);
+            return true;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
 
     @Async
     protected void asyncCreateIndexes(int attempt) {
@@ -128,7 +179,7 @@ private boolean testConnection() {
     }
 
     @Retryable(
-        value = {MongoSocketOpenException.class, MongoTimeoutException.class},
+        value = {MongoSocketException.class, MongoTimeoutException.class},
         maxAttempts = 3,
         backoff = @Backoff(delay = 1000, multiplier = 2)
     )
@@ -158,7 +209,7 @@ private void createUsageMetricsIndexes() {
     }
 
     @Retryable(
-        value = {MongoSocketOpenException.class, MongoTimeoutException.class},
+        value = {MongoSocketException.class, MongoTimeoutException.class},
         maxAttempts = 3,
         backoff = @Backoff(delay = 1000, multiplier = 2)
     )
@@ -182,7 +233,7 @@ private void createPerformanceMetricsIndexes() {
     }
 
     @Retryable(
-        value = {MongoSocketOpenException.class, MongoTimeoutException.class},
+        value = {MongoSocketException.class, MongoTimeoutException.class},
         maxAttempts = 3,
         backoff = @Backoff(delay = 1000, multiplier = 2)
     )

analytics-service/src/main/resources/application.properties

@@ -20,7 +20,7 @@ spring:
     fail-fast: false
   data:
     mongodb:
-      uri: ${MONGODB_URI:mongodb://mongodb:27017/analytics}
+      uri: ${MONGODB_URI:mongodb://craftpilot:secure_password@mongodb:27017/analytics?authSource=admin&retryWrites=true&w=majority}
       auto-index-creation: true
       connection-timeout: 30000
       socket-timeout: 60000
@@ -38,6 +38,9 @@ kafka:
   admin:
     fail-fast: false
     auto-create: true
+    bootstrap-timeout: 10000
+    operations-timeout: 10000
+    close-timeout: 5000
 
 # Add MongoDB resilience configuration
 mongodb:

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

@@ -60,7 +60,7 @@ spring:
     web-application-type: reactive
   data:
     mongodb:
-      uri: ${MONGODB_URI:mongodb://craftpilot:secure_password@mongodb:27017/craftpilot?authSource=admin&retryWrites=true&w=majority}
+      uri: ${MONGODB_URI:mongodb://craftpilot:secure_password@mongodb:27017/craftpilot?authSource=admin&retryWrites=true&w=majority&serverSelectionTimeoutMS=5000}
       database: ${MONGODB_DATABASE:craftpilot}
       connection-timeout: 30000
       socket-timeout: 60000