From 00fdb189a4bf7c90a8a70785456bb0c2e0cb2790 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Tue, 1 Feb 2022 14:49:09 +0100
Subject: [PATCH] Renamed TagMap() -> Tags(), MetaMap() -> Meta

---
 internal/ccMetric/ccMetric.go         | 16 ++++++++--------
 internal/metricRouter/metricRouter.go |  4 ++--
 sinks/gangliaSink.go                  |  2 +-
 sinks/influxSink.go                   |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/internal/ccMetric/ccMetric.go b/internal/ccMetric/ccMetric.go
index d469b3c..20b9786 100644
--- a/internal/ccMetric/ccMetric.go
+++ b/internal/ccMetric/ccMetric.go
@@ -27,12 +27,12 @@ type CCMetric interface {
 
 	SetTime(t time.Time)
 
-	MetaMap() map[string]string        // Map of meta data tags
+	Meta() map[string]string           // Map of meta data tags
 	MetaList() []*lp.Tag               // Ordered list of meta data
 	AddMeta(key, value string)         // Add a meta data tag
 	GetMeta(key string) (string, bool) // Get a meta data tab addressed by its key
 
-	TagMap() map[string]string        // Map of tags
+	Tags() map[string]string          // Map of tags
 	AddTag(key, value string)         // Add a tag
 	GetTag(key string) (string, bool) // Get a tag by its key
 	RemoveTag(key string)             // Remove a tag by its key
@@ -42,8 +42,8 @@ type CCMetric interface {
 	RemoveField(key string)                  // Remove a field addressed by its key
 }
 
-// MetaMap returns the meta data tags as key-value mapping
-func (m *ccMetric) MetaMap() map[string]string {
+// Meta returns the meta data tags as key-value mapping
+func (m *ccMetric) Meta() map[string]string {
 	return m.meta
 }
 
@@ -68,8 +68,8 @@ func (m *ccMetric) Name() string {
 	return m.name
 }
 
-// TagMap returns the the list of tags as key-value-mapping
-func (m *ccMetric) TagMap() map[string]string {
+// Tags returns the the list of tags as key-value-mapping
+func (m *ccMetric) Tags() map[string]string {
 	return m.tags
 }
 
@@ -248,10 +248,10 @@ func FromMetric(other ccMetric) CCMetric {
 		tm:     other.Time(),
 	}
 
-	for key, value := range other.TagMap() {
+	for key, value := range other.Tags() {
 		m.tags[key] = value
 	}
-	for key, value := range other.MetaMap() {
+	for key, value := range other.Meta() {
 		m.meta[key] = value
 	}
 
diff --git a/internal/metricRouter/metricRouter.go b/internal/metricRouter/metricRouter.go
index 242392d..83c14e7 100644
--- a/internal/metricRouter/metricRouter.go
+++ b/internal/metricRouter/metricRouter.go
@@ -141,10 +141,10 @@ func (r *metricRouter) EvalCondition(cond string, point lp.CCMetric) (bool, erro
 	// Add metric name, tags, meta data, fields and timestamp to the parameter list
 	params := make(map[string]interface{})
 	params["name"] = point.Name()
-	for key, value := range point.TagMap() {
+	for key, value := range point.Tags() {
 		params[key] = value
 	}
-	for key, value := range point.MetaMap() {
+	for key, value := range point.Meta() {
 		params[key] = value
 	}
 	for _, f := range point.FieldList() {
diff --git a/sinks/gangliaSink.go b/sinks/gangliaSink.go
index 66fd652..3fd48e7 100644
--- a/sinks/gangliaSink.go
+++ b/sinks/gangliaSink.go
@@ -30,7 +30,7 @@ func (s *GangliaSink) Write(point lp.CCMetric) error {
 	var err error = nil
 	var tagsstr []string
 	var argstr []string
-	for key, value := range point.TagMap() {
+	for key, value := range point.Tags() {
 		switch key {
 		case "cluster":
 			argstr = append(argstr, fmt.Sprintf("--cluster=%s", value))
diff --git a/sinks/influxSink.go b/sinks/influxSink.go
index c569305..7313490 100644
--- a/sinks/influxSink.go
+++ b/sinks/influxSink.go
@@ -62,11 +62,11 @@ func (s *InfluxSink) Init(config sinkConfig) error {
 func (s *InfluxSink) Write(point lp.CCMetric) error {
 	tags := map[string]string{}
 	fields := map[string]interface{}{}
-	for key, value := range point.TagMap() {
+	for key, value := range point.Tags() {
 		tags[key] = value
 	}
 	if s.meta_as_tags {
-		for key, value := range point.MetaMap() {
+		for key, value := range point.Meta() {
 			tags[key] = value
 		}
 	}