From 56977286b9e840bdbafeaa8eb00457d076ec750d Mon Sep 17 00:00:00 2001
From: smx_Moragn <1048492656@qq.com>
Date: Tue, 8 Oct 2024 17:34:19 +0800
Subject: [PATCH] Fix duplicate naming for prometheus

---
 example/promProvider/main.go                   |  3 ++-
 .../provider/promprovider/promprovider.go      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/example/promProvider/main.go b/example/promProvider/main.go
index 9b56269..97b7d54 100644
--- a/example/promProvider/main.go
+++ b/example/promProvider/main.go
@@ -38,7 +38,8 @@ func main() {
 
 	provider := promprovider.NewPromProvider(
 		promprovider.WithRegistry(registry),
-		promprovider.WithHttpServer(),
+		promprovider.WithHttpServer(), //Activate Kitex monitoring
+		promprovider.WithRPCServer(),  //Activate Hertz monitoring
 	)
 
 	provider.Serve(":9090", "/metrics-demo")
diff --git a/telemetry/provider/promprovider/promprovider.go b/telemetry/provider/promprovider/promprovider.go
index 6627f4f..34ecada 100644
--- a/telemetry/provider/promprovider/promprovider.go
+++ b/telemetry/provider/promprovider/promprovider.go
@@ -57,7 +57,7 @@ func NewPromProvider(opts ...Option) *promProvider {
 	if cfg.enableRPC {
 		RPCCounterVec := prometheus.NewCounterVec(
 			prometheus.CounterOpts{
-				Name: buildName(cfg.name, semantic.Counter),
+				Name: buildName(cfg.name, "rpc", semantic.Counter),
 				Help: fmt.Sprintf("Total number of requires completed by the %s, regardless of success or failure.", semantic.Counter),
 			},
 			[]string{semantic.LabelRPCCallerKey, semantic.LabelRPCCalleeKey, semantic.LabelRPCMethodKey, semantic.LabelKeyStatus},
@@ -67,7 +67,7 @@ func NewPromProvider(opts ...Option) *promProvider {
 
 		clientHandledHistogramRPC := prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
-				Name:    buildName(cfg.name, semantic.Latency),
+				Name:    buildName(cfg.name, "rpc", semantic.Latency),
 				Help:    fmt.Sprintf("Latency (microseconds) of the %s until it is finished.", semantic.Latency),
 				Buckets: cfg.buckets,
 			},
@@ -78,13 +78,13 @@ func NewPromProvider(opts ...Option) *promProvider {
 		// create retry recorder
 		retryHandledHistogramRPC := prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
-				Name:    buildName(cfg.name, semantic.Retry),
+				Name:    buildName(cfg.name, "rpc", semantic.Retry),
 				Help:    fmt.Sprintf("Distribution of retry attempts for %s until it is finished.", semantic.Retry),
 				Buckets: retryBuckets,
 			},
 			[]string{semantic.LabelRPCCallerKey, semantic.LabelRPCCalleeKey, semantic.LabelRPCMethodKey},
 		)
-		registry.MustRegister(clientHandledHistogramRPC)
+		registry.MustRegister(retryHandledHistogramRPC)
 		retryRecorder := metric.NewPromRecorder(retryHandledHistogramRPC)
 
 		metrics = append(metrics,
@@ -96,7 +96,7 @@ func NewPromProvider(opts ...Option) *promProvider {
 	if cfg.enableHTTP {
 		HttpCounterVec := prometheus.NewCounterVec(
 			prometheus.CounterOpts{
-				Name: buildName(cfg.name, semantic.Counter),
+				Name: buildName(cfg.name, "http", semantic.Counter),
 				Help: "Total number of HTTPs completed by the server, regardless of success or failure.",
 			},
 			[]string{semantic.LabelHttpMethodKey, semantic.LabelStatusCode, semantic.LabelPath},
@@ -106,7 +106,7 @@ func NewPromProvider(opts ...Option) *promProvider {
 
 		HttpHandledHistogram := prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
-				Name:    buildName(cfg.name, semantic.Latency),
+				Name:    buildName(cfg.name, "http", semantic.Latency),
 				Help:    "Latency (microseconds) of HTTP that had been application-level handled by the server.",
 				Buckets: cfg.buckets,
 			},
@@ -142,9 +142,9 @@ func (p *promProvider) Serve(addr, path string) {
 	}()
 }
 
-func buildName(name, service string) string {
+func buildName(name, protocol, service string) string {
 	if name != "" {
-		return fmt.Sprintf("%s_%s", name, service)
+		return fmt.Sprintf("%s_%s_%s", name, protocol, service)
 	}
-	return service
+	return fmt.Sprintf("%s_%s", protocol, service)
 }