diff --git a/agent/accumulator_test.go b/agent/accumulator_test.go
index e5b07a09e7f3e860afa47998189eadfa40f538be..6ff8b9224b2e6798b96d9a06b3e647c2ba154cdc 100644
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -42,7 +42,7 @@ func TestAdd(t *testing.T) {
testm = <-metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
actual)
}
@@ -70,7 +70,7 @@ func TestAddFields(t *testing.T) {
testm = <-metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test usage=99 %d", now.UnixNano()),
+ fmt.Sprintf("acctest,acc=test usage=99 %d\n", now.UnixNano()),
actual)
}
@@ -126,7 +126,7 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800000000000)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
actual)
}
@@ -158,7 +158,7 @@ func TestAddDisablePrecision(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082912748)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
actual)
}
@@ -190,7 +190,7 @@ func TestAddNoPrecisionWithInterval(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800000000000)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
actual)
}
@@ -207,7 +207,7 @@ func TestDifferentPrecisions(t *testing.T) {
testm := <-a.metrics
actual := testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800000000000)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800000000000)),
actual)
a.SetPrecision(0, time.Millisecond)
@@ -217,7 +217,7 @@ func TestDifferentPrecisions(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800083000000)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800083000000)),
actual)
a.SetPrecision(0, time.Microsecond)
@@ -227,7 +227,7 @@ func TestDifferentPrecisions(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082913000)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082913000)),
actual)
a.SetPrecision(0, time.Nanosecond)
@@ -237,7 +237,7 @@ func TestDifferentPrecisions(t *testing.T) {
testm = <-a.metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", int64(1139572800082912748)),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", int64(1139572800082912748)),
actual)
}
@@ -270,7 +270,7 @@ func TestAddGauge(t *testing.T) {
testm = <-metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
actual)
assert.Equal(t, testm.Type(), telegraf.Gauge)
}
@@ -304,7 +304,7 @@ func TestAddCounter(t *testing.T) {
testm = <-metrics
actual = testm.String()
assert.Equal(t,
- fmt.Sprintf("acctest,acc=test value=101 %d", now.UnixNano()),
+ fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
actual)
assert.Equal(t, testm.Type(), telegraf.Counter)
}
@@ -328,11 +328,11 @@ func (tm *TestMetricMaker) MakeMetric(
return m
}
case telegraf.Counter:
- if m, err := telegraf.NewCounterMetric(measurement, tags, fields, t); err == nil {
+ if m, err := metric.New(measurement, tags, fields, t, telegraf.Counter); err == nil {
return m
}
case telegraf.Gauge:
- if m, err := telegraf.NewGaugeMetric(measurement, tags, fields, t); err == nil {
+ if m, err := metric.New(measurement, tags, fields, t, telegraf.Gauge); err == nil {
return m
}
}
diff --git a/internal/models/running_aggregator_test.go b/internal/models/running_aggregator_test.go
index 834f7d1e0118f8f3899d0e73f55c8d393f2da43f..30279f0ee1c2834ab703590fca9d3a0233946115 100644
--- a/internal/models/running_aggregator_test.go
+++ b/internal/models/running_aggregator_test.go
@@ -184,8 +184,8 @@ func TestMakeMetricA(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
@@ -202,8 +202,8 @@ func TestMakeMetricA(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
@@ -220,8 +220,8 @@ func TestMakeMetricA(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
diff --git a/internal/models/running_input_test.go b/internal/models/running_input_test.go
index 3d3b65b953151bf730e79682a73fa3f95f49a67f..d5fd5ae0c71848843b48ffe1b10f2bfadf8bc501 100644
--- a/internal/models/running_input_test.go
+++ b/internal/models/running_input_test.go
@@ -50,7 +50,7 @@ func TestMakeMetricNilFields(t *testing.T) {
)
assert.Equal(
t,
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
)
}
@@ -78,8 +78,8 @@ func TestMakeMetric(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
@@ -96,8 +96,8 @@ func TestMakeMetric(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
@@ -114,8 +114,8 @@ func TestMakeMetric(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
assert.Equal(
t,
@@ -148,8 +148,8 @@ func TestMakeMetricWithPluginTags(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest,foo=bar value=101i %d", now.UnixNano()),
)
}
@@ -204,8 +204,8 @@ func TestMakeMetricWithDaemonTags(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest,foo=bar value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest,foo=bar value=101i %d", now.UnixNano()),
)
}
@@ -237,8 +237,8 @@ func TestMakeMetricInfFields(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest value=101i %d", now.UnixNano()),
)
}
@@ -275,11 +275,20 @@ func TestMakeMetricAllFieldTypes(t *testing.T) {
telegraf.Untyped,
now,
)
- assert.Equal(
- t,
- fmt.Sprintf("RITest a=10i,b=10i,c=10i,d=10i,e=10i,f=10i,g=10i,h=10i,i=10i,j=10,k=9223372036854775807i,l=\"foobar\",m=true %d", now.UnixNano()),
- m.String(),
- )
+ assert.Contains(t, m.String(), "a=10i")
+ assert.Contains(t, m.String(), "b=10i")
+ assert.Contains(t, m.String(), "c=10i")
+ assert.Contains(t, m.String(), "d=10i")
+ assert.Contains(t, m.String(), "e=10i")
+ assert.Contains(t, m.String(), "f=10i")
+ assert.Contains(t, m.String(), "g=10i")
+ assert.Contains(t, m.String(), "h=10i")
+ assert.Contains(t, m.String(), "i=10i")
+ assert.Contains(t, m.String(), "j=10")
+ assert.NotContains(t, m.String(), "j=10i")
+ assert.Contains(t, m.String(), "k=9223372036854775807i")
+ assert.Contains(t, m.String(), "l=\"foobar\"")
+ assert.Contains(t, m.String(), "m=true")
}
func TestMakeMetricNameOverride(t *testing.T) {
@@ -300,8 +309,8 @@ func TestMakeMetricNameOverride(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("foobar value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("foobar value=101i %d", now.UnixNano()),
)
}
@@ -323,8 +332,8 @@ func TestMakeMetricNamePrefix(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("foobar_RITest value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("foobar_RITest value=101i %d", now.UnixNano()),
)
}
@@ -346,7 +355,7 @@ func TestMakeMetricNameSuffix(t *testing.T) {
)
assert.Equal(
t,
+ fmt.Sprintf("RITest_foobar value=101i %d\n", now.UnixNano()),
m.String(),
- fmt.Sprintf("RITest_foobar value=101i %d", now.UnixNano()),
)
}
diff --git a/internal/models/running_output_test.go b/internal/models/running_output_test.go
index 2bca79a067b014c5626ea7ac0a4ba5fcc7b93488..2555025fa107edaf4ce353ecdcfa929a7d981e6e 100644
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -39,7 +39,7 @@ func BenchmarkRunningOutputAddWrite(b *testing.B) {
ro.Quiet = true
for n := 0; n < b.N; n++ {
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
ro.Write()
}
}
@@ -55,7 +55,7 @@ func BenchmarkRunningOutputAddWriteEvery100(b *testing.B) {
ro.Quiet = true
for n := 0; n < b.N; n++ {
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
if n%100 == 0 {
ro.Write()
}
@@ -74,7 +74,7 @@ func BenchmarkRunningOutputAddFailWrites(b *testing.B) {
ro.Quiet = true
for n := 0; n < b.N; n++ {
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
}
}
@@ -140,7 +140,7 @@ func TestRunningOutput_TagIncludeNoMatch(t *testing.T) {
m := &mockOutput{}
ro := NewRunningOutput("test", m, conf, 1000, 10000)
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
assert.Len(t, m.Metrics(), 0)
err := ro.Write()
@@ -161,7 +161,7 @@ func TestRunningOutput_TagExcludeMatch(t *testing.T) {
m := &mockOutput{}
ro := NewRunningOutput("test", m, conf, 1000, 10000)
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
assert.Len(t, m.Metrics(), 0)
err := ro.Write()
@@ -182,7 +182,7 @@ func TestRunningOutput_TagExcludeNoMatch(t *testing.T) {
m := &mockOutput{}
ro := NewRunningOutput("test", m, conf, 1000, 10000)
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
assert.Len(t, m.Metrics(), 0)
err := ro.Write()
@@ -203,7 +203,7 @@ func TestRunningOutput_TagIncludeMatch(t *testing.T) {
m := &mockOutput{}
ro := NewRunningOutput("test", m, conf, 1000, 10000)
- ro.AddMetric(first5[0])
+ ro.AddMetric(testutil.TestMetric(101, "metric1"))
assert.Len(t, m.Metrics(), 0)
err := ro.Write()
diff --git a/metric/metric.go b/metric/metric.go
index 45accde90094b753a51daf3cf41afebf4571c0ac..a964d60154393feabf1b4f9146a1c2ede2518140 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -15,6 +15,8 @@ import (
"github.com/influxdata/influxdb/client/v2"
)
+const MaxInt = int(^uint(0) >> 1)
+
var (
// escaper is for escaping:
// - tag keys
@@ -63,7 +65,6 @@ func New(
m.tags = append(m.tags, []byte("="+escaper.Replace(v))...)
}
- m.fields = []byte{' '}
i := 0
for k, v := range fields {
if i != 0 {
@@ -72,7 +73,6 @@ func New(
m.fields = appendField(m.fields, k, v)
i++
}
- m.fields = append(m.fields, ' ')
return m, nil
}
@@ -103,6 +103,9 @@ func indexUnescapedByte(buf []byte, b byte) int {
func countBackslashes(buf []byte, index int) int {
var count int
for {
+ if index < 0 {
+ return count
+ }
if buf[index] == '\\' {
count++
index--
@@ -130,7 +133,8 @@ type metric struct {
}
func (m *metric) Point() *client.Point {
- return &client.Point{}
+ c, _ := client.NewPoint(m.Name(), m.Tags(), m.Fields(), m.Time())
+ return c
}
func (m *metric) String() string {
@@ -150,16 +154,25 @@ func (m *metric) Type() telegraf.ValueType {
}
func (m *metric) Len() int {
- return len(m.name) + len(m.tags) + len(m.fields) + len(m.t) + 1
+ return len(m.name) + len(m.tags) + 1 + len(m.fields) + 1 + len(m.t) + 1
}
func (m *metric) Serialize() []byte {
tmp := make([]byte, m.Len())
- copy(tmp, m.name)
- copy(tmp[len(m.name):], m.tags)
- copy(tmp[len(m.name)+len(m.tags):], m.fields)
- copy(tmp[len(m.name)+len(m.tags)+len(m.fields):], m.t)
- tmp[len(tmp)-1] = '\n'
+ i := 0
+ copy(tmp[i:], m.name)
+ i += len(m.name)
+ copy(tmp[i:], m.tags)
+ i += len(m.tags)
+ tmp[i] = ' '
+ i++
+ copy(tmp[i:], m.fields)
+ i += len(m.fields)
+ tmp[i] = ' '
+ i++
+ copy(tmp[i:], m.t)
+ i += len(m.t)
+ tmp[i] = '\n'
return tmp
}
@@ -170,7 +183,7 @@ func (m *metric) Fields() map[string]interface{} {
}
m.fieldMap = map[string]interface{}{}
- i := 1
+ i := 0
for {
if i >= len(m.fields) {
break
@@ -182,10 +195,20 @@ func (m *metric) Fields() map[string]interface{} {
}
// start index of field value
i2 := i1 + 1
+
// end index of field value
- i3 := indexUnescapedByte(m.fields[i:], ',')
- if i3 == -1 {
- i3 = len(m.fields[i:]) - 1
+ var i3 int
+ if m.fields[i:][i2] == '"' {
+ i3 = indexUnescapedByte(m.fields[i:][i2+1:], '"')
+ if i3 == -1 {
+ i3 = len(m.fields[i:])
+ }
+ i3 += i2 + 2 // increment index to the comma
+ } else {
+ i3 = indexUnescapedByte(m.fields[i:], ',')
+ if i3 == -1 {
+ i3 = len(m.fields[i:])
+ }
}
switch m.fields[i:][i2] {
@@ -213,9 +236,9 @@ func (m *metric) Fields() map[string]interface{} {
}
}
case 'T', 't':
- // TODO handle "true" booleans
+ m.fieldMap[string(m.fields[i:][0:i1])] = true
case 'F', 'f':
- // TODO handle "false" booleans
+ m.fieldMap[string(m.fields[i:][0:i1])] = false
default:
// TODO handle unsupported field type
}
@@ -309,6 +332,7 @@ func (m *metric) HasTag(key string) bool {
func (m *metric) RemoveTag(key string) bool {
m.tagMap = nil
m.hashID = 0
+
i := bytes.Index(m.tags, []byte(escaper.Replace(key)+"="))
if i == -1 {
return false
@@ -355,21 +379,17 @@ func (m *metric) RemoveField(key string) bool {
}
func (m *metric) Copy() telegraf.Metric {
- name := make([]byte, len(m.name))
- tags := make([]byte, len(m.tags))
- fields := make([]byte, len(m.fields))
- t := make([]byte, len(m.t))
- copy(name, m.name)
- copy(tags, m.tags)
- copy(fields, m.fields)
- copy(t, m.t)
- return &metric{
- name: name,
- tags: tags,
- fields: fields,
- t: t,
- hashID: m.hashID,
+ mOut := metric{
+ name: make([]byte, len(m.name)),
+ tags: make([]byte, len(m.tags)),
+ fields: make([]byte, len(m.fields)),
+ t: make([]byte, len(m.t)),
}
+ copy(mOut.name, m.name)
+ copy(mOut.tags, m.tags)
+ copy(mOut.fields, m.fields)
+ copy(mOut.t, m.t)
+ return &mOut
}
func (m *metric) HashID() uint64 {
@@ -423,6 +443,16 @@ func appendField(b []byte, k string, v interface{}) []byte {
case int:
b = strconv.AppendInt(b, int64(v), 10)
b = append(b, 'i')
+ case uint64:
+ // Cap uints above the maximum int value
+ var intv int64
+ if v <= uint64(MaxInt) {
+ intv = int64(v)
+ } else {
+ intv = int64(MaxInt)
+ }
+ b = strconv.AppendInt(b, intv, 10)
+ b = append(b, 'i')
case uint32:
b = strconv.AppendInt(b, int64(v), 10)
b = append(b, 'i')
@@ -432,11 +462,15 @@ func appendField(b []byte, k string, v interface{}) []byte {
case uint8:
b = strconv.AppendInt(b, int64(v), 10)
b = append(b, 'i')
- // TODO: 'uint' should be considered just as "dangerous" as a uint64,
- // perhaps the value should be checked and capped at MaxInt64? We could
- // then include uint64 as an accepted value
case uint:
- b = strconv.AppendInt(b, int64(v), 10)
+ // Cap uints above the maximum int value
+ var intv int64
+ if v <= uint(MaxInt) {
+ intv = int64(v)
+ } else {
+ intv = int64(MaxInt)
+ }
+ b = strconv.AppendInt(b, intv, 10)
b = append(b, 'i')
case float32:
b = strconv.AppendFloat(b, float64(v), 'f', -1, 32)
diff --git a/metric/metric_benchmark_test.go b/metric/metric_benchmark_test.go
index 302c7af6f16bf3e982fa4c057c032f0286121548..e88e01e11caec3a244434c0df4bb70523847223a 100644
--- a/metric/metric_benchmark_test.go
+++ b/metric/metric_benchmark_test.go
@@ -4,6 +4,8 @@ import (
"fmt"
"testing"
"time"
+
+ "github.com/influxdata/telegraf"
)
// vars for making sure that the compiler doesnt optimize out the benchmarks:
@@ -15,9 +17,9 @@ var (
)
func BenchmarkNewMetric(b *testing.B) {
- var mt Metric
+ var mt telegraf.Metric
for n := 0; n < b.N; n++ {
- mt, _ = NewMetric("test_metric",
+ mt, _ = New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
@@ -35,9 +37,9 @@ func BenchmarkNewMetric(b *testing.B) {
}
func BenchmarkNewMetricAndInspect(b *testing.B) {
- var mt Metric
+ var mt telegraf.Metric
for n := 0; n < b.N; n++ {
- mt, _ = NewMetric("test_metric",
+ mt, _ = New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
@@ -59,7 +61,7 @@ func BenchmarkNewMetricAndInspect(b *testing.B) {
}
func BenchmarkTags(b *testing.B) {
- var mt, _ = NewMetric("test_metric",
+ var mt, _ = New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
@@ -79,7 +81,7 @@ func BenchmarkTags(b *testing.B) {
}
func BenchmarkFields(b *testing.B) {
- var mt, _ = NewMetric("test_metric",
+ var mt, _ = New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
@@ -99,7 +101,7 @@ func BenchmarkFields(b *testing.B) {
}
func BenchmarkSerializeMetric(b *testing.B) {
- mt, _ := NewMetric("test_metric",
+ mt, _ := New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
@@ -120,7 +122,7 @@ func BenchmarkSerializeMetric(b *testing.B) {
}
func BenchmarkSerializeMetricBytes(b *testing.B) {
- mt, _ := NewMetric("test_metric",
+ mt, _ := New("test_metric",
map[string]string{
"test_tag_1": "tag_value_1",
"test_tag_2": "tag_value_2",
diff --git a/metric/metric_test.go b/metric/metric_test.go
index da556c9bbfde941b6ec81af71315224818fe6684..f60669738e4b7729a4e34589e3d794a986cc7f38 100644
--- a/metric/metric_test.go
+++ b/metric/metric_test.go
@@ -6,6 +6,8 @@ import (
"testing"
"time"
+ "github.com/influxdata/telegraf"
+
"github.com/stretchr/testify/assert"
)
@@ -23,7 +25,7 @@ func TestNewMetric(t *testing.T) {
m, err := New("cpu", tags, fields, now)
assert.NoError(t, err)
- assert.Equal(t, Untyped, m.Type())
+ assert.Equal(t, telegraf.Untyped, m.Type())
assert.Equal(t, tags, m.Tags())
assert.Equal(t, fields, m.Fields())
assert.Equal(t, "cpu", m.Name())
@@ -42,10 +44,10 @@ func TestNewGaugeMetric(t *testing.T) {
"usage_idle": float64(99),
"usage_busy": float64(1),
}
- m, err := New("cpu", tags, fields, now, Gauge)
+ m, err := New("cpu", tags, fields, now, telegraf.Gauge)
assert.NoError(t, err)
- assert.Equal(t, Gauge, m.Type())
+ assert.Equal(t, telegraf.Gauge, m.Type())
assert.Equal(t, tags, m.Tags())
assert.Equal(t, fields, m.Fields())
assert.Equal(t, "cpu", m.Name())
@@ -64,10 +66,10 @@ func TestNewCounterMetric(t *testing.T) {
"usage_idle": float64(99),
"usage_busy": float64(1),
}
- m, err := New("cpu", tags, fields, now, Counter)
+ m, err := New("cpu", tags, fields, now, telegraf.Counter)
assert.NoError(t, err)
- assert.Equal(t, Counter, m.Type())
+ assert.Equal(t, telegraf.Counter, m.Type())
assert.Equal(t, tags, m.Tags())
assert.Equal(t, fields, m.Fields())
assert.Equal(t, "cpu", m.Name())
diff --git a/metric/parse.go b/metric/parse.go
index 472c19c3b5caddd64b1f2baec1453117a7836c6d..0b105024b3b3ec8722b67a89fe8638de025de9b6 100644
--- a/metric/parse.go
+++ b/metric/parse.go
@@ -45,28 +45,25 @@ func Parse(buf []byte) ([]telegraf.Metric, error) {
func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
metrics := make([]telegraf.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
- var (
- errStr string
- line []byte
- err error
- )
- b := bytes.NewBuffer(buf)
+ var errStr string
+ i := 0
for {
- line, err = b.ReadBytes('\n')
- if err != nil {
+ j := bytes.IndexByte(buf[i:], '\n')
+ if j == -1 {
break
}
- if len(line) < 2 {
+ if len(buf[i:i+j]) < 2 {
+ i += j + 1 // increment i past the previous newline
continue
}
- // trim the newline:
- line = line[0 : len(line)-1]
- m, err := parseMetric(line, t)
+ m, err := parseMetric(buf[i:i+j], t)
if err != nil {
+ i += j + 1 // increment i past the previous newline
errStr += " " + err.Error()
continue
}
+ i += j + 1 // increment i past the previous newline
metrics = append(metrics, m)
}
@@ -135,7 +132,10 @@ func parseMetric(buf []byte, defaultTime time.Time) (telegraf.Metric, error) {
m.t = []byte(dTime)
}
- return m, nil
+ // here we copy on return because this allows us to later call
+ // AddTag, AddField, RemoveTag, RemoveField, etc. without worrying about
+ // modifying 'tag' bytes having an affect on 'field' bytes, for example.
+ return m.Copy(), nil
}
// scanKey scans buf starting at i for the measurement and tag portion of the point.
diff --git a/plugins/aggregators/minmax/minmax_test.go b/plugins/aggregators/minmax/minmax_test.go
index 5c4a2eda93ff59ea1fd26b399642a858da46ee3b..d6053a372e8d9b6cf7621c8f288b983d23698746 100644
--- a/plugins/aggregators/minmax/minmax_test.go
+++ b/plugins/aggregators/minmax/minmax_test.go
@@ -4,7 +4,6 @@ import (
"testing"
"time"
- "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
"github.com/influxdata/telegraf/testutil"
)
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index ac527a12f57907570d3affb39ee4f1735833cc1a..71d33fb71bf8a156d6eb9fc81fb215c0983ac1ee 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -36,7 +36,7 @@ const malformedJson = `
"status": "green",
`
-const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1"
+const lineProtocol = "cpu,host=foo,datacenter=us-east usage_idle=99,usage_busy=1\n"
const lineProtocolMulti = `
cpu,cpu=cpu0,host=foo,datacenter=us-east usage_idle=99,usage_busy=1
diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go
index ddc9ac7bf8cecc334fa0c0ea3c34a9bb57682669..3d3467d718f84b9d6041972d02328a9f433129c8 100644
--- a/plugins/inputs/http_listener/http_listener.go
+++ b/plugins/inputs/http_listener/http_listener.go
@@ -248,7 +248,7 @@ func (h *HTTPListener) serveWrite(res http.ResponseWriter, req *http.Request) {
bufStart = 0
continue
}
- if err := h.parse(buf[:i], now); err != nil {
+ if err := h.parse(buf[:i+1], now); err != nil {
log.Println("E! " + err.Error())
return400 = true
}
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
index e823f49a55c38197d44af07080fa68c832148e6d..c1c93e7cb4155c889f3e90f570de66e57a960f9c 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go
@@ -23,7 +23,7 @@ func TestReadsMetricsFromKafka(t *testing.T) {
testTopic := fmt.Sprintf("telegraf_test_topic_%d", time.Now().Unix())
// Send a Kafka message to the kafka host
- msg := "cpu_load_short,direction=in,host=server01,region=us-west value=23422.0 1422568543702900257"
+ msg := "cpu_load_short,direction=in,host=server01,region=us-west value=23422.0 1422568543702900257\n"
producer, err := sarama.NewSyncProducer(brokerPeers, nil)
require.NoError(t, err)
_, _, err = producer.SendMessage(
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 609dc6a377d8da34498dfa4865dbb2bf6a2803da..1777aa89e8859734bedbdd37e721191c4be3ca09 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -12,10 +12,10 @@ import (
)
const (
- testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257"
+ testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257\n"
testMsgGraphite = "cpu.load.short.graphite 23422 1454780029"
testMsgJSON = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
- invalidMsg = "cpu_load_short,host=server01 1422568543702900257"
+ invalidMsg = "cpu_load_short,host=server01 1422568543702900257\n"
)
func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) {
diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
index 7090a46c35edf31cefadff3a378c5a41be3bf892..7b8e0b834e71812684438e17c0a969780ca16127 100644
--- a/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
+++ b/plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
@@ -13,10 +13,10 @@ import (
)
const (
- testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257"
+ testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257\n"
testMsgGraphite = "cpu.load.short.graphite 23422 1454780029"
testMsgJSON = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
- invalidMsg = "cpu_load_short,host=server01 1422568543702900257"
+ invalidMsg = "cpu_load_short,host=server01 1422568543702900257\n"
)
func newTestMQTTConsumer() (*MQTTConsumer, chan mqtt.Message) {
diff --git a/plugins/inputs/nats_consumer/nats_consumer_test.go b/plugins/inputs/nats_consumer/nats_consumer_test.go
index 206714b1a55495160ba5d7732d1dc8a6044332b9..2f4d14d7337b9ba09bbffe9e596e27a668a5ed25 100644
--- a/plugins/inputs/nats_consumer/nats_consumer_test.go
+++ b/plugins/inputs/nats_consumer/nats_consumer_test.go
@@ -10,10 +10,10 @@ import (
)
const (
- testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257"
+ testMsg = "cpu_load_short,host=server01 value=23422.0 1422568543702900257\n"
testMsgGraphite = "cpu.load.short.graphite 23422 1454780029"
testMsgJSON = "{\"a\": 5, \"b\": {\"c\": 6}}\n"
- invalidMsg = "cpu_load_short,host=server01 1422568543702900257"
+ invalidMsg = "cpu_load_short,host=server01 1422568543702900257\n"
metricBuffer = 5
)
diff --git a/plugins/inputs/nsq_consumer/nsq_consumer_test.go b/plugins/inputs/nsq_consumer/nsq_consumer_test.go
index 59db675a552e10e6493de1c0b16307e6eba39f35..9342e13acfd7e29b50d35b698dc9d2b4c597c2d3 100644
--- a/plugins/inputs/nsq_consumer/nsq_consumer_test.go
+++ b/plugins/inputs/nsq_consumer/nsq_consumer_test.go
@@ -20,7 +20,7 @@ import (
// This test is modeled after the kafka consumer integration test
func TestReadsMetricsFromNSQ(t *testing.T) {
msgID := nsq.MessageID{'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'a', 's', 'd', 'f', 'g', 'h'}
- msg := nsq.NewMessage(msgID, []byte("cpu_load_short,direction=in,host=server01,region=us-west value=23422.0 1422568543702900257"))
+ msg := nsq.NewMessage(msgID, []byte("cpu_load_short,direction=in,host=server01,region=us-west value=23422.0 1422568543702900257\n"))
script := []instruction{
// SUB
diff --git a/plugins/inputs/prometheus/parser_test.go b/plugins/inputs/prometheus/parser_test.go
index 4f2a8516f4b311c7e6b754880cfc53efe6702a56..161c3449bbff99cf4485174a72a549af76282586 100644
--- a/plugins/inputs/prometheus/parser_test.go
+++ b/plugins/inputs/prometheus/parser_test.go
@@ -111,9 +111,11 @@ func TestParseValidPrometheus(t *testing.T) {
"gauge": float64(1),
}, metrics[0].Fields())
assert.Equal(t, map[string]string{
- "osVersion": "CentOS Linux 7 (Core)",
- "dockerVersion": "1.8.2",
- "kernelVersion": "3.10.0-229.20.1.el7.x86_64",
+ "osVersion": "CentOS\\ Linux\\ 7\\ (Core)",
+ "dockerVersion": "1.8.2",
+ "kernelVersion": "3.10.0-229.20.1.el7.x86_64",
+ "cadvisorRevision": "",
+ "cadvisorVersion": "",
}, metrics[0].Tags())
// Counter value
diff --git a/plugins/inputs/tcp_listener/tcp_listener.go b/plugins/inputs/tcp_listener/tcp_listener.go
index 861442348ae13cfbf962f27deecafacc35a7d65f..41c8fd481a6048019bd9e60b6d7e1c7ec1ef21b6 100644
--- a/plugins/inputs/tcp_listener/tcp_listener.go
+++ b/plugins/inputs/tcp_listener/tcp_listener.go
@@ -212,8 +212,9 @@ func (t *TcpListener) handler(conn *net.TCPConn, id string) {
if n == 0 {
continue
}
- bufCopy := make([]byte, n)
+ bufCopy := make([]byte, n+1)
copy(bufCopy, scanner.Bytes())
+ bufCopy[n] = '\n'
select {
case t.in <- bufCopy:
diff --git a/plugins/inputs/udp_listener/udp_listener_test.go b/plugins/inputs/udp_listener/udp_listener_test.go
index fa9980682c19e0e8c3b70c0098324d6e9109d0c0..eefdd593ed31ccad4465bf6b3f26dd6db7a30b31 100644
--- a/plugins/inputs/udp_listener/udp_listener_test.go
+++ b/plugins/inputs/udp_listener/udp_listener_test.go
@@ -106,7 +106,7 @@ func TestConnectUDP(t *testing.T) {
func TestRunParser(t *testing.T) {
log.SetOutput(ioutil.Discard)
- var testmsg = []byte("cpu_load_short,host=server01 value=12.0 1422568543702900257")
+ var testmsg = []byte("cpu_load_short,host=server01 value=12.0 1422568543702900257\n")
listener, in := newTestUdpListener()
acc := testutil.Accumulator{}
diff --git a/plugins/outputs/instrumental/instrumental.go b/plugins/outputs/instrumental/instrumental.go
index 8750f0693dd09922919f8098216738e9164cfeb4..e10fcbb065cd2d49b27cd7ddd70e4dd93826ed1f 100644
--- a/plugins/outputs/instrumental/instrumental.go
+++ b/plugins/outputs/instrumental/instrumental.go
@@ -156,7 +156,7 @@ func (i *Instrumental) Write(metrics []telegraf.Metric) error {
}
}
- allPoints := strings.Join(points, "\n") + "\n"
+ allPoints := strings.Join(points, "")
_, err = fmt.Fprintf(i.conn, allPoints)
if err != nil {
diff --git a/plugins/outputs/kinesis/kinesis_test.go b/plugins/outputs/kinesis/kinesis_test.go
index b398d7e8a4933c82bc121dfa7f672de03cefa19e..de365fa997eae58cbacc3a4688732368a7779d60 100644
--- a/plugins/outputs/kinesis/kinesis_test.go
+++ b/plugins/outputs/kinesis/kinesis_test.go
@@ -17,7 +17,7 @@ func TestFormatMetric(t *testing.T) {
p := testutil.MockMetrics()[0]
- valid_string := "test1,tag1=value1 value=1 1257894000000000000"
+ valid_string := "test1,tag1=value1 value=1 1257894000000000000\n"
func_string, err := FormatMetric(k, p)
if func_string != valid_string {
@@ -29,7 +29,7 @@ func TestFormatMetric(t *testing.T) {
Format: "custom",
}
- valid_custom := "test1,map[tag1:value1],test1,tag1=value1 value=1 1257894000000000000"
+ valid_custom := "test1,map[tag1:value1],test1,tag1=value1 value=1 1257894000000000000\n"
func_custom, err := FormatMetric(k, p)
if func_custom != valid_custom {
diff --git a/plugins/outputs/librato/librato_test.go b/plugins/outputs/librato/librato_test.go
index cef393e063f6922a39addd3c77bb0fb81621400e..fe3931374275189e8297b7e95b46eb740c7fe4a6 100644
--- a/plugins/outputs/librato/librato_test.go
+++ b/plugins/outputs/librato/librato_test.go
@@ -163,14 +163,14 @@ func TestBuildGauge(t *testing.T) {
}
}
-func newHostMetric(value interface{}, name, host string) (metric telegraf.Metric) {
- metric, _ = metric.New(
+func newHostMetric(value interface{}, name, host string) telegraf.Metric {
+ m, _ := metric.New(
name,
map[string]string{"host": host},
map[string]interface{}{"value": value},
time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
)
- return
+ return m
}
func TestBuildGaugeWithSource(t *testing.T) {
diff --git a/plugins/parsers/graphite/parser_test.go b/plugins/parsers/graphite/parser_test.go
index ff33b32fe6c5fe26de80fb22e45bc33964ae2abd..af0cf3fb8671c11651b36d64343c81a7b3f54753 100644
--- a/plugins/parsers/graphite/parser_test.go
+++ b/plugins/parsers/graphite/parser_test.go
@@ -6,7 +6,6 @@ import (
"testing"
"time"
- "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
"github.com/stretchr/testify/assert"
@@ -505,16 +504,11 @@ func TestFilterMatchMostLongestFilter(t *testing.T) {
t.Fatalf("unexpected error creating parser, got %v", err)
}
- exp, err := metric.New("cpu_load",
- map[string]string{"host": "localhost", "resource": "cpu"},
- map[string]interface{}{"value": float64(11)},
- time.Unix(1435077219, 0))
- assert.NoError(t, err)
-
m, err := p.ParseLine("servers.localhost.cpu.cpu_load 11 1435077219")
assert.NoError(t, err)
- assert.Equal(t, exp.String(), m.String())
+ assert.Contains(t, m.String(), ",host=localhost")
+ assert.Contains(t, m.String(), ",resource=cpu")
}
func TestFilterMatchMultipleWildcards(t *testing.T) {
@@ -551,16 +545,12 @@ func TestParseDefaultTags(t *testing.T) {
t.Fatalf("unexpected error creating parser, got %v", err)
}
- exp, err := metric.New("cpu_load",
- map[string]string{"host": "localhost", "region": "us-east", "zone": "1c"},
- map[string]interface{}{"value": float64(11)},
- time.Unix(1435077219, 0))
- assert.NoError(t, err)
-
m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
assert.NoError(t, err)
- assert.Equal(t, exp.String(), m.String())
+ assert.Contains(t, m.String(), ",host=localhost")
+ assert.Contains(t, m.String(), ",region=us-east")
+ assert.Contains(t, m.String(), ",zone=1c")
}
func TestParseDefaultTemplateTags(t *testing.T) {
@@ -572,16 +562,12 @@ func TestParseDefaultTemplateTags(t *testing.T) {
t.Fatalf("unexpected error creating parser, got %v", err)
}
- exp, err := metric.New("cpu_load",
- map[string]string{"host": "localhost", "region": "us-east", "zone": "1c"},
- map[string]interface{}{"value": float64(11)},
- time.Unix(1435077219, 0))
- assert.NoError(t, err)
-
m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
assert.NoError(t, err)
- assert.Equal(t, exp.String(), m.String())
+ assert.Contains(t, m.String(), ",host=localhost")
+ assert.Contains(t, m.String(), ",region=us-east")
+ assert.Contains(t, m.String(), ",zone=1c")
}
func TestParseDefaultTemplateTagsOverridGlobal(t *testing.T) {
@@ -593,16 +579,12 @@ func TestParseDefaultTemplateTagsOverridGlobal(t *testing.T) {
t.Fatalf("unexpected error creating parser, got %v", err)
}
- exp, err := metric.New("cpu_load",
- map[string]string{"host": "localhost", "region": "us-east", "zone": "1c"},
- map[string]interface{}{"value": float64(11)},
- time.Unix(1435077219, 0))
- assert.NoError(t, err)
-
m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
assert.NoError(t, err)
- assert.Equal(t, exp.String(), m.String())
+ assert.Contains(t, m.String(), ",host=localhost")
+ assert.Contains(t, m.String(), ",region=us-east")
+ assert.Contains(t, m.String(), ",zone=1c")
}
func TestParseTemplateWhitespace(t *testing.T) {
@@ -616,16 +598,12 @@ func TestParseTemplateWhitespace(t *testing.T) {
t.Fatalf("unexpected error creating parser, got %v", err)
}
- exp, err := metric.New("cpu_load",
- map[string]string{"host": "localhost", "region": "us-east", "zone": "1c"},
- map[string]interface{}{"value": float64(11)},
- time.Unix(1435077219, 0))
- assert.NoError(t, err)
-
m, err := p.ParseLine("servers.localhost.cpu_load 11 1435077219")
assert.NoError(t, err)
- assert.Equal(t, exp.String(), m.String())
+ assert.Contains(t, m.String(), ",host=localhost")
+ assert.Contains(t, m.String(), ",region=us-east")
+ assert.Contains(t, m.String(), ",zone=1c")
}
// Test basic functionality of ApplyTemplate
diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go
index 50fb2ad7b99f1b1f6fa660c51b53c571a41a12fa..477cea36e13fc6d76c64177e1f425ed9bd8eec99 100644
--- a/plugins/parsers/influx/parser_test.go
+++ b/plugins/parsers/influx/parser_test.go
@@ -155,11 +155,11 @@ func TestParseDefaultTags(t *testing.T) {
"datacenter": "us-east",
"host": "foo",
"tag": "default",
- }, metrics[0].Tags())
+ }, metric.Tags())
assert.Equal(t, map[string]interface{}{
"usage_idle": float64(99),
"usage_busy": float64(1),
- }, metrics[0].Fields())
+ }, metric.Fields())
}
}
diff --git a/plugins/parsers/nagios/parser_test.go b/plugins/parsers/nagios/parser_test.go
index 49502a02134262023765d2a66c636a6a182b9d45..ee21ea1174ca4ee1c1327fe0b087862caa55c3c3 100644
--- a/plugins/parsers/nagios/parser_test.go
+++ b/plugins/parsers/nagios/parser_test.go
@@ -67,8 +67,7 @@ func TestParseValidOutput(t *testing.T) {
assert.Equal(t, map[string]interface{}{
"value": float64(0.008457),
}, metrics[0].Fields())
- assert.Equal(t, map[string]string{}, metrics[0].Tags())
-
+ assert.Equal(t, map[string]string{"unit": ""}, metrics[0].Tags())
}
func TestParseInvalidOutput(t *testing.T) {
diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go
index 942efd1f4e773937f9a4b5ac2fa2374f5e0889b0..9f9ff3ca87deaed1842596c2378798ba22ce9c3e 100644
--- a/plugins/serializers/graphite/graphite_test.go
+++ b/plugins/serializers/graphite/graphite_test.go
@@ -3,12 +3,12 @@ package graphite
import (
"fmt"
"sort"
+ "strings"
"testing"
"time"
"github.com/stretchr/testify/assert"
- "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
)
@@ -72,7 +72,8 @@ func TestSerializeMetricNoHost(t *testing.T) {
assert.NoError(t, err)
s := GraphiteSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -99,7 +100,8 @@ func TestSerializeMetricHost(t *testing.T) {
assert.NoError(t, err)
s := GraphiteSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -126,7 +128,8 @@ func TestSerializeValueField(t *testing.T) {
assert.NoError(t, err)
s := GraphiteSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -152,7 +155,8 @@ func TestSerializeValueField2(t *testing.T) {
s := GraphiteSerializer{
Template: "host.field.tags.measurement",
}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -178,7 +182,8 @@ func TestSerializeFieldWithSpaces(t *testing.T) {
s := GraphiteSerializer{
Template: "host.tags.measurement.field",
}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -204,7 +209,8 @@ func TestSerializeTagWithSpaces(t *testing.T) {
s := GraphiteSerializer{
Template: "host.tags.measurement.field",
}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -230,7 +236,8 @@ func TestSerializeValueField3(t *testing.T) {
s := GraphiteSerializer{
Template: "field.host.tags.measurement",
}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -256,7 +263,8 @@ func TestSerializeValueField5(t *testing.T) {
s := GraphiteSerializer{
Template: template5,
}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
@@ -280,7 +288,8 @@ func TestSerializeMetricPrefix(t *testing.T) {
assert.NoError(t, err)
s := GraphiteSerializer{Prefix: "prefix"}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{
diff --git a/plugins/serializers/influx/influx.go b/plugins/serializers/influx/influx.go
index 50bfe2c21c52e7a467408e7277cf7cd2f5efb0b2..459a8a74b9e47e6a7640293bc3ac2f5dc6636ecf 100644
--- a/plugins/serializers/influx/influx.go
+++ b/plugins/serializers/influx/influx.go
@@ -7,6 +7,6 @@ import (
type InfluxSerializer struct {
}
-func (s *InfluxSerializer) Serialize(metric telegraf.Metric) ([]byte, error) {
- return metric.Serialize(), nil
+func (s *InfluxSerializer) Serialize(m telegraf.Metric) ([]byte, error) {
+ return m.Serialize(), nil
}
diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go
index 32b9c8ca2b2bb0c51d29626aa7994d289323dd5e..7ced521034f228e99fa5ffdbce7c6444fccd071d 100644
--- a/plugins/serializers/influx/influx_test.go
+++ b/plugins/serializers/influx/influx_test.go
@@ -2,12 +2,12 @@ package influx
import (
"fmt"
+ "strings"
"testing"
"time"
"github.com/stretchr/testify/assert"
- "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
)
@@ -23,7 +23,8 @@ func TestSerializeMetricFloat(t *testing.T) {
assert.NoError(t, err)
s := InfluxSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=91.5 %d", now.UnixNano())}
@@ -42,7 +43,8 @@ func TestSerializeMetricInt(t *testing.T) {
assert.NoError(t, err)
s := InfluxSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=90i %d", now.UnixNano())}
@@ -61,7 +63,8 @@ func TestSerializeMetricString(t *testing.T) {
assert.NoError(t, err)
s := InfluxSerializer{}
- mS, err := s.Serialize(m)
+ buf, _ := s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("cpu,cpu=cpu0 usage_idle=\"foobar\" %d", now.UnixNano())}
diff --git a/plugins/serializers/json/json_test.go b/plugins/serializers/json/json_test.go
index 900a3a6ecb705e6c53c23f106f78186c29cc96e7..9370e4da5bf42c8abe41babde135420c816f4281 100644
--- a/plugins/serializers/json/json_test.go
+++ b/plugins/serializers/json/json_test.go
@@ -2,12 +2,12 @@ package json
import (
"fmt"
+ "strings"
"testing"
"time"
"github.com/stretchr/testify/assert"
- "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
)
@@ -23,7 +23,9 @@ func TestSerializeMetricFloat(t *testing.T) {
assert.NoError(t, err)
s := JsonSerializer{}
- mS, err := s.Serialize(m)
+ var buf []byte
+ buf, err = s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("{\"fields\":{\"usage_idle\":91.5},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\"},\"timestamp\":%d}", now.Unix())}
assert.Equal(t, expS, mS)
@@ -41,7 +43,9 @@ func TestSerializeMetricInt(t *testing.T) {
assert.NoError(t, err)
s := JsonSerializer{}
- mS, err := s.Serialize(m)
+ var buf []byte
+ buf, err = s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("{\"fields\":{\"usage_idle\":90},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\"},\"timestamp\":%d}", now.Unix())}
@@ -60,7 +64,9 @@ func TestSerializeMetricString(t *testing.T) {
assert.NoError(t, err)
s := JsonSerializer{}
- mS, err := s.Serialize(m)
+ var buf []byte
+ buf, err = s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("{\"fields\":{\"usage_idle\":\"foobar\"},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\"},\"timestamp\":%d}", now.Unix())}
@@ -80,7 +86,9 @@ func TestSerializeMultiFields(t *testing.T) {
assert.NoError(t, err)
s := JsonSerializer{}
- mS, err := s.Serialize(m)
+ var buf []byte
+ buf, err = s.Serialize(m)
+ mS := strings.Split(strings.TrimSpace(string(buf)), "\n")
assert.NoError(t, err)
expS := []string{fmt.Sprintf("{\"fields\":{\"usage_idle\":90,\"usage_total\":8559615},\"name\":\"cpu\",\"tags\":{\"cpu\":\"cpu0\"},\"timestamp\":%d}", now.Unix())}