Meta to tags list and map for sinks (#63)

* Change ccMetric->Influx functions

* Use a meta_as_tags string list in config but create a lookup map afterwards

* Add meta as tag logic to sampleSink

internal/ccMetric/ccMetric.go

@@ -24,8 +24,8 @@ type ccMetric struct {
 
 // ccMetric access functions
 type CCMetric interface {
-	ToPoint(metaAsTags bool) *write.Point  // Generate influxDB point for data type ccMetric
+	ToPoint(metaAsTags map[string]bool) *write.Point  // Generate influxDB point for data type ccMetric
-	ToLineProtocol(metaAsTags bool) string // Generate influxDB line protocol for data type ccMetric
+	ToLineProtocol(metaAsTags map[string]bool) string // Generate influxDB line protocol for data type ccMetric
 
 	Name() string        // Get metric name
 	SetName(name string) // Set metric name
@@ -61,25 +61,18 @@ func (m *ccMetric) String() string {
 }
 
 // ToLineProtocol generates influxDB line protocol for data type ccMetric
-func (m *ccMetric) ToPoint(metaAsTags bool) (p *write.Point) {
+func (m *ccMetric) ToPoint(metaAsTags map[string]bool) (p *write.Point) {
-
+	p = influxdb2.NewPoint(m.name, m.tags, m.fields, m.tm)
-	if !metaAsTags {
+	for key, ok1 := range metaAsTags {
-		p = influxdb2.NewPoint(m.name, m.tags, m.fields, m.tm)
+		if val, ok2 := m.GetMeta(key); ok1 && ok2 {
-	} else {
+			p.AddTag(key, val)
-		tags := make(map[string]string, len(m.tags)+len(m.meta))
-		for key, value := range m.tags {
-			tags[key] = value
 		}
-		for key, value := range m.meta {
-			tags[key] = value
-		}
-		p = influxdb2.NewPoint(m.name, tags, m.fields, m.tm)
 	}
-	return
+	return p
 }
 
 // ToLineProtocol generates influxDB line protocol for data type ccMetric
-func (m *ccMetric) ToLineProtocol(metaAsTags bool) string {
+func (m *ccMetric) ToLineProtocol(metaAsTags map[string]bool) string {
 
 	return write.PointToLineProtocol(
 		m.ToPoint(metaAsTags),

sinks/httpSink.go

@@ -53,7 +53,7 @@ func (s *HttpSink) Write(m lp.CCMetric) error {
 		})
 	}
 
-	p := m.ToPoint(s.config.MetaAsTags)
+	p := m.ToPoint(s.meta_as_tags)
 
 	s.lock.Lock()
 	_, err := s.encoder.Encode(p)
@@ -159,6 +159,11 @@ func NewHttpSink(name string, config json.RawMessage) (Sink, error) {
 			s.flushDelay = t
 		}
 	}
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
 	tr := &http.Transport{
 		MaxIdleConns:    s.maxIdleConns,
 		IdleConnTimeout: s.idleConnTimeout,

sinks/influxAsyncSink.go

@@ -89,7 +89,7 @@ func (s *InfluxAsyncSink) connect() error {
 
 func (s *InfluxAsyncSink) Write(m lp.CCMetric) error {
 	s.writeApi.WritePoint(
-		m.ToPoint(s.config.MetaAsTags),
+		m.ToPoint(s.meta_as_tags),
 	)
 	return nil
 }
@@ -152,6 +152,11 @@ func NewInfluxAsyncSink(name string, config json.RawMessage) (Sink, error) {
 		len(s.config.Password) == 0 {
 		return nil, errors.New("not all configuration variables set required by InfluxAsyncSink")
 	}
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
 
 	toUint := func(duration string, def uint) uint {
 		t, err := time.ParseDuration(duration)

sinks/influxSink.go

@@ -83,7 +83,7 @@ func (s *InfluxSink) Write(m lp.CCMetric) error {
 	err :=
 		s.writeApi.WritePoint(
 			context.Background(),
-			m.ToPoint(s.config.MetaAsTags),
+			m.ToPoint(s.meta_as_tags),
 		)
 	return err
 }
@@ -120,6 +120,11 @@ func NewInfluxSink(name string, config json.RawMessage) (Sink, error) {
 		len(s.config.Password) == 0 {
 		return nil, errors.New("not all configuration variables set required by InfluxSink")
 	}
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
 
 	toUint := func(duration string, def uint) uint {
 		t, err := time.ParseDuration(duration)

sinks/metricSink.go

@@ -5,13 +5,13 @@ import (
 )
 
 type defaultSinkConfig struct {
-	MetaAsTags bool   `json:"meta_as_tags,omitempty"`
+	MetaAsTags []string `json:"meta_as_tags,omitempty"`
-	Type       string `json:"type"`
+	Type       string   `json:"type"`
 }
 
 type sink struct {
-	meta_as_tags bool   // Use meta data tags as tags
+	meta_as_tags map[string]bool // Use meta data tags as tags
-	name         string // Name of the sink
+	name         string          // Name of the sink
 }
 
 type Sink interface {

sinks/natsSink.go

@@ -55,7 +55,7 @@ func (s *NatsSink) connect() error {
 
 func (s *NatsSink) Write(m lp.CCMetric) error {
 	if s.client != nil {
-		_, err := s.encoder.Encode(m.ToPoint(s.config.MetaAsTags))
+		_, err := s.encoder.Encode(m.ToPoint(s.meta_as_tags))
 		if err != nil {
 			cclog.ComponentError(s.name, "Write:", err.Error())
 			return err
@@ -97,6 +97,11 @@ func NewNatsSink(name string, config json.RawMessage) (Sink, error) {
 		len(s.config.Database) == 0 {
 		return nil, errors.New("not all configuration variables set required by NatsSink")
 	}
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
 	// Setup Influx line protocol
 	s.buffer = &bytes.Buffer{}
 	s.buffer.Grow(1025)
@@ -105,7 +110,7 @@ func NewNatsSink(name string, config json.RawMessage) (Sink, error) {
 	s.encoder.SetMaxLineBytes(1024)
 	// Setup infos for connection
 	if err := s.connect(); err != nil {
-		return nil, fmt.Errorf("Unable to connect: %v", err)
+		return nil, fmt.Errorf("unable to connect: %v", err)
 	}
 	return s, nil
 }

sinks/sampleSink.go

@@ -10,14 +10,14 @@ import (
 )
 
 type SampleSinkConfig struct {
-	// defines JSON tags for 'type' and 'meta_as_tags'
+	// defines JSON tags for 'type' and 'meta_as_tags' (string list)
 	// See: metricSink.go
 	defaultSinkConfig
 	// Additional config options, for SampleSink
 }
 
 type SampleSink struct {
-	// declares elements 	'name' and 'meta_as_tags'
+	// declares elements 	'name' and 'meta_as_tags' (string to bool map!)
 	sink
 	config SampleSinkConfig // entry point to the SampleSinkConfig
 }
@@ -28,6 +28,7 @@ type SampleSink struct {
 
 // Code to submit a single CCMetric to the sink
 func (s *SampleSink) Write(point lp.CCMetric) error {
+	// based on s.meta_as_tags use meta infos as tags
 	log.Print(point)
 	return nil
 }
@@ -62,6 +63,12 @@ func NewSampleSink(name string, config json.RawMessage) (Sink, error) {
 		}
 	}
 
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
+
 	// Check if all required fields in the config are set
 	// E.g. use 'len(s.config.Option) > 0' for string settings
 

sinks/stdoutSink.go

@@ -63,7 +63,11 @@ func NewStdoutSink(name string, config json.RawMessage) (Sink, error) {
 			s.output = f
 		}
 	}
-	s.meta_as_tags = s.config.MetaAsTags
+	// Create lookup map to use meta infos as tags in the output metric
+	s.meta_as_tags = make(map[string]bool)
+	for _, k := range s.config.MetaAsTags {
+		s.meta_as_tags[k] = true
+	}
 
 	return s, nil
 }