fix metric check

Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com>
alexandrosfilios · Aug 26, 2024 · 2e556dd · 2e556dd
1 parent 15d7660
commit 2e556dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/integration/token/fungible/support.go b/integration/token/fungible/support.go
@@ -1130,7 +1130,7 @@ func CheckLocalMetrics(ii *integration.Infrastructure, user string, viewName str
 	Expect(metrics).NotTo(BeEmpty())
 
 	var sum float64
-	for _, m := range metrics[user+"_fsc_view_operations"].GetMetric() {
+	for _, m := range metrics["fsc_view_operations"].GetMetric() {
 		for _, labelPair := range m.Label {
 			if labelPair.GetName() == "view" && labelPair.GetValue() == viewName {
 				sum += m.Counter.GetValue()
@@ -1142,11 +1142,11 @@ func CheckLocalMetrics(ii *integration.Infrastructure, user string, viewName str
 	Expect(sum).NotTo(BeZero())
 }
 
-func CheckPrometheusMetrics(ii *integration.Infrastructure, user, viewName string) {
+func CheckPrometheusMetrics(ii *integration.Infrastructure, viewName string) {
 	cli, err := ii.NWO.PrometheusAPI()
 	Expect(err).To(BeNil())
 	metric := model.Metric{
-		"__name__": model.LabelValue(user + "_fsc_view_operations"),
+		"__name__": model.LabelValue("fsc_view_operations"),
 		"view":     model.LabelValue(viewName),
 	}
 	val, warnings, err := cli.Query(context.Background(), metric.String(), time.Now())

diff --git a/integration/token/fungible/tests.go b/integration/token/fungible/tests.go
@@ -1076,7 +1076,7 @@ func TestStressSuite(network *integration.Infrastructure, auditorId string, sele
 	}}))
 
 	CheckLocalMetrics(network, "alice", "github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views/BalanceView")
-	CheckPrometheusMetrics(network, "alice", "github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views/BalanceView")
+	CheckPrometheusMetrics(network, "github.com/hyperledger-labs/fabric-token-sdk/integration/token/fungible/views/BalanceView")
 }
 
 func TestStress(network *integration.Infrastructure, auditorId string, selector *token3.ReplicaSelector) {