Removed deprecaded code

Signed-off-by: Juha Hyttinen <juha.hyttinen@nokia.com>
Change-Id: I040145cc9935b08dd852574e4ae6aa80cd104f56

diff --git a/pkg/xapp/metrics.go b/pkg/xapp/metrics.go
index ef5ba30..8e13f7c 100644 (file)
--- a/pkg/xapp/metrics.go
+++ b/pkg/xapp/metrics.go
@@ -21,11 +21,12 @@ package xapp
 
 import (
        "fmt"
+       "sync"
+
        "github.com/gorilla/mux"
        "github.com/prometheus/client_golang/prometheus"
        "github.com/prometheus/client_golang/prometheus/promauto"
        "github.com/prometheus/client_golang/prometheus/promhttp"
-       "sync"
 )
 
 //-----------------------------------------------------------------------------
@@ -474,204 +475,3 @@ func (m *Metrics) RegisterLabeledGaugeGroup(optsgroup []CounterOpts, labelNames
        }
        return c
 }
-
-/*
- * Handling counter vectors
- *
- * Examples:
-
-  //---------
-       vec := Metric.RegisterCounterVec(
-               CounterOpts{Name: "counter0", Help: "counter0"},
-               []string{"host"},
-               "SUBSYSTEM")
-
-       stat:=Metric.GetCounterFromVect([]string{"localhost:8888"},vec)
-       stat.Inc()
-
-  //---------
-       vec := Metric.RegisterCounterVecGroup(
-               []CounterOpts{
-                       {Name: "counter1", Help: "counter1"},
-                       {Name: "counter2", Help: "counter2"},
-               },
-               []string{"host"},
-               "SUBSYSTEM")
-
-       stats:=Metric.GetCounterGroupFromVects([]string{"localhost:8888"}, vec)
-       stats["counter1"].Inc()
-*/
-
-// Deprecated: Use RegisterLabeledCounter
-func (m *Metrics) RegisterCounterVec(opts CounterOpts, labelNames []string, subsytem string) CounterVec {
-       globalLock.Lock()
-       defer globalLock.Unlock()
-       opts.Namespace = m.Namespace
-       opts.Subsystem = subsytem
-       vecid := m.getFullName(prometheus.Opts(opts), []string{})
-       if _, ok := cache_allcounters[vecid]; ok {
-               Logger.Warn("Register new counter vector with opts: %v labelNames: %v, name conflicts existing counter", opts, labelNames)
-               return CounterVec{}
-       }
-       if _, ok := cache_allcountervects[vecid]; !ok {
-               Logger.Debug("Register new counter vector with opts: %v labelNames: %v", opts, labelNames)
-               entry := CounterVec{}
-               entry.Opts = opts
-               entry.Labels = labelNames
-               entry.Vec = promauto.NewCounterVec(prometheus.CounterOpts(entry.Opts), entry.Labels)
-               cache_allcountervects[vecid] = entry
-       }
-       entry := cache_allcountervects[vecid]
-       if strSliceCompare(entry.Labels, labelNames) == false {
-               Logger.Warn("id:%s cached counter vec labels dont match %v != %v", vecid, entry.Labels, labelNames)
-               return CounterVec{}
-       }
-       return entry
-}
-
-// Deprecated: Use RegisterLabeledCounterGroup
-func (m *Metrics) RegisterCounterVecGroup(optsgroup []CounterOpts, labelNames []string, subsytem string) map[string]CounterVec {
-       c := make(map[string]CounterVec)
-       for _, opts := range optsgroup {
-               ret := m.RegisterCounterVec(opts, labelNames, subsytem)
-               if ret.Vec != nil {
-                       c[opts.Name] = ret
-               }
-       }
-       return c
-}
-
-// Deprecated: Use RegisterLabeledCounter
-func (m *Metrics) GetCounterFromVect(labelValues []string, vec CounterVec) (c Counter) {
-       globalLock.Lock()
-       defer globalLock.Unlock()
-       valid := m.getFullName(prometheus.Opts(vec.Opts), labelValues)
-       if _, ok := cache_allcounters[valid]; !ok {
-               Logger.Debug("Register new counter from vector with opts: %v labelValues: %v", vec.Opts, labelValues)
-               cache_allcounters[valid] = vec.Vec.WithLabelValues(labelValues...)
-       }
-       return cache_allcounters[valid]
-}
-
-// Deprecated: Use RegisterLabeledCounterGroup
-func (m *Metrics) GetCounterGroupFromVects(labelValues []string, vects ...map[string]CounterVec) map[string]Counter {
-       c := make(map[string]Counter)
-       for _, vect := range vects {
-               for name, vec := range vect {
-                       c[name] = m.GetCounterFromVect(labelValues, vec)
-               }
-       }
-       return c
-}
-
-// Deprecated: Use RegisterLabeledCounterGroup
-func (m *Metrics) GetCounterGroupFromVectsWithPrefix(prefix string, labelValues []string, vects ...map[string]CounterVec) map[string]Counter {
-       c := make(map[string]Counter)
-       for _, vect := range vects {
-               for name, vec := range vect {
-                       c[prefix+name] = m.GetCounterFromVect(labelValues, vec)
-               }
-       }
-       return c
-}
-
-/*
- * Handling gauge vectors
- *
- * Examples:
-
-  //---------
-       vec := Metric.RegisterGaugeVec(
-               CounterOpts{Name: "gauge0", Help: "gauge0"},
-               []string{"host"},
-               "SUBSYSTEM")
-
-       stat:=Metric.GetGaugeFromVect([]string{"localhost:8888"},vec)
-       stat.Inc()
-
-  //---------
-       vecgrp := Metric.RegisterGaugeVecGroup(
-               []CounterOpts{
-                       {Name: "gauge1", Help: "gauge1"},
-                       {Name: "gauge2", Help: "gauge2"},
-               },
-               []string{"host"},
-               "SUBSYSTEM")
-
-       stats:=Metric.GetGaugeGroupFromVects([]string{"localhost:8888"},vecgrp)
-       stats["gauge1"].Inc()
-*/
-
-// Deprecated: Use RegisterLabeledGauge
-func (m *Metrics) RegisterGaugeVec(opts CounterOpts, labelNames []string, subsytem string) GaugeVec {
-       globalLock.Lock()
-       defer globalLock.Unlock()
-       opts.Namespace = m.Namespace
-       opts.Subsystem = subsytem
-       vecid := m.getFullName(prometheus.Opts(opts), []string{})
-       if _, ok := cache_allgauges[vecid]; ok {
-               Logger.Warn("Register new gauge vector with opts: %v labelNames: %v, name conflicts existing counter", opts, labelNames)
-               return GaugeVec{}
-       }
-       if _, ok := cache_allgaugevects[vecid]; !ok {
-               Logger.Debug("Register new gauge vector with opts: %v labelNames: %v", opts, labelNames)
-               entry := GaugeVec{}
-               entry.Opts = opts
-               entry.Labels = labelNames
-               entry.Vec = promauto.NewGaugeVec(prometheus.GaugeOpts(entry.Opts), entry.Labels)
-               cache_allgaugevects[vecid] = entry
-       }
-       entry := cache_allgaugevects[vecid]
-       if strSliceCompare(entry.Labels, labelNames) == false {
-               Logger.Warn("id:%s cached gauge vec labels dont match %v != %v", vecid, entry.Labels, labelNames)
-               return GaugeVec{}
-       }
-       return entry
-}
-
-// Deprecated: Use RegisterLabeledGaugeGroup
-func (m *Metrics) RegisterGaugeVecGroup(optsgroup []CounterOpts, labelNames []string, subsytem string) map[string]GaugeVec {
-       c := make(map[string]GaugeVec)
-       for _, opts := range optsgroup {
-               ret := m.RegisterGaugeVec(opts, labelNames, subsytem)
-               if ret.Vec != nil {
-                       c[opts.Name] = ret
-               }
-
-       }
-       return c
-}
-
-// Deprecated: Use RegisterLabeledGauge
-func (m *Metrics) GetGaugeFromVect(labelValues []string, vec GaugeVec) Gauge {
-       globalLock.Lock()
-       defer globalLock.Unlock()
-       valid := m.getFullName(prometheus.Opts(vec.Opts), labelValues)
-       if _, ok := cache_allgauges[valid]; !ok {
-               Logger.Debug("Register new gauge from vector with opts: %v labelValues: %v", vec.Opts, labelValues)
-               cache_allgauges[valid] = vec.Vec.WithLabelValues(labelValues...)
-       }
-       return cache_allgauges[valid]
-}
-
-// Deprecated: Use RegisterLabeledGaugeGroup
-func (m *Metrics) GetGaugeGroupFromVects(labelValues []string, vects ...map[string]GaugeVec) map[string]Gauge {
-       c := make(map[string]Gauge)
-       for _, vect := range vects {
-               for name, vec := range vect {
-                       c[name] = m.GetGaugeFromVect(labelValues, vec)
-               }
-       }
-       return c
-}
-
-// Deprecated: Use RegisterLabeledGaugeGroup
-func (m *Metrics) GetGaugeGroupFromVectsWithPrefix(prefix string, labelValues []string, vects ...map[string]GaugeVec) map[string]Gauge {
-       c := make(map[string]Gauge)
-       for _, vect := range vects {
-               for name, vec := range vect {
-                       c[prefix+name] = m.GetGaugeFromVect(labelValues, vec)
-               }
-       }
-       return c
-}

diff --git a/pkg/xapp/metrics_test.go b/pkg/xapp/metrics_test.go
index 74bd5b2..5c3ae29 100755 (executable)
--- 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)
-}