blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-19 12:47:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolve the prometheus discovery issue of multiple instances with same service

Browse Source
This commit is contained in:
Dean Wang 2025-01-18 16:37:51 +08:00
parent 47e916aebe
commit 48928d7d84
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/init.go
View File

@ -109,7 +109,7 @@ func Start(ctx context.Context, index int, config *Config) error {
etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient() 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, registerIP, prometheusPort), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
if err != nil { if err != nil {
return errs.WrapMsg(err, "etcd put err") return errs.WrapMsg(err, "etcd put err")
} }

2
internal/api/prometheus_discovery.go
View File

@ -38,7 +38,7 @@ func (p *PrometheusDiscoveryApi) Enable(c *gin.Context) {
} }
func (p *PrometheusDiscoveryApi) discovery(c *gin.Context, key string) { 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))
if err != nil { if err != nil {
// Log and respond with an error if preparation fails. // Log and respond with an error if preparation fails.
apiresp.GinError(c, errs.WrapMsg(err, "etcd get err")) apiresp.GinError(c, errs.WrapMsg(err, "etcd get err"))

2
internal/msgtransfer/init.go
View File

@ -194,7 +194,7 @@ func (m *MsgTransfer) Start(index int, config *Config, client discovery.SvcDisco
etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient() 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, registerIP, prometheusPort), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
if err != nil { if err != nil {
return errs.WrapMsg(err, "etcd put err") return errs.WrapMsg(err, "etcd put err")
} }

8
pkg/common/prommetrics/discovery.go
View File

@ -17,8 +17,12 @@ type RespTarget struct {
Labels map[string]string `json:"labels"` 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) return fmt.Sprintf("%s/%s/%s/", "openim", "prometheus_discovery", name)
}
func BuildDiscoveryKey(name string, host string, port int) string {
return fmt.Sprintf("%s/%s/%s/%s:%d", "openim", "prometheus_discovery", name, host, port)
} }
func BuildDefaultTarget(host string, ip int) Target { func BuildDefaultTarget(host string, ip int) Target {

2
pkg/common/startrpc/start.go
View File

@ -128,7 +128,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf
etcdClient := client.(*etcd.SvcDiscoveryRegistryImpl).GetClient() 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, registerIP, prometheusPort), jsonutil.StructToJsonString(prommetrics.BuildDefaultTarget(registerIP, prometheusPort)))
if err != nil { if err != nil {
return errs.WrapMsg(err, "etcd put err") return errs.WrapMsg(err, "etcd put err")
} }