X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fmetrics_test.go;h=bd7c73726c6e9a9c7b1349801bcfc79b18ea034b;hb=refs%2Fchanges%2F29%2F6729%2F2;hp=ff70ab3e8944833daa8d05de6f26fc6ae895b215;hpb=90f6dd45c9874dbfa8673fc1c0e12a3595951241;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/metrics_test.go b/pkg/xapp/metrics_test.go
old mode 100644
new mode 100755
index ff70ab3..bd7c737
--- a/pkg/xapp/metrics_test.go
+++ b/pkg/xapp/metrics_test.go
@@ -25,6 +25,7 @@ import (
 
 var mCVect map[string]CounterVec
 var mGVect map[string]GaugeVec
+var mGGroup map[string]Gauge
 
 func TestMetricSetup(t *testing.T) {
 	mCVect = Metric.RegisterCounterVecGroup(
@@ -40,6 +41,37 @@ func TestMetricSetup(t *testing.T) {
 		},
 		[]string{"name", "event"},
 		"SUBSYSTEM")
+
+	mGGroup = Metric.RegisterGaugeGroup(
+		[]CounterOpts{
+			{Name: "counter3", Help: "counter3"},
+		},
+		"SUBSYSTEM2")
+}
+
+func TestMetricCounter(t *testing.T) {
+	var TestCounterOpts = []CounterOpts{
+		{Name: "Blaah1", Help: "Blaah1"},
+		{Name: "Blaah2", Help: "Blaah2"},
+		{Name: "Blaah3", Help: "Blaah3"},
+		{Name: "Blaah4", Help: "Blaah4"},
+	}
+
+	ret1 := Metric.RegisterCounterGroup(TestCounterOpts, "TestMetricCounter")
+
+	if len(ret1) == 0 {
+		t.Errorf("ret1 counter group is empty")
+	}
+
+	ret2 := Metric.RegisterCounterGroup(TestCounterOpts, "TestMetricCounter")
+
+	if len(ret2) == 0 {
+		t.Errorf("ret2 counter group is empty")
+	}
+
+	if len(ret1) != len(ret2) {
+		t.Errorf("ret1 len %d differs from ret2 len %d", len(ret1), len(ret2))
+	}
 }
 
 func TestMetricCounterVector(t *testing.T) {
@@ -97,21 +129,24 @@ func TestMetricCounterVectorPrefix(t *testing.T) {
 
 	//
 	//
-	c_grp := Metric.CombineCounterGroups(c_grp1, c_grp2)
+	m_grp := NewMetricGroupsCache()
+	m_grp.CombineCounterGroups(c_grp1, c_grp2)
 
 	//
 	//
-	if _, ok := c_grp["event1_counter1"]; ok == false {
-		t.Errorf("c_grp event1_counter1 not exists")
+	if m_grp.CIs("event1_counter1") == false {
+		t.Errorf("m_grp event1_counter1 not exists")
 	}
-	c_grp["event1_counter1"].Inc()
+	m_grp.CInc("event1_counter1")
 
 	//
 	//
-	if _, ok := c_grp["event2_counter1"]; ok == false {
-		t.Errorf("c_grp event2_counter1 not exists")
+	if m_grp.CIs("event2_counter1") == false {
+		t.Errorf("m_grp event2_counter1 not exists")
 	}
-	c_grp["event2_counter1"].Inc()
+
+	m_grp.CAdd("event2_counter1", 1)
+	m_grp.CGet("event2_counter1")
 }
 
 func TestMetricGaugeVectorPrefix(t *testing.T) {
@@ -131,23 +166,26 @@ func TestMetricGaugeVectorPrefix(t *testing.T) {
 	}
 	g_grp2["event2_counter2"].Inc()
 
-	//
-	//
-	g_grp := Metric.CombineGaugeGroups(g_grp1, g_grp2)
+	m_grp := NewMetricGroupsCache()
+	m_grp.CombineGaugeGroups(g_grp1, g_grp2)
 
 	//
 	//
-	if _, ok := g_grp["event1_counter2"]; ok == false {
-		t.Errorf("g_grp event1_counter2 not exists")
+	if m_grp.GIs("event1_counter2") == false {
+		t.Errorf("m_grp event1_counter2 not exists")
 	}
-	g_grp["event1_counter2"].Inc()
+	m_grp.GInc("event1_counter2")
 
 	//
 	//
-	if _, ok := g_grp["event2_counter2"]; ok == false {
-		t.Errorf("g_grp event2_counter2 not exists")
+	if m_grp.GIs("event2_counter2") == false {
+		t.Errorf("m_grp event2_counter2 not exists")
 	}
-	g_grp["event2_counter2"].Inc()
+	m_grp.GInc("event2_counter2")
+
+	m_grp.GGet("event2_counter2")
+	m_grp.GDec("event2_counter2")
+	m_grp.GSet("event2_counter2", 1)
 }
 
 func TestMetricGroupCache(t *testing.T) {
@@ -185,38 +223,39 @@ func TestMetricGroupCache(t *testing.T) {
 
 	//
 	//
-	cacheid := "CACHEID"
-	entry := Metric.GroupCacheGet(cacheid)
-	if entry == nil {
-		Metric.GroupCacheAddCounters(cacheid, c_grp1)
-		Metric.GroupCacheAddCounters(cacheid, c_grp2)
-		Metric.GroupCacheAddGauges(cacheid, g_grp1)
-		Metric.GroupCacheAddGauges(cacheid, g_grp2)
-		entry = Metric.GroupCacheGet(cacheid)
-	}
+	m_grp := NewMetricGroupsCache()
+	m_grp.CombineCounterGroups(c_grp1)
+	m_grp.CombineCounterGroups(c_grp2)
+	m_grp.CombineGaugeGroups(g_grp1)
+	m_grp.CombineGaugeGroups(g_grp2)
 
-	if entry == nil {
+	if m_grp == nil {
 		t.Errorf("Cache failed")
 	}
 
-	if _, ok := entry.Counters["event1_counter1"]; ok == false {
-		t.Errorf("entry.Counters event1_counter1 not exists")
+	if m_grp.CIs("event1_counter1") == false {
+		t.Errorf("m_grp.Counters event1_counter1 not exists")
 	}
-	entry.Counters["event1_counter1"].Inc()
+	m_grp.CInc("event1_counter1")
 
-	if _, ok := entry.Counters["event2_counter1"]; ok == false {
-		t.Errorf("entry.Counters event2_counter1 not exists")
+	if m_grp.CIs("event2_counter1") == false {
+		t.Errorf("m_grp.Counters event2_counter1 not exists")
 	}
-	entry.Counters["event2_counter1"].Inc()
+	m_grp.CInc("event2_counter1")
 
-	if _, ok := entry.Gauges["event1_counter2"]; ok == false {
-		t.Errorf("entry.Gauges event1_counter2 not exists")
+	if m_grp.GIs("event1_counter2") == false {
+		t.Errorf("m_grp.Gauges event1_counter2 not exists")
 	}
-	entry.Gauges["event1_counter2"].Inc()
+	m_grp.GInc("event1_counter2")
 
-	if _, ok := entry.Gauges["event2_counter2"]; ok == false {
-		t.Errorf("entry.Gauges event2_counter2 not exists")
+	if m_grp.GIs("event2_counter2") == false {
+		t.Errorf("m_grp.Gauges event2_counter2 not exists")
 	}
-	entry.Gauges["event2_counter2"].Inc()
+	m_grp.GInc("event2_counter2")
 
+	m_grp.CAdd("event2_counter1", 1)
+	m_grp.CGet("event2_counter1")
+	m_grp.GGet("event2_counter2")
+	m_grp.GDec("event2_counter2")
+	m_grp.GSet("event2_counter2", 1)
 }