X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fmetrics_test.go;h=aad90b194db1a7fa3e94a2f952f7f653c95ba550;hb=2a05b784df856f77c8c4c0a64ddc4200f14adf13;hp=4c98c9527a9ce3cfafdc953629174a76307379ac;hpb=7117d0d6bd49a3099d1efb36941096a502c9a4bb;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/metrics_test.go b/pkg/xapp/metrics_test.go
index 4c98c95..aad90b1 100755
--- a/pkg/xapp/metrics_test.go
+++ b/pkg/xapp/metrics_test.go
@@ -23,48 +23,6 @@ import (
 	"testing"
 )
 
-var mCVect CounterVec
-var mGVect GaugeVec
-
-var mCGroupVect map[string]CounterVec
-var mGGroupVect map[string]GaugeVec
-
-func TestMetricSetup(t *testing.T) {
-	mCVect = Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "event"}, "SUBSYSTEM0")
-
-	mCGroupVect = Metric.RegisterCounterVecGroup(
-		[]CounterOpts{
-			{Name: "counter1", Help: "counter1"},
-		},
-		[]string{"name", "event"},
-		"SUBSYSTEM1")
-
-	mGVect = Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "event"}, "SUBSYSTEM0")
-
-	mGGroupVect = Metric.RegisterGaugeVecGroup(
-		[]CounterOpts{
-			{Name: "gauge1", Help: "gauge1"},
-		},
-		[]string{"name", "event"},
-		"SUBSYSTEM1")
-
-	tmpCVect := Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "event"}, "SUBSYSTEM0")
-
-	if tmpCVect.Vec != mCVect.Vec {
-		t.Errorf("tmpCVect not same than mCVect. cache not working?")
-	}
-
-	tmpGVect := Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "event"}, "SUBSYSTEM0")
-
-	if tmpGVect.Vec != mGVect.Vec {
-		t.Errorf("tmpGVect not same than mGVect. cache not working?")
-	}
-
-	Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "eventMismatch"}, "SUBSYSTEM0")
-	Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "eventMismatch"}, "SUBSYSTEM0")
-
-}
-
 func TestMetricCounter(t *testing.T) {
 	TestCounterOpt := CounterOpts{Name: "CounterBlaah1", Help: "CounterBlaah1"}
 	ret1 := Metric.RegisterCounter(TestCounterOpt, "TestMetricCounter")
@@ -111,6 +69,98 @@ func TestMetricCounterGroup(t *testing.T) {
 	}
 }
 
+func TestMetricLabeledCounter(t *testing.T) {
+	//
+	//
+	c_1_1 := Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML0")
+
+	c_1_2 := Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML0")
+
+	c_1_1.Inc()
+	c_1_2.Inc()
+	if c_1_1 != c_1_2 {
+		t.Errorf("c_1_1 not same than c_1_2. cache not working?")
+	}
+
+	//
+	//
+	c_2_1 := Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML0")
+
+	c_2_2 := Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML0")
+
+	c_2_1.Inc()
+	c_2_2.Inc()
+	if c_2_1 != c_2_2 {
+		t.Errorf("c_2_1 not same than c_2_2. cache not working?")
+	}
+
+	if c_1_1 == c_2_1 {
+		t.Errorf("c_1_1 same than c_2_1. what?")
+	}
+	if c_1_2 == c_2_2 {
+		t.Errorf("c_1_2 same than c_2_2. what?")
+	}
+
+}
+
+func TestMetricLabeledCounterMismatch(t *testing.T) {
+	Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEMLERR")
+
+	Metric.RegisterLabeledCounter(
+		CounterOpts{Name: "counter1", Help: "counter1"},
+		[]string{"name", "eventmismatch"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEMLERR")
+}
+
+func TestMetricLabeledCounterGroup(t *testing.T) {
+	//
+	//
+	c_grp1 := Metric.RegisterLabeledCounterGroup(
+		[]CounterOpts{{Name: "counter1", Help: "counter1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML1")
+
+	if _, ok := c_grp1["counter1"]; ok == false {
+		t.Errorf("c_grp1 counter1 not exists")
+	}
+	c_grp1["counter1"].Inc()
+
+	//
+	//
+	c_grp2 := Metric.RegisterLabeledCounterGroup(
+		[]CounterOpts{{Name: "counter1", Help: "counter1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML1")
+
+	if _, ok := c_grp2["counter1"]; ok == false {
+		t.Errorf("c_grp2 counter1 not exists")
+	}
+	c_grp2["counter1"].Inc()
+}
+
 func TestMetricGauge(t *testing.T) {
 	TestGaugeOpts := CounterOpts{Name: "GaugeBlaah1", Help: "GaugeBlaah1"}
 	ret1 := Metric.RegisterGauge(TestGaugeOpts, "TestMetricGauge")
@@ -157,6 +207,233 @@ func TestMetricGaugeGroup(t *testing.T) {
 	}
 }
 
+func TestMetricLabeledGauge(t *testing.T) {
+	//
+	//
+	c_1_1 := Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML0")
+
+	c_1_2 := Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML0")
+
+	c_1_1.Inc()
+	c_1_2.Inc()
+	if c_1_1 != c_1_2 {
+		t.Errorf("c_1_1 not same than c_1_2. cache not working?")
+	}
+
+	//
+	//
+	c_2_1 := Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML0")
+
+	c_2_2 := Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML0")
+
+	c_2_1.Inc()
+	c_2_2.Inc()
+	if c_2_1 != c_2_2 {
+		t.Errorf("c_2_1 not same than c_2_2. cache not working?")
+	}
+
+	if c_1_1 == c_2_1 {
+		t.Errorf("c_1_1 same than c_2_1. what?")
+	}
+	if c_1_2 == c_2_2 {
+		t.Errorf("c_1_2 same than c_2_2. what?")
+	}
+
+}
+
+func TestMetricLabeledGaugeMismatch(t *testing.T) {
+	Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEMLERR")
+
+	Metric.RegisterLabeledGauge(
+		CounterOpts{Name: "gauge1", Help: "gauge1"},
+		[]string{"name", "eventmismatch"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEMLERR")
+}
+
+func TestMetricLabeledGaugeGroup(t *testing.T) {
+	//
+	//
+	g_grp1 := Metric.RegisterLabeledGaugeGroup(
+		[]CounterOpts{{Name: "gauge1", Help: "gauge1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML1")
+
+	if _, ok := g_grp1["gauge1"]; ok == false {
+		t.Errorf("g_grp1 gauge1 not exists")
+	}
+	g_grp1["gauge1"].Inc()
+
+	//
+	//
+	g_grp2 := Metric.RegisterLabeledGaugeGroup(
+		[]CounterOpts{{Name: "gauge1", Help: "gauge1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML1")
+
+	if _, ok := g_grp2["gauge1"]; ok == false {
+		t.Errorf("g_grp2 gauge1 not exists")
+	}
+	g_grp2["gauge1"].Inc()
+}
+
+func TestMetricGroupCache(t *testing.T) {
+	//
+	//
+	c_grp1 := Metric.RegisterLabeledCounterGroup(
+		[]CounterOpts{{Name: "counter1", Help: "counter1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML1")
+	if _, ok := c_grp1["counter1"]; ok == false {
+		t.Errorf("c_grp1 counter1 not exists")
+	}
+	c_grp1["counter1"].Inc()
+
+	//
+	//
+	c_grp2 := Metric.RegisterLabeledCounterGroup(
+		[]CounterOpts{{Name: "counter1", Help: "counter1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML1")
+	if _, ok := c_grp2["counter1"]; ok == false {
+		t.Errorf("c_grp2 counter1 not exists")
+	}
+	c_grp2["counter1"].Inc()
+
+	//
+	//
+	g_grp1 := Metric.RegisterLabeledGaugeGroup(
+		[]CounterOpts{{Name: "gauge1", Help: "gauge1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event1"},
+		"SUBSYSTEML1")
+	if _, ok := g_grp1["gauge1"]; ok == false {
+		t.Errorf("g_grp1 gauge1 not exists")
+	}
+	g_grp1["gauge1"].Inc()
+
+	//
+	//
+	g_grp2 := Metric.RegisterLabeledGaugeGroup(
+		[]CounterOpts{{Name: "gauge1", Help: "gauge1"}},
+		[]string{"name", "event"},
+		[]string{"name1", "event2"},
+		"SUBSYSTEML1")
+	if _, ok := g_grp2["gauge1"]; ok == false {
+		t.Errorf("g_grp2 gauge1 not exists")
+	}
+	g_grp2["gauge1"].Inc()
+
+	//
+	//
+	m_grp := NewMetricGroupsCache()
+	m_grp.CombineCounterGroupsWithPrefix("event1_", c_grp1)
+	m_grp.CombineCounterGroupsWithPrefix("event2_", c_grp2)
+	m_grp.CombineGaugeGroupsWithPrefix("event1_", g_grp1)
+	m_grp.CombineGaugeGroupsWithPrefix("event2_", g_grp2)
+
+	if m_grp == nil {
+		t.Errorf("Cache failed")
+	}
+
+	if m_grp.CIs("event1_counter1") == false {
+		t.Errorf("m_grp.Counters event1_counter1 not exists")
+	}
+	m_grp.CInc("event1_counter1")
+
+	if m_grp.CIs("event2_counter1") == false {
+		t.Errorf("m_grp.Counters event2_counter1 not exists")
+	}
+	m_grp.CInc("event2_counter1")
+
+	if m_grp.GIs("event1_gauge1") == false {
+		t.Errorf("m_grp.Gauges event1_gauge1 not exists")
+	}
+	m_grp.GInc("event1_gauge1")
+
+	if m_grp.GIs("event2_gauge1") == false {
+		t.Errorf("m_grp.Gauges event2_gauge1 not exists")
+	}
+	m_grp.GInc("event2_gauge1")
+
+	m_grp.CAdd("event2_counter1", 1)
+	m_grp.CGet("event2_counter1")
+	m_grp.GGet("event2_gauge1")
+	m_grp.GDec("event2_gauge1")
+	m_grp.GSet("event2_gauge1", 1)
+}
+
+// ----
+// VECTORS ARE OLD WAY
+// *Labeled* will do all work under the hood
+// ----
+
+var mCVect CounterVec
+var mGVect GaugeVec
+
+var mCGroupVect map[string]CounterVec
+var mGGroupVect map[string]GaugeVec
+
+func TestMetricSetup(t *testing.T) {
+	mCVect = Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "event"}, "SUBSYSTEM0")
+
+	mCGroupVect = Metric.RegisterCounterVecGroup(
+		[]CounterOpts{
+			{Name: "counter1", Help: "counter1"},
+		},
+		[]string{"name", "event"},
+		"SUBSYSTEM1")
+
+	mGVect = Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "event"}, "SUBSYSTEM0")
+
+	mGGroupVect = Metric.RegisterGaugeVecGroup(
+		[]CounterOpts{
+			{Name: "gauge1", Help: "gauge1"},
+		},
+		[]string{"name", "event"},
+		"SUBSYSTEM1")
+
+	tmpCVect := Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "event"}, "SUBSYSTEM0")
+
+	if tmpCVect.Vec != mCVect.Vec {
+		t.Errorf("tmpCVect not same than mCVect. cache not working?")
+	}
+
+	tmpGVect := Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "event"}, "SUBSYSTEM0")
+
+	if tmpGVect.Vec != mGVect.Vec {
+		t.Errorf("tmpGVect not same than mGVect. cache not working?")
+	}
+
+	Metric.RegisterCounterVec(CounterOpts{Name: "counter1", Help: "counter1"}, []string{"name", "eventMismatch"}, "SUBSYSTEM0")
+	Metric.RegisterGaugeVec(CounterOpts{Name: "gauge1", Help: "gauge1"}, []string{"name", "eventMismatch"}, "SUBSYSTEM0")
+
+}
+
 func TestMetricCounterVector(t *testing.T) {
 	//
 	//
@@ -320,14 +597,14 @@ func TestMetricGaugeGroupVectorPrefix(t *testing.T) {
 	m_grp.GSet("event2_gauge1", 1)
 }
 
-func TestMetricGroupCache(t *testing.T) {
+func TestMetricGroupCacheWithVect(t *testing.T) {
 	//
 	//
-	c_grp1 := Metric.GetCounterGroupFromVectsWithPrefix("event1_", []string{"name1", "event1"}, mCGroupVect)
-	if _, ok := c_grp1["event1_counter1"]; ok == false {
-		t.Errorf("c_grp1 event1_counter1 not exists")
+	c_grp1 := Metric.GetCounterGroupFromVects([]string{"name1", "event1"}, mCGroupVect)
+	if _, ok := c_grp1["counter1"]; ok == false {
+		t.Errorf("c_grp1 counter1 not exists")
 	}
-	c_grp1["event1_counter1"].Inc()
+	c_grp1["counter1"].Inc()
 
 	//
 	//
@@ -339,11 +616,11 @@ func TestMetricGroupCache(t *testing.T) {
 
 	//
 	//
-	g_grp1 := Metric.GetGaugeGroupFromVectsWithPrefix("event1_", []string{"name1", "event1"}, mGGroupVect)
-	if _, ok := g_grp1["event1_gauge1"]; ok == false {
-		t.Errorf("g_grp1 event1_gauge1 not exists")
+	g_grp1 := Metric.GetGaugeGroupFromVects([]string{"name1", "event1"}, mGGroupVect)
+	if _, ok := g_grp1["gauge1"]; ok == false {
+		t.Errorf("g_grp1 gauge1 not exists")
 	}
-	g_grp1["event1_gauge1"].Inc()
+	g_grp1["gauge1"].Inc()
 
 	//
 	//
@@ -356,9 +633,9 @@ func TestMetricGroupCache(t *testing.T) {
 	//
 	//
 	m_grp := NewMetricGroupsCache()
-	m_grp.CombineCounterGroups(c_grp1)
+	m_grp.CombineCounterGroupsWithPrefix("event1_", c_grp1)
 	m_grp.CombineCounterGroupsWithPrefix("event2_", c_grp2)
-	m_grp.CombineGaugeGroups(g_grp1)
+	m_grp.CombineGaugeGroupsWithPrefix("event1_", g_grp1)
 	m_grp.CombineGaugeGroupsWithPrefix("event2_", g_grp2)
 
 	if m_grp == nil {