Merge pull request #73 from Chengxuan/update-metrics

Pick up latest metrics code

Author: Chengxuan

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/hyperledger/firefly-common v1.2.6
+	github.com/hyperledger/firefly-common v1.2.7
 	github.com/oklog/ulid/v2 v2.1.0
 	github.com/prometheus/client_golang v1.13.0
 	github.com/sirupsen/logrus v1.9.0

go.sum

@@ -184,8 +184,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/hyperledger/firefly-common v1.2.6 h1:NDf42a2iH6QSt3p7KkdT1pTDoW/NljcT+ClEfZRh61c=
-github.com/hyperledger/firefly-common v1.2.6/go.mod h1:uYO8DMgT3OGoF2R4Bew1Ql4BS3udYGzPs59sJH1V3E4=
+github.com/hyperledger/firefly-common v1.2.7 h1:voFbNVRFHZ64EJbyxCtMbLLriNRyqrl+wdUEqpgexHs=
+github.com/hyperledger/firefly-common v1.2.7/go.mod h1:uYO8DMgT3OGoF2R4Bew1Ql4BS3udYGzPs59sJH1V3E4=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=

internal/metrics/metrics.go

@@ -18,7 +18,6 @@ package metrics
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -29,11 +28,11 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-const metricsTransactionManagerPrefix = "tm"
+const metricsTransactionManagerComponentName = "transaction_manager"
 
 // REST api-server and transaction handler are sub-subsystem
-var metricsTransactionHandlerSubsystemName = fmt.Sprintf("%s_%s", metricsTransactionManagerPrefix, "th")
-var metricsRESTAPIServerSubSystemName = fmt.Sprintf("%s_%s", metricsTransactionManagerPrefix, "api_server_rest")
+var metricsTransactionHandlerSubsystemName = "th"
+var metricsRESTAPIServerSubSystemName = "api_server_rest"
 
 type metricsManager struct {
 	ctx                     context.Context
@@ -44,7 +43,7 @@ type metricsManager struct {
 }
 
 func NewMetricsManager(ctx context.Context) Metrics {
-	metricsRegistry := metric.NewPrometheusMetricsRegistry()
+	metricsRegistry := metric.NewPrometheusMetricsRegistry(metricsTransactionManagerComponentName)
 	txHandlerMetricsManager, _ := metricsRegistry.NewMetricsManagerForSubsystem(ctx, metricsTransactionHandlerSubsystemName)
 	_ = metricsRegistry.NewHTTPMetricsInstrumentationsForSubsystem(
 		ctx,