Generate influxDB point for data type ccMetric

sinks/influxAsyncSink.go

@@ -2,6 +2,7 @@ package sinks
 
 import (
 	//	"context"
+
 	"crypto/tls"
 	"encoding/json"
 	"errors"
@@ -11,7 +12,6 @@ import (
 	lp "github.com/ClusterCockpit/cc-metric-collector/internal/ccMetric"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api"
-	"github.com/influxdata/influxdb-client-go/v2/api/write"
 )
 
 type InfluxAsyncSinkConfig struct {
@@ -88,22 +88,9 @@ func (s *InfluxAsyncSink) Init(config json.RawMessage) error {
 	return err
 }
 
-func (s *InfluxAsyncSink) Write(point lp.CCMetric) error {
-	var p *write.Point
-	if s.config.MetaAsTags {
-		tags := map[string]string{}
-		for k, v := range point.Tags() {
-			tags[k] = v
-		}
-		for k, v := range point.Meta() {
-			tags[k] = v
-		}
-		p = influxdb2.NewPoint(point.Name(), tags, point.Fields(), point.Time())
-	} else {
-		p = influxdb2.NewPoint(point.Name(), point.Tags(), point.Fields(), point.Time())
-	}
-
-	s.writeApi.WritePoint(p)
+func (s *InfluxAsyncSink) Write(m lp.CCMetric) error {
+	s.writeApi.WritePoint(
+		m.ToPoint(s.config.MetaAsTags))
 	return nil
 }
 

sinks/influxSink.go

@@ -76,18 +76,12 @@ func (s *InfluxSink) Init(config json.RawMessage) error {
 	return s.connect()
 }
 
-func (s *InfluxSink) Write(point lp.CCMetric) error {
-	tags := make(map[string]string)
-	for key, value := range point.Tags() {
-		tags[key] = value
-	}
-	if s.config.MetaAsTags {
-		for key, value := range point.Meta() {
-			tags[key] = value
-		}
-	}
-	p := influxdb2.NewPoint(point.Name(), tags, point.Fields(), point.Time())
-	err := s.writeApi.WritePoint(context.Background(), p)
+func (s *InfluxSink) Write(m lp.CCMetric) error {
+	err :=
+		s.writeApi.WritePoint(
+			context.Background(),
+			m.ToPoint(s.config.MetaAsTags),
+		)
 	return err
 }