X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fmetrics_test.go;fp=pkg%2Fxapp%2Fmetrics_test.go;h=5c3ae29a142420fbd782eb4d40ebaf23bd6fa8f0;hb=917ab12e40e2760fcd17c0db39bfd9d21b45ca8a;hp=74bd5b266a1ac7cbd9223d5aa5ec289aea8e7c3f;hpb=82651fe96c123b61252dfef755ce7b9882e7db97;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/metrics_test.go b/pkg/xapp/metrics_test.go
index 74bd5b2..5c3ae29 100755
--- a/pkg/xapp/metrics_test.go
+++ b/pkg/xapp/metrics_test.go
@@ -605,282 +605,3 @@ func TestMetricCounterAutoGDec(t *testing.T) {
 	m_grp.Registerer(nil, &registerer{})
 	m_grp.GDec("gautotest1")
 }
-
-// ----
-// 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?")
-	}
-
-}
-
-func TestMetricCounterVector(t *testing.T) {
-	//
-	//
-	c_1_1 := Metric.GetCounterFromVect([]string{"name1", "event1"}, mCVect)
-	c_1_1.Inc()
-	c_1_2 := Metric.GetCounterFromVect([]string{"name1", "event1"}, mCVect)
-	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.GetCounterFromVect([]string{"name1", "event2"}, mCVect)
-	c_2_1.Inc()
-	c_2_2 := Metric.GetCounterFromVect([]string{"name1", "event2"}, mCVect)
-	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?")
-	}
-
-}
-
-func TestMetricCounterGroupVector(t *testing.T) {
-	//
-	//
-	c_grp1 := Metric.GetCounterGroupFromVects([]string{"name1", "event1"}, mCGroupVect)
-	if _, ok := c_grp1["counter1"]; ok == false {
-		t.Errorf("c_grp1 counter1 not exists")
-	}
-	c_grp1["counter1"].Inc()
-
-	//
-	//
-	c_grp2 := Metric.GetCounterGroupFromVects([]string{"name1", "event2"}, mCGroupVect)
-	if _, ok := c_grp2["counter1"]; ok == false {
-		t.Errorf("c_grp2 counter1 not exists")
-	}
-	c_grp2["counter1"].Inc()
-}
-
-func TestMetricGaugeVector(t *testing.T) {
-	//
-	//
-	c_1_1 := Metric.GetGaugeFromVect([]string{"name1", "event1"}, mGVect)
-	c_1_1.Inc()
-	c_1_2 := Metric.GetGaugeFromVect([]string{"name1", "event1"}, mGVect)
-	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.GetGaugeFromVect([]string{"name1", "event2"}, mGVect)
-	c_2_1.Inc()
-	c_2_2 := Metric.GetGaugeFromVect([]string{"name1", "event2"}, mGVect)
-	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?")
-	}
-}
-
-func TestMetricGaugeGroupVector(t *testing.T) {
-	//
-	//
-	g_grp1 := Metric.GetGaugeGroupFromVects([]string{"name1", "event1"}, mGGroupVect)
-	if _, ok := g_grp1["gauge1"]; ok == false {
-		t.Errorf("g_grp1 gauge1 not exists")
-	}
-	g_grp1["gauge1"].Inc()
-
-	//
-	//
-	g_grp2 := Metric.GetGaugeGroupFromVects([]string{"name1", "event2"}, mGGroupVect)
-	if _, ok := g_grp2["gauge1"]; ok == false {
-		t.Errorf("g_grp2 gauge1 not exists")
-	}
-	g_grp2["gauge1"].Inc()
-}
-
-func TestMetricCounterGroupVectorPrefix(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["event1_counter1"].Inc()
-
-	//
-	//
-	c_grp2 := Metric.GetCounterGroupFromVectsWithPrefix("event2_", []string{"name1", "event2"}, mCGroupVect)
-	if _, ok := c_grp2["event2_counter1"]; ok == false {
-		t.Errorf("c_grp2 event2_counter1 not exists")
-	}
-	c_grp2["event2_counter1"].Inc()
-
-	//
-	//
-	m_grp := NewMetricGroupsCache()
-	m_grp.CombineCounterGroups(c_grp1, c_grp2)
-
-	//
-	//
-	if m_grp.CIs("event1_counter1") == false {
-		t.Errorf("m_grp event1_counter1 not exists")
-	}
-	m_grp.CInc("event1_counter1")
-
-	//
-	//
-	if m_grp.CIs("event2_counter1") == false {
-		t.Errorf("m_grp event2_counter1 not exists")
-	}
-
-	m_grp.CAdd("event2_counter1", 1)
-	m_grp.CGet("event2_counter1")
-}
-
-func TestMetricGaugeGroupVectorPrefix(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["event1_gauge1"].Inc()
-
-	//
-	//
-	g_grp2 := Metric.GetGaugeGroupFromVectsWithPrefix("event2_", []string{"name1", "event2"}, mGGroupVect)
-	if _, ok := g_grp2["event2_gauge1"]; ok == false {
-		t.Errorf("g_grp2 event2_gauge1 not exists")
-	}
-	g_grp2["event2_gauge1"].Inc()
-
-	m_grp := NewMetricGroupsCache()
-	m_grp.CombineGaugeGroups(g_grp1, g_grp2)
-
-	//
-	//
-	if m_grp.GIs("event1_gauge1") == false {
-		t.Errorf("m_grp event1_gauge1 not exists")
-	}
-	m_grp.GInc("event1_gauge1")
-
-	//
-	//
-	if m_grp.GIs("event2_gauge1") == false {
-		t.Errorf("m_grp event2_gauge1 not exists")
-	}
-	m_grp.GInc("event2_gauge1")
-
-	m_grp.GGet("event2_gauge1")
-	m_grp.GDec("event2_gauge1")
-	m_grp.GSet("event2_gauge1", 1)
-}
-
-func TestMetricGroupCacheWithVect(t *testing.T) {
-	//
-	//
-	c_grp1 := Metric.GetCounterGroupFromVects([]string{"name1", "event1"}, mCGroupVect)
-	if _, ok := c_grp1["counter1"]; ok == false {
-		t.Errorf("c_grp1 counter1 not exists")
-	}
-	c_grp1["counter1"].Inc()
-
-	//
-	//
-	c_grp2 := Metric.GetCounterGroupFromVects([]string{"name1", "event2"}, mCGroupVect)
-	if _, ok := c_grp2["counter1"]; ok == false {
-		t.Errorf("c_grp2 counter1 not exists")
-	}
-	c_grp2["counter1"].Inc()
-
-	//
-	//
-	g_grp1 := Metric.GetGaugeGroupFromVects([]string{"name1", "event1"}, mGGroupVect)
-	if _, ok := g_grp1["gauge1"]; ok == false {
-		t.Errorf("g_grp1 gauge1 not exists")
-	}
-	g_grp1["gauge1"].Inc()
-
-	//
-	//
-	g_grp2 := Metric.GetGaugeGroupFromVects([]string{"name1", "event2"}, mGGroupVect)
-	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)
-}