From 909f3a4a24679568b26c93b7c52dfd8da4558c18 Mon Sep 17 00:00:00 2001
From: icey-yu <1186114839@qq.com>
Date: Fri, 26 Sep 2025 15:27:46 +0800
Subject: [PATCH] fix: prometheus

---
 internal/api/init.go                 | 2 +-
 internal/api/prometheus_discovery.go | 2 +-
 internal/msgtransfer/init.go         | 2 +-
 pkg/common/prommetrics/discovery.go  | 6 +++++-
 pkg/common/startrpc/start.go         | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/internal/api/init.go b/internal/api/init.go
index fe8ac1cd0..e07069886 100644
--- a/internal/api/init.go
+++ b/internal/api/init.go
@@ -96,7 +96,7 @@ func Start(ctx context.Context, index int, cfg *Config) error {
 
 			etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 
-			_, err = etcdClient.Put(ctx, prommetrics.BuildDiscoveryKey(prommetrics.APIKeyName), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
+			_, err = etcdClient.Put(ctx, prommetrics.BuildDiscoveryKey(prommetrics.APIKeyName, index), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
 			if err != nil {
 				return errs.WrapMsg(err, "etcd put err")
 			}
diff --git a/internal/api/prometheus_discovery.go b/internal/api/prometheus_discovery.go
index 6f17953ae..26735c41c 100644
--- a/internal/api/prometheus_discovery.go
+++ b/internal/api/prometheus_discovery.go
@@ -38,7 +38,7 @@ func (p *PrometheusDiscoveryApi) Enable(c *gin.Context) {
 }
 
 func (p *PrometheusDiscoveryApi) discovery(c *gin.Context, key string) {
-	eResp, err := p.client.Get(c, prommetrics.BuildDiscoveryKey(key))
+	eResp, err := p.client.Get(c, prommetrics.BuildDiscoveryKeyPrefix(key), clientv3.WithPrefix())
 	if err != nil {
 		// Log and respond with an error if preparation fails.
 		apiresp.GinError(c, errs.WrapMsg(err, "etcd get err"))
diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go
index 1ac97eeb1..b600b5682 100644
--- a/internal/msgtransfer/init.go
+++ b/internal/msgtransfer/init.go
@@ -178,7 +178,7 @@ func (m *MsgTransfer) Start(index int, cfg *Config) error {
 
 			etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 
-			_, err = etcdClient.Put(context.TODO(), prommetrics.BuildDiscoveryKey(prommetrics.MessageTransferKeyName), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
+			_, err = etcdClient.Put(context.TODO(), prommetrics.BuildDiscoveryKey(prommetrics.MessageTransferKeyName, index), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
 			if err != nil {
 				return errs.WrapMsg(err, "etcd put err")
 			}
diff --git a/pkg/common/prommetrics/discovery.go b/pkg/common/prommetrics/discovery.go
index 8f03bc2ae..a3cb54225 100644
--- a/pkg/common/prommetrics/discovery.go
+++ b/pkg/common/prommetrics/discovery.go
@@ -17,10 +17,14 @@ type RespTarget struct {
 	Labels  map[string]string `json:"labels"`
 }
 
-func BuildDiscoveryKey(name string) string {
+func BuildDiscoveryKeyPrefix(name string) string {
 	return fmt.Sprintf("%s/%s/%s", "openim", "prometheus_discovery", name)
 }
 
+func BuildDiscoveryKey(name string, index int) string {
+	return fmt.Sprintf("%s/%s/%s/%d", "openim", "prometheus_discovery", name, index)
+}
+
 func BuildDefaultTarget(host string, ip int) Target {
 	return Target{
 		Target: fmt.Sprintf("%s:%d", host, ip),
diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go
index c82ba0326..525c7cb23 100644
--- a/pkg/common/startrpc/start.go
+++ b/pkg/common/startrpc/start.go
@@ -166,7 +166,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
 
 			etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient()
 
-			_, err = etcdClient.Put(ctx, prommetrics.BuildDiscoveryKey(rpcRegisterName), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
+			_, err = etcdClient.Put(ctx, prommetrics.BuildDiscoveryKey(rpcRegisterName, index), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
 			if err != nil {
 				return errs.WrapMsg(err, "etcd put err")
 			}