refactor(consul): 使用地址+端口生成稳定的服务ID

统一实例ID生成逻辑到utils包，移除对uuid包的依赖
优化服务注销时的地址获取逻辑，支持环境变量覆盖

Author: JaD1ng

mock/s3/shared/middleware/consul/consul.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"github.com/hashicorp/consul/api"
 )
 
@@ -51,10 +50,10 @@ func CreateConsulClient(address string, logger *observability.Logger) (ConsulCli
 
 // RegisterService 注册服务到Consul
 func (c *DefaultConsulClient) RegisterService(ctx context.Context, service *models.ServiceInfo) error {
-	// 使用UUID确保每个服务实例有唯一的ServiceID
-	serviceUUID := uuid.New().String()
+	// 使用地址+端口确保每个服务实例有唯一且稳定的ServiceID
+	serviceID := fmt.Sprintf("%s-%s-%d", service.Name, service.Address, service.Port)
 	registration := &api.AgentServiceRegistration{
-		ID:      fmt.Sprintf("%s-%s", service.Name, serviceUUID),
+		ID:      serviceID,
 		Name:    service.Name,
 		Address: service.Address,
 		Port:    service.Port,

mock/s3/shared/middleware/error_injection/error_injection.go

@@ -8,7 +8,6 @@ import (
     "mocks3/shared/observability"
     "mocks3/shared/utils"
     "net/http"
-    "os"
     "strconv"
     "sync"
     "time"
@@ -127,12 +126,7 @@ func NewMetricInjectorWithDefaults(mockErrorServiceURL string, serviceName strin
 // InjectMetricAnomaly 检查并注入指标异常
 func (mi *MetricInjector) InjectMetricAnomaly(ctx context.Context, metricName string, originalValue float64) float64 {
     // 计算实例标识，用于实例级注入与缓存
-    instanceID := os.Getenv("INSTANCE_ID")
-    if instanceID == "" {
-        if h, err := os.Hostname(); err == nil && h != "" {
-            instanceID = h
-        }
-    }
+    instanceID := utils.GetInstanceID(mi.serviceName)
 
     // 检查缓存（加入实例维度）
     cacheKey := mi.serviceName + ":" + instanceID + ":" + metricName

mock/s3/shared/observability/providers.go

@@ -4,7 +4,7 @@ import (
     "context"
     "fmt"
     "mocks3/shared/observability/config"
-    "os"
+    "mocks3/shared/utils"
 
     "go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp"
@@ -183,15 +183,8 @@ func (p *Providers) Shutdown(ctx context.Context) error {
 
 // createResource 创建OTEL资源
 func createResource(config *config.ObservabilityConfig) (*resource.Resource, error) {
-    // Derive a stable service instance id
-    instanceID := os.Getenv("INSTANCE_ID")
-    if instanceID == "" {
-        if h, err := os.Hostname(); err == nil && h != "" {
-            instanceID = h
-        } else {
-            instanceID = "unknown-instance"
-        }
-    }
+    // 使用统一的实例ID生成器
+    instanceID := utils.GetInstanceID(config.ServiceName)
     return resource.New(context.Background(),
         resource.WithAttributes(
             semconv.ServiceName(config.ServiceName),

mock/s3/shared/server/service_bootstrap.go

@@ -431,13 +431,17 @@ func (sb *ServiceBootstrap) deregisterFromConsul() {
 	// 生成服务ID (与注册时保持一致)
 	var registerAddress string
 	if sb.Config.GetHost() == "0.0.0.0" {
-		// 如果绑定地址是0.0.0.0，使用hostname进行注销
-		hostname, err := os.Hostname()
-		if err != nil {
-			sb.Logger.Error(ctx, "Failed to get hostname for Consul deregistration", observability.Error(err))
-			return
+		// 允许通过环境变量覆盖对外公布地址
+		if envAddr := os.Getenv("ADVERTISE_ADDR"); envAddr != "" {
+			registerAddress = envAddr
+		} else {
+			ip, err := detectAdvertiseAddr()
+			if err != nil {
+				sb.Logger.Error(ctx, "Failed to detect advertise address for Consul deregistration", observability.Error(err))
+				return
+			}
+			registerAddress = ip
 		}
-		registerAddress = hostname
 	} else {
 		registerAddress = sb.Config.GetHost()
 	}

mock/s3/shared/utils/instance.go

@@ -0,0 +1,109 @@
+package utils
+
+import (
+	"crypto/rand"
+	"fmt"
+	"os"
+	"strings"
+	"sync"
+)
+
+var (
+	cachedInstanceID string
+	instanceIDMutex  sync.RWMutex
+)
+
+// GetInstanceID 获取实例ID，优先级：
+// 1. 环境变量 INSTANCE_ID
+// 2. 自动生成：{service_name}-{short_uuid}
+// 3. 后备方案：hostname
+func GetInstanceID(serviceName string) string {
+	instanceIDMutex.RLock()
+	if cachedInstanceID != "" {
+		instanceIDMutex.RUnlock()
+		return cachedInstanceID
+	}
+	instanceIDMutex.RUnlock()
+
+	instanceIDMutex.Lock()
+	defer instanceIDMutex.Unlock()
+
+	// 双重检查，避免重复计算
+	if cachedInstanceID != "" {
+		return cachedInstanceID
+	}
+
+	// 1. 优先使用环境变量
+	if instanceID := os.Getenv("INSTANCE_ID"); instanceID != "" {
+		cachedInstanceID = instanceID
+		return cachedInstanceID
+	}
+
+	// 2. 自动生成基于服务名的实例ID
+	if serviceName != "" {
+		if generatedID := generateInstanceID(serviceName); generatedID != "" {
+			cachedInstanceID = generatedID
+			return cachedInstanceID
+		}
+	}
+
+	// 3. 后备方案：使用hostname
+	if hostname, err := os.Hostname(); err == nil && hostname != "" {
+		cachedInstanceID = hostname
+		return cachedInstanceID
+	}
+
+	// 4. 最后的后备方案
+	cachedInstanceID = "unknown-instance"
+	return cachedInstanceID
+}
+
+// generateInstanceID 生成格式为 {service_name}-{short_uuid} 的实例ID
+func generateInstanceID(serviceName string) string {
+	// 清理服务名：移除常见后缀，转换为小写
+	cleanServiceName := cleanServiceName(serviceName)
+	
+	// 生成8位短UUID
+	shortUUID := generateShortUUID()
+	if shortUUID == "" {
+		return ""
+	}
+
+	return fmt.Sprintf("%s-%s", cleanServiceName, shortUUID)
+}
+
+// cleanServiceName 清理服务名
+func cleanServiceName(serviceName string) string {
+	name := strings.ToLower(serviceName)
+	
+	// 移除常见后缀
+	suffixes := []string{"-service", "_service", "service"}
+	for _, suffix := range suffixes {
+		if strings.HasSuffix(name, suffix) {
+			name = strings.TrimSuffix(name, suffix)
+			break
+		}
+	}
+	
+	// 替换特殊字符为连字符
+	name = strings.ReplaceAll(name, "_", "-")
+	name = strings.ReplaceAll(name, " ", "-")
+	
+	return name
+}
+
+// generateShortUUID 生成8位短UUID
+func generateShortUUID() string {
+	bytes := make([]byte, 4) // 4字节 = 8位十六进制字符
+	if _, err := rand.Read(bytes); err != nil {
+		return ""
+	}
+	return fmt.Sprintf("%x", bytes)
+}
+
+// ResetInstanceID 重置缓存的实例ID（主要用于测试）
+func ResetInstanceID() {
+	instanceIDMutex.Lock()
+	defer instanceIDMutex.Unlock()
+	cachedInstanceID = ""
+}