Merge pull request #35 from JaD1ng/mock

同步之前代码

Author: JaD1ng

mock/s3/README.md

@@ -73,18 +73,28 @@
 
 #### 网络架构
 ```
-Docker网络：172.20.0.0/16
-├─ 基础设施层：172.20.0.10-29
+Docker网络：172.20.0.0/16 (支持动态多实例扩容)
+├─ 基础设施层：固定IP (172.20.0.10-29)
 │  ├─ consul: 172.20.0.10
 │  ├─ postgres: 172.20.0.11  
 │  ├─ redis: 172.20.0.12
 │  └─ 监控组件: 172.20.0.20-24
-└─ 业务服务层：172.20.0.30-39
-   ├─ metadata-service: 172.20.0.31
-   ├─ storage-service: 172.20.0.32
-   ├─ queue-service: 172.20.0.33
-   ├─ third-party-service: 172.20.0.34
-   └─ mock-error-service: 172.20.0.35
+└─ 业务服务层：动态分配IP (支持多实例)
+   ├─ metadata-service: 可扩容到多个实例
+   ├─ storage-service: 可扩容到多个实例
+   ├─ queue-service: 可扩容到多个实例
+   ├─ third-party-service: 可扩容到多个实例
+   └─ mock-error-service: 可扩容到多个实例
+
+服务发现：
+• 每个服务实例使用UUID生成唯一ServiceID
+• Consul自动负载均衡到健康实例
+• 端口范围映射支持多实例访问
+
+技术实现：
+• ServiceID格式: {service-name}-{uuid}
+• 支持动态扩缩容: docker-compose up -d --scale service=N
+• 无状态设计: 实例间无依赖，可随意增减
 ```
 
 ---
@@ -111,16 +121,56 @@ Docker网络：172.20.0.0/16
 docker --version && docker-compose --version
 ```
 
-### 第二步：一键启动
-```bash
+### 第二步：启动服务栈
 
-# 启动完整服务栈
+#### 单实例模式
+```bash
+# 启动完整服务栈（每个服务1个实例）
 docker-compose up --build -d
 
 # 等待服务就绪
 docker-compose ps
 ```
 
+#### 多实例模式
+
+**一次性构建**
+```bash
+# 启动多实例服务栈
+docker-compose up --build -d \
+  --scale metadata-service=3 \
+  --scale storage-service=2 \
+  --scale queue-service=2 \
+  --scale third-party-service=2 \
+  --scale mock-error-service=1
+```
+
+**分批构建**
+```bash
+# 第一步：启动基础设施服务
+docker-compose up -d consul postgres redis elasticsearch prometheus grafana kibana otel-collector
+
+# 第二步：分别构建各个服务镜像
+docker-compose build metadata-service
+docker-compose build storage-service  
+docker-compose build queue-service
+docker-compose build third-party-service
+docker-compose build mock-error-service
+
+# 第三步：分批启动业务服务
+docker-compose up -d --scale metadata-service=3 metadata-service
+docker-compose up -d --scale storage-service=2 storage-service
+docker-compose up -d --scale queue-service=2 queue-service
+docker-compose up -d --scale third-party-service=2 third-party-service
+docker-compose up -d --scale mock-error-service=1 mock-error-service
+
+# 验证所有实例运行状态
+docker-compose ps
+
+# 查看Consul服务发现状态
+curl -s "http://localhost:8500/v1/catalog/services" | jq .
+```
+
 ### 第三步：故障注入体验
 ```bash
 # 创建CPU峰值异常 - 持续2分钟

mock/s3/deployments/observability/grafana/dashboards/mock-s3-services-metrics.json

@@ -28,6 +28,20 @@
           "text": "All",
           "value": "$__all"
         }
+      },
+      {
+        "name": "instance",
+        "type": "query",
+        "query": "label_values(system_cpu_usage_percent_percent{service=~\"$service\"}, instance)",
+        "refresh": 1,
+        "includeAll": true,
+        "allValue": ".*",
+        "multi": true,
+        "current": {
+          "selected": true,
+          "text": "All",
+          "value": "$__all"
+        }
       }
     ]
   },
@@ -38,8 +52,8 @@
       "type": "timeseries",
       "targets": [
         {
-          "expr": "system_cpu_usage_percent_percent{service=~\"$service\"}",
-          "legendFormat": "{{service}} CPU",
+          "expr": "system_cpu_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
+          "legendFormat": "{{service}} {{instance}} CPU",
           "refId": "A"
         }
       ],
@@ -74,8 +88,8 @@
       "type": "timeseries",
       "targets": [
         {
-          "expr": "system_memory_usage_percent_percent{service=~\"$service\"}",
-          "legendFormat": "{{service}} Memory",
+          "expr": "system_memory_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
+          "legendFormat": "{{service}} {{instance}} Memory",
           "refId": "A"
         }
       ],
@@ -110,7 +124,7 @@
       "type": "stat",
       "targets": [
         {
-          "expr": "system_cpu_usage_percent_percent{service=~\"$service\"}",
+          "expr": "system_cpu_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "{{service}}",
           "refId": "A"
         }
@@ -158,7 +172,7 @@
       "type": "stat",
       "targets": [
         {
-          "expr": "system_memory_usage_percent_percent{service=~\"$service\"}",
+          "expr": "system_memory_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "{{service}}",
           "refId": "A"
         }
@@ -206,8 +220,8 @@
       "type": "timeseries",
       "targets": [
         {
-          "expr": "system_network_qps_per_second{service=~\"$service\"}",
-          "legendFormat": "{{service}} QPS",
+          "expr": "system_network_qps_per_second{service=~\"$service\",instance=~\"$instance\"}",
+          "legendFormat": "{{service}} {{instance}} QPS",
           "refId": "A"
         }
       ],
@@ -241,7 +255,7 @@
       "type": "stat",
       "targets": [
         {
-          "expr": "system_machine_online_status{service=~\"$service\"}",
+          "expr": "system_machine_online_status{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "{{service}}",
           "refId": "A"
         }
@@ -351,28 +365,28 @@
       "type": "table",
       "targets": [
         {
-          "expr": "system_cpu_usage_percent_percent{service=~\"$service\"}",
+          "expr": "system_cpu_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "",
           "refId": "A",
           "instant": true,
           "format": "table"
         },
         {
-          "expr": "system_memory_usage_percent_percent{service=~\"$service\"}",
+          "expr": "system_memory_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "",
           "refId": "B",
           "instant": true,
           "format": "table"
         },
         {
-          "expr": "system_network_qps_per_second{service=~\"$service\"}",
+          "expr": "system_network_qps_per_second{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "",
           "refId": "C",
           "instant": true,
           "format": "table"
         },
         {
-          "expr": "system_machine_online_status{service=~\"$service\"}",
+          "expr": "system_machine_online_status{service=~\"$service\",instance=~\"$instance\"}",
           "legendFormat": "",
           "refId": "D",
           "instant": true,
@@ -389,14 +403,14 @@
           "options": {
             "excludeByName": {
               "Time": true,
-              "instance": true,
               "job": true,
               "node": true,
               "otel_scope_name": true,
               "__name__": true
             },
             "renameByName": {
               "service": "Service",
+              "instance": "Instance",
               "Value #A": "CPU (%)",
               "Value #B": "Memory (%)",
               "Value #C": "Network QPS",
@@ -494,8 +508,8 @@
       "type": "piechart",
       "targets": [
         {
-          "expr": "topk(5, system_cpu_usage_percent_percent{service=~\"$service\"})",
-          "legendFormat": "{{service}}",
+          "expr": "topk(5, system_cpu_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"})",
+          "legendFormat": "{{service}} {{instance}}",
           "refId": "A"
         }
       ],
@@ -534,8 +548,8 @@
       "type": "heatmap",
       "targets": [
         {
-          "expr": "avg_over_time(system_cpu_usage_percent_percent{service=~\"$service\"}[5m])",
-          "legendFormat": "{{service}}",
+          "expr": "avg_over_time(system_cpu_usage_percent_percent{service=~\"$service\",instance=~\"$instance\"}[5m])",
+          "legendFormat": "{{service}} {{instance}}",
           "refId": "A"
         }
       ],
@@ -560,4 +574,4 @@
   },
   "schemaVersion": 36,
   "version": 1
-}
+}

mock/s3/deployments/observability/prometheus.yml

@@ -33,7 +33,9 @@ scrape_configs:
     relabel_configs:
       - source_labels: [__meta_consul_service]
         target_label: service
+      - source_labels: [__meta_consul_service_id]
+        target_label: service_id
       - source_labels: [__meta_consul_node]
         target_label: node
 
-# 存储配置 - 命令行参数将在docker-compose中配置
+# 存储配置 - 命令行参数将在docker-compose中配置

mock/s3/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 networks:
   mock-s3-network:
     driver: bridge
@@ -244,13 +242,11 @@ services:
       context: .
       dockerfile: services/metadata/Dockerfile
     image: mock-s3/metadata-service:latest
-    container_name: mock-s3-metadata-service
     hostname: metadata-service
     networks:
-      mock-s3-network:
-        ipv4_address: 172.20.0.31
+      - mock-s3-network
     ports:
-      - "8081:8081"
+      - "8081-8090:8081"
     environment:
       - SERVICE_NAME=metadata-service
       - CONSUL_ADDR=consul:8500
@@ -280,13 +276,11 @@ services:
       context: .
       dockerfile: services/storage/Dockerfile
     image: mock-s3/storage-service:latest
-    container_name: mock-s3-storage-service
     hostname: storage-service
     networks:
-      mock-s3-network:
-        ipv4_address: 172.20.0.32
+      - mock-s3-network
     ports:
-      - "8082:8082"
+      - "8082-8092:8082"
     volumes:
       - storage-data:/app/data/storage
     environment:
@@ -311,13 +305,11 @@ services:
       context: .
       dockerfile: services/queue/Dockerfile
     image: mock-s3/queue-service:latest
-    container_name: mock-s3-queue-service
     hostname: queue-service
     networks:
-      mock-s3-network:
-        ipv4_address: 172.20.0.33
+      - mock-s3-network
     ports:
-      - "8083:8083"
+      - "8083-8093:8083"
     environment:
       - SERVICE_NAME=queue-service
       - CONSUL_ADDR=consul:8500
@@ -343,13 +335,11 @@ services:
       context: .
       dockerfile: services/third-party/Dockerfile
     image: mock-s3/third-party-service:latest
-    container_name: mock-s3-third-party-service
     hostname: third-party-service
     networks:
-      mock-s3-network:
-        ipv4_address: 172.20.0.34
+      - mock-s3-network
     ports:
-      - "8084:8084"
+      - "8084-8094:8084"
     environment:
       - SERVICE_NAME=third-party-service
       - CONSUL_ADDR=consul:8500
@@ -372,13 +362,11 @@ services:
       context: .
       dockerfile: services/mock-error/Dockerfile
     image: mock-s3/mock-error-service:latest
-    container_name: mock-s3-mock-error-service
     hostname: mock-error-service
     networks:
-      mock-s3-network:
-        ipv4_address: 172.20.0.35
+      - mock-s3-network
     ports:
-      - "8085:8085"
+      - "8085-8095:8085"
     volumes:
       - mock-error-data:/app/data
     environment:

mock/s3/services/mock-error/internal/handler/mock_error_handler.go

@@ -85,26 +85,28 @@ func (h *MockErrorHandler) deleteMetricAnomaly(c *gin.Context) {
 
 // checkMetricInjection 检查是否应该注入指标异常
 func (h *MockErrorHandler) checkMetricInjection(c *gin.Context) {
-	ctx := c.Request.Context()
+    ctx := c.Request.Context()
 
-	var request struct {
-		Service    string `json:"service" binding:"required"`
-		MetricName string `json:"metric_name" binding:"required"`
-	}
+    var request struct {
+        Service    string `json:"service" binding:"required"`
+        MetricName string `json:"metric_name" binding:"required"`
+        Instance   string `json:"instance"`
+    }
 
 	if err := c.ShouldBindJSON(&request); err != nil {
 		h.logger.Error(ctx, "Failed to bind metric injection check request", observability.Error(err))
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
-	anomaly, shouldInject := h.errorService.ShouldInjectError(ctx, request.Service, request.MetricName)
+    anomaly, shouldInject := h.errorService.ShouldInjectError(ctx, request.Service, request.MetricName, request.Instance)
 
-	response := gin.H{
-		"should_inject": shouldInject,
-		"service":       request.Service,
-		"metric_name":   request.MetricName,
-	}
+    response := gin.H{
+        "should_inject": shouldInject,
+        "service":       request.Service,
+        "metric_name":   request.MetricName,
+        "instance":      request.Instance,
+    }
 
 	if shouldInject {
 		response["anomaly"] = anomaly