From 842a7880229a719a5419cc6fc443fb1bef6697c3 Mon Sep 17 00:00:00 2001 From: David Bennett <71459415+Jagularr@users.noreply.github.com> Date: Tue, 13 Apr 2021 14:40:03 -0400 Subject: [PATCH] Remove error return type from metric.New method (#9116) * Remove error return type from metric.New method. * Formatting changes for linter + gofmt * Additional linter fixes. * More linter fixes. * Linter fix. * address comments --- agent/accumulator.go | 5 +- metric/metric.go | 4 +- metric/metric_test.go | 27 +- metric/series_grouper.go | 16 +- metric/series_grouper_test.go | 2 +- metric/tracking_test.go | 5 +- models/buffer_test.go | 5 +- models/filter_test.go | 21 +- models/running_input_test.go | 42 +- .../aggregators/basicstats/basicstats_test.go | 12 +- .../aggregators/derivative/derivative_test.go | 22 +- plugins/aggregators/final/final_test.go | 20 +- .../aggregators/histogram/histogram_test.go | 6 +- plugins/aggregators/merge/merge_test.go | 4 +- plugins/aggregators/minmax/minmax_test.go | 4 +- .../valuecounter/valuecounter_test.go | 4 +- plugins/common/parallel/parallel_test.go | 10 +- plugins/common/shim/output_test.go | 2 +- plugins/common/shim/processor_test.go | 2 +- plugins/inputs/execd/execd_test.go | 4 +- plugins/inputs/prometheus/parser.go | 6 +- .../riemann_listener/riemann_listener.go | 8 +- plugins/inputs/sflow/metricencoder.go | 5 +- .../webhooks/github/github_webhooks_models.go | 42 +- .../application_insights_test.go | 28 +- .../outputs/azure_monitor/azure_monitor.go | 6 +- plugins/outputs/cloudwatch/cloudwatch_test.go | 6 +- plugins/outputs/cratedb/cratedb_test.go | 3 +- plugins/outputs/dynatrace/dynatrace_test.go | 23 +- plugins/outputs/execd/execd_test.go | 3 +- plugins/outputs/graphite/graphite_test.go | 47 +- plugins/outputs/http/http_test.go | 6 +- plugins/outputs/influxdb/http_test.go | 8 +- plugins/outputs/influxdb/influxdb_test.go | 3 +- plugins/outputs/influxdb/udp_test.go | 12 +- .../outputs/instrumental/instrumental_test.go | 12 +- plugins/outputs/kafka/kafka_test.go | 4 +- plugins/outputs/librato/librato_test.go | 10 +- plugins/outputs/riemann/riemann_test.go | 9 +- plugins/outputs/signalfx/signalfx_test.go | 12 +- plugins/outputs/sumologic/sumologic_test.go | 6 +- plugins/outputs/syslog/syslog_mapper_test.go | 14 +- plugins/outputs/syslog/syslog_test.go | 8 +- plugins/outputs/wavefront/wavefront_test.go | 13 +- plugins/parsers/collectd/parser.go | 11 +- plugins/parsers/csv/parser.go | 6 +- plugins/parsers/csv/parser_test.go | 9 +- plugins/parsers/dropwizard/parser.go | 6 +- plugins/parsers/dropwizard/parser_test.go | 67 +- plugins/parsers/form_urlencoded/parser.go | 7 +- plugins/parsers/graphite/parser.go | 2 +- plugins/parsers/graphite/parser_test.go | 23 +- plugins/parsers/grok/parser.go | 4 +- plugins/parsers/influx/handler.go | 5 +- plugins/parsers/influx/parser_test.go | 639 ++++++++--------- plugins/parsers/json/parser.go | 8 +- plugins/parsers/logfmt/parser.go | 5 +- plugins/parsers/logfmt/parser_test.go | 6 +- plugins/parsers/nagios/parser.go | 22 +- plugins/parsers/nagios/parser_test.go | 5 +- plugins/parsers/prometheus/parser.go | 33 +- .../parsers/prometheusremotewrite/parser.go | 5 +- plugins/parsers/value/parser.go | 7 +- plugins/parsers/wavefront/parser.go | 5 +- plugins/parsers/wavefront/parser_test.go | 96 +-- plugins/parsers/xml/parser.go | 2 +- plugins/processors/clone/clone_test.go | 4 +- plugins/processors/date/date_test.go | 2 +- plugins/processors/dedup/dedup_test.go | 10 +- plugins/processors/enum/enum_test.go | 4 +- plugins/processors/execd/execd_test.go | 7 +- plugins/processors/override/override_test.go | 4 +- plugins/processors/parser/parser_test.go | 376 +++++----- plugins/processors/regex/regex_test.go | 4 +- plugins/processors/rename/rename_test.go | 2 +- .../processors/reverse_dns/reversedns_test.go | 2 +- plugins/processors/starlark/builtins.go | 5 +- plugins/processors/strings/strings_test.go | 10 +- .../processors/tag_limit/tag_limit_test.go | 2 +- plugins/processors/topk/test_sets.go | 25 +- plugins/processors/topk/topk.go | 5 +- plugins/serializers/carbon2/carbon2_test.go | 60 +- plugins/serializers/graphite/graphite_test.go | 131 ++-- plugins/serializers/influx/influx_test.go | 659 ++++++++---------- plugins/serializers/influx/reader_test.go | 269 ++++--- plugins/serializers/json/json_test.go | 55 +- plugins/serializers/msgpack/msgpack_test.go | 3 +- .../serializers/nowmetric/nowmetric_test.go | 56 +- .../splunkmetric/splunkmetric_test.go | 137 ++-- .../serializers/wavefront/wavefront_test.go | 29 +- selfstat/selfstat.go | 9 +- testutil/metric.go | 10 +- testutil/metric_test.go | 4 +- testutil/testutil.go | 2 +- 94 files changed, 1433 insertions(+), 1937 deletions(-) diff --git a/agent/accumulator.go b/agent/accumulator.go index 65000fd98a541..3683b6767d47f 100644 --- a/agent/accumulator.go +++ b/agent/accumulator.go @@ -90,10 +90,7 @@ func (ac *accumulator) addFields( tp telegraf.ValueType, t ...time.Time, ) { - m, err := metric.New(measurement, tags, fields, ac.getTime(t), tp) - if err != nil { - return - } + m := metric.New(measurement, tags, fields, ac.getTime(t), tp) if m := ac.maker.MakeMetric(m); m != nil { ac.metrics <- m } diff --git a/metric/metric.go b/metric/metric.go index d28503b743f89..f8483459a93bf 100644 --- a/metric/metric.go +++ b/metric/metric.go @@ -24,7 +24,7 @@ func New( fields map[string]interface{}, tm time.Time, tp ...telegraf.ValueType, -) (telegraf.Metric, error) { +) telegraf.Metric { var vtype telegraf.ValueType if len(tp) > 0 { vtype = tp[0] @@ -60,7 +60,7 @@ func New( } } - return m, nil + return m } // FromMetric returns a deep copy of the metric with any tracking information diff --git a/metric/metric_test.go b/metric/metric_test.go index b85f0c89ffdeb..d4d1cb11bb8ed 100644 --- a/metric/metric_test.go +++ b/metric/metric_test.go @@ -20,8 +20,7 @@ func TestNewMetric(t *testing.T) { "usage_idle": float64(99), "usage_busy": float64(1), } - m, err := New("cpu", tags, fields, now) - require.NoError(t, err) + m := New("cpu", tags, fields, now) require.Equal(t, "cpu", m.Name()) require.Equal(t, tags, m.Tags()) @@ -38,10 +37,7 @@ func baseMetric() telegraf.Metric { } now := time.Now() - m, err := New("cpu", tags, fields, now) - if err != nil { - panic(err) - } + m := New("cpu", tags, fields, now) return m } @@ -176,7 +172,7 @@ func TestTagList_Sorted(t *testing.T) { func TestEquals(t *testing.T) { now := time.Now() - m1, err := New("cpu", + m1 := New("cpu", map[string]string{ "host": "localhost", }, @@ -185,9 +181,8 @@ func TestEquals(t *testing.T) { }, now, ) - require.NoError(t, err) - m2, err := New("cpu", + m2 := New("cpu", map[string]string{ "host": "localhost", }, @@ -196,7 +191,6 @@ func TestEquals(t *testing.T) { }, now, ) - require.NoError(t, err) lhs := m1.(*metric) require.Equal(t, lhs, m2) @@ -208,7 +202,7 @@ func TestEquals(t *testing.T) { } func TestHashID(t *testing.T) { - m, _ := New( + m := New( "cpu", map[string]string{ "datacenter": "us-east-1", @@ -241,7 +235,7 @@ func TestHashID(t *testing.T) { } func TestHashID_Consistency(t *testing.T) { - m, _ := New( + m := New( "cpu", map[string]string{ "datacenter": "us-east-1", @@ -255,7 +249,7 @@ func TestHashID_Consistency(t *testing.T) { ) hash := m.HashID() - m2, _ := New( + m2 := New( "cpu", map[string]string{ "datacenter": "us-east-1", @@ -274,7 +268,7 @@ func TestHashID_Consistency(t *testing.T) { } func TestHashID_Delimiting(t *testing.T) { - m1, _ := New( + m1 := New( "cpu", map[string]string{ "a": "x", @@ -286,7 +280,7 @@ func TestHashID_Delimiting(t *testing.T) { }, time.Now(), ) - m2, _ := New( + m2 := New( "cpu", map[string]string{ "a": "xbycz", @@ -328,8 +322,7 @@ func TestValueType(t *testing.T) { fields := map[string]interface{}{ "value": float64(42), } - m, err := New("cpu", tags, fields, now, telegraf.Gauge) - assert.NoError(t, err) + m := New("cpu", tags, fields, now, telegraf.Gauge) assert.Equal(t, telegraf.Gauge, m.Type()) } diff --git a/metric/series_grouper.go b/metric/series_grouper.go index c6ba23793d478..03f110abcb429 100644 --- a/metric/series_grouper.go +++ b/metric/series_grouper.go @@ -50,18 +50,14 @@ func (g *SeriesGrouper) Add( } sort.Slice(taglist, func(i, j int) bool { return taglist[i].Key < taglist[j].Key }) - var err error id := groupID(g.hashSeed, measurement, taglist, tm) - metric := g.metrics[id] - if metric == nil { - metric, err = New(measurement, tags, map[string]interface{}{field: fieldValue}, tm) - if err != nil { - return err - } - g.metrics[id] = metric - g.ordered = append(g.ordered, metric) + m := g.metrics[id] + if m == nil { + m = New(measurement, tags, map[string]interface{}{field: fieldValue}, tm) + g.metrics[id] = m + g.ordered = append(g.ordered, m) } else { - metric.AddField(field, fieldValue) + m.AddField(field, fieldValue) } return nil } diff --git a/metric/series_grouper_test.go b/metric/series_grouper_test.go index 32fbecb6e41b2..eee338a41d130 100644 --- a/metric/series_grouper_test.go +++ b/metric/series_grouper_test.go @@ -6,7 +6,7 @@ import ( "time" ) -var m, _ = New( +var m = New( "mymetric", map[string]string{ "host": "host.example.com", diff --git a/metric/tracking_test.go b/metric/tracking_test.go index 3464ea15f2ecb..4d89a32c18623 100644 --- a/metric/tracking_test.go +++ b/metric/tracking_test.go @@ -16,10 +16,7 @@ func mustMetric( tm time.Time, tp ...telegraf.ValueType, ) telegraf.Metric { - m, err := New(name, tags, fields, tm, tp...) - if err != nil { - panic("mustMetric") - } + m := New(name, tags, fields, tm, tp...) return m } diff --git a/models/buffer_test.go b/models/buffer_test.go index 9aef94fb86585..d830ac91c6dd9 100644 --- a/models/buffer_test.go +++ b/models/buffer_test.go @@ -34,7 +34,7 @@ func Metric() telegraf.Metric { } func MetricTime(sec int64) telegraf.Metric { - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -42,9 +42,6 @@ func MetricTime(sec int64) telegraf.Metric { }, time.Unix(sec, 0), ) - if err != nil { - panic(err) - } return m } diff --git a/models/filter_test.go b/models/filter_test.go index 7e82ba0007240..aa32e095163c4 100644 --- a/models/filter_test.go +++ b/models/filter_test.go @@ -15,11 +15,10 @@ func TestFilter_ApplyEmpty(t *testing.T) { require.NoError(t, f.Compile()) require.False(t, f.IsActive()) - m, err := metric.New("m", + m := metric.New("m", map[string]string{}, map[string]interface{}{"value": int64(1)}, time.Now()) - require.NoError(t, err) require.True(t, f.Select(m)) } @@ -37,11 +36,10 @@ func TestFilter_ApplyTagsDontPass(t *testing.T) { require.NoError(t, f.Compile()) require.True(t, f.IsActive()) - m, err := metric.New("m", + m := metric.New("m", map[string]string{"cpu": "cpu-total"}, map[string]interface{}{"value": int64(1)}, time.Now()) - require.NoError(t, err) require.False(t, f.Select(m)) } @@ -53,14 +51,13 @@ func TestFilter_ApplyDeleteFields(t *testing.T) { require.NoError(t, f.Compile()) require.True(t, f.IsActive()) - m, err := metric.New("m", + m := metric.New("m", map[string]string{}, map[string]interface{}{ "value": int64(1), "value2": int64(2), }, time.Now()) - require.NoError(t, err) require.True(t, f.Select(m)) f.Modify(m) require.Equal(t, map[string]interface{}{"value2": int64(2)}, m.Fields()) @@ -74,14 +71,13 @@ func TestFilter_ApplyDeleteAllFields(t *testing.T) { require.NoError(t, f.Compile()) require.True(t, f.IsActive()) - m, err := metric.New("m", + m := metric.New("m", map[string]string{}, map[string]interface{}{ "value": int64(1), "value2": int64(2), }, time.Now()) - require.NoError(t, err) require.True(t, f.Select(m)) f.Modify(m) require.Len(t, m.FieldList(), 0) @@ -332,14 +328,13 @@ func TestFilter_TagDrop(t *testing.T) { } func TestFilter_FilterTagsNoMatches(t *testing.T) { - m, err := metric.New("m", + m := metric.New("m", map[string]string{ "host": "localhost", "mytag": "foobar", }, map[string]interface{}{"value": int64(1)}, time.Now()) - require.NoError(t, err) f := Filter{ TagExclude: []string{"nomatch"}, } @@ -361,14 +356,13 @@ func TestFilter_FilterTagsNoMatches(t *testing.T) { } func TestFilter_FilterTagsMatches(t *testing.T) { - m, err := metric.New("m", + m := metric.New("m", map[string]string{ "host": "localhost", "mytag": "foobar", }, map[string]interface{}{"value": int64(1)}, time.Now()) - require.NoError(t, err) f := Filter{ TagExclude: []string{"ho*"}, } @@ -379,14 +373,13 @@ func TestFilter_FilterTagsMatches(t *testing.T) { "mytag": "foobar", }, m.Tags()) - m, err = metric.New("m", + m = metric.New("m", map[string]string{ "host": "localhost", "mytag": "foobar", }, map[string]interface{}{"value": int64(1)}, time.Now()) - require.NoError(t, err) f = Filter{ TagInclude: []string{"my*"}, } diff --git a/models/running_input_test.go b/models/running_input_test.go index 5c639e6929ef3..8f9390f53b730 100644 --- a/models/running_input_test.go +++ b/models/running_input_test.go @@ -23,17 +23,16 @@ func TestMakeMetricFilterAfterApplyingGlobalTags(t *testing.T) { require.NoError(t, ri.Config.Filter.Compile()) ri.SetDefaultTags(map[string]string{"a": "x", "b": "y"}) - m, err := metric.New("cpu", + m := metric.New("cpu", map[string]string{}, map[string]interface{}{ "value": 42, }, now) - require.NoError(t, err) actual := ri.MakeMetric(m) - expected, err := metric.New("cpu", + expected := metric.New("cpu", map[string]string{ "b": "y", }, @@ -41,7 +40,6 @@ func TestMakeMetricFilterAfterApplyingGlobalTags(t *testing.T) { "value": 42, }, now) - require.NoError(t, err) testutil.RequireMetricEqual(t, expected, actual) } @@ -52,13 +50,12 @@ func TestMakeMetricNoFields(t *testing.T) { Name: "TestRunningInput", }) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{}, now, telegraf.Untyped) m = ri.MakeMetric(m) - require.NoError(t, err) assert.Nil(t, m) } @@ -69,7 +66,7 @@ func TestMakeMetricNilFields(t *testing.T) { Name: "TestRunningInput", }) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int64(101), @@ -77,17 +74,15 @@ func TestMakeMetricNilFields(t *testing.T) { }, now, telegraf.Untyped) - require.NoError(t, err) m = ri.MakeMetric(m) - expected, err := metric.New("RITest", + expected := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int(101), }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } @@ -110,7 +105,7 @@ func TestMakeMetricWithPluginTags(t *testing.T) { telegraf.Untyped) m = ri.MakeMetric(m) - expected, err := metric.New("RITest", + expected := metric.New("RITest", map[string]string{ "foo": "bar", }, @@ -119,7 +114,6 @@ func TestMakeMetricWithPluginTags(t *testing.T) { }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } @@ -135,7 +129,7 @@ func TestMakeMetricFilteredOut(t *testing.T) { assert.NoError(t, ri.Config.Filter.Compile()) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int64(101), @@ -143,7 +137,6 @@ func TestMakeMetricFilteredOut(t *testing.T) { now, telegraf.Untyped) m = ri.MakeMetric(m) - require.NoError(t, err) assert.Nil(t, m) } @@ -164,7 +157,7 @@ func TestMakeMetricWithDaemonTags(t *testing.T) { now, telegraf.Untyped) m = ri.MakeMetric(m) - expected, err := metric.New("RITest", + expected := metric.New("RITest", map[string]string{ "foo": "bar", }, @@ -173,7 +166,6 @@ func TestMakeMetricWithDaemonTags(t *testing.T) { }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } @@ -184,23 +176,21 @@ func TestMakeMetricNameOverride(t *testing.T) { NameOverride: "foobar", }) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int64(101), }, now, telegraf.Untyped) - require.NoError(t, err) m = ri.MakeMetric(m) - expected, err := metric.New("foobar", + expected := metric.New("foobar", nil, map[string]interface{}{ "value": 101, }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } @@ -211,23 +201,21 @@ func TestMakeMetricNamePrefix(t *testing.T) { MeasurementPrefix: "foobar_", }) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int64(101), }, now, telegraf.Untyped) - require.NoError(t, err) m = ri.MakeMetric(m) - expected, err := metric.New("foobar_RITest", + expected := metric.New("foobar_RITest", nil, map[string]interface{}{ "value": 101, }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } @@ -238,23 +226,21 @@ func TestMakeMetricNameSuffix(t *testing.T) { MeasurementSuffix: "_foobar", }) - m, err := metric.New("RITest", + m := metric.New("RITest", map[string]string{}, map[string]interface{}{ "value": int64(101), }, now, telegraf.Untyped) - require.NoError(t, err) m = ri.MakeMetric(m) - expected, err := metric.New("RITest_foobar", + expected := metric.New("RITest_foobar", nil, map[string]interface{}{ "value": 101, }, now, ) - require.NoError(t, err) require.Equal(t, expected, m) } diff --git a/plugins/aggregators/basicstats/basicstats_test.go b/plugins/aggregators/basicstats/basicstats_test.go index 8e8ee6da7915a..51ecd5c992442 100644 --- a/plugins/aggregators/basicstats/basicstats_test.go +++ b/plugins/aggregators/basicstats/basicstats_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" ) -var m1, _ = metric.New("m1", +var m1 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "a": int64(1), @@ -21,7 +21,7 @@ var m1, _ = metric.New("m1", }, time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), ) -var m2, _ = metric.New("m1", +var m2 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "a": int64(1), @@ -326,28 +326,28 @@ func TestBasicStatsWithOnlySum(t *testing.T) { // implementations of sum were calculated from mean and count, which // e.g. summed "1, 1, 5, 1" as "7.999999..." instead of 8. func TestBasicStatsWithOnlySumFloatingPointErrata(t *testing.T) { - var sum1, _ = metric.New("m1", + var sum1 = metric.New("m1", map[string]string{}, map[string]interface{}{ "a": int64(1), }, time.Now(), ) - var sum2, _ = metric.New("m1", + var sum2 = metric.New("m1", map[string]string{}, map[string]interface{}{ "a": int64(1), }, time.Now(), ) - var sum3, _ = metric.New("m1", + var sum3 = metric.New("m1", map[string]string{}, map[string]interface{}{ "a": int64(5), }, time.Now(), ) - var sum4, _ = metric.New("m1", + var sum4 = metric.New("m1", map[string]string{}, map[string]interface{}{ "a": int64(1), diff --git a/plugins/aggregators/derivative/derivative_test.go b/plugins/aggregators/derivative/derivative_test.go index 9a2f34ac7dc20..fb84dae6ff54a 100644 --- a/plugins/aggregators/derivative/derivative_test.go +++ b/plugins/aggregators/derivative/derivative_test.go @@ -8,7 +8,7 @@ import ( "github.com/influxdata/telegraf/testutil" ) -var start, _ = metric.New("TestMetric", +var start = metric.New("TestMetric", map[string]string{"state": "full"}, map[string]interface{}{ "increasing": int64(0), @@ -20,7 +20,7 @@ var start, _ = metric.New("TestMetric", time.Now(), ) -var finish, _ = metric.New("TestMetric", +var finish = metric.New("TestMetric", map[string]string{"state": "full"}, map[string]interface{}{ "increasing": int64(1000), @@ -94,14 +94,14 @@ func TestTwoFullEventsWithoutParameter(t *testing.T) { duration, _ := time.ParseDuration("2s") endTime := startTime.Add(duration) - first, _ := metric.New("One Field", + first := metric.New("One Field", map[string]string{}, map[string]interface{}{ "value": int64(10), }, startTime, ) - last, _ := metric.New("One Field", + last := metric.New("One Field", map[string]string{}, map[string]interface{}{ "value": int64(20), @@ -222,7 +222,7 @@ func TestIgnoresMissingVariable(t *testing.T) { derivative.Log = testutil.Logger{} derivative.Init() - noParameter, _ := metric.New("TestMetric", + noParameter := metric.New("TestMetric", map[string]string{"state": "no_parameter"}, map[string]interface{}{ "increasing": int64(100), @@ -265,17 +265,17 @@ func TestMergesDifferenMetricsWithSameHash(t *testing.T) { startTime := time.Now() duration, _ := time.ParseDuration("2s") endTime := startTime.Add(duration) - part1, _ := metric.New("TestMetric", + part1 := metric.New("TestMetric", map[string]string{"state": "full"}, map[string]interface{}{"field1": int64(10)}, startTime, ) - part2, _ := metric.New("TestMetric", + part2 := metric.New("TestMetric", map[string]string{"state": "full"}, map[string]interface{}{"field2": int64(20)}, startTime, ) - final, _ := metric.New("TestMetric", + final := metric.New("TestMetric", map[string]string{"state": "full"}, map[string]interface{}{ "field1": int64(30), @@ -359,7 +359,7 @@ func TestCalculatesCorrectDerivativeOnTwoConsecutivePeriods(t *testing.T) { derivative.Init() startTime := time.Now() - first, _ := metric.New("One Field", + first := metric.New("One Field", map[string]string{}, map[string]interface{}{ "value": int64(10), @@ -370,7 +370,7 @@ func TestCalculatesCorrectDerivativeOnTwoConsecutivePeriods(t *testing.T) { derivative.Push(&acc) derivative.Reset() - second, _ := metric.New("One Field", + second := metric.New("One Field", map[string]string{}, map[string]interface{}{ "value": int64(20), @@ -386,7 +386,7 @@ func TestCalculatesCorrectDerivativeOnTwoConsecutivePeriods(t *testing.T) { }) acc.ClearMetrics() - third, _ := metric.New("One Field", + third := metric.New("One Field", map[string]string{}, map[string]interface{}{ "value": int64(40), diff --git a/plugins/aggregators/final/final_test.go b/plugins/aggregators/final/final_test.go index a4add9a5ce20c..6b0c6e8e38c24 100644 --- a/plugins/aggregators/final/final_test.go +++ b/plugins/aggregators/final/final_test.go @@ -15,15 +15,15 @@ func TestSimple(t *testing.T) { final := NewFinal() tags := map[string]string{"foo": "bar"} - m1, _ := metric.New("m1", + m1 := metric.New("m1", tags, map[string]interface{}{"a": int64(1)}, time.Unix(1530939936, 0)) - m2, _ := metric.New("m1", + m2 := metric.New("m1", tags, map[string]interface{}{"a": int64(2)}, time.Unix(1530939937, 0)) - m3, _ := metric.New("m1", + m3 := metric.New("m1", tags, map[string]interface{}{"a": int64(3)}, time.Unix(1530939938, 0)) @@ -52,15 +52,15 @@ func TestTwoTags(t *testing.T) { tags1 := map[string]string{"foo": "bar"} tags2 := map[string]string{"foo": "baz"} - m1, _ := metric.New("m1", + m1 := metric.New("m1", tags1, map[string]interface{}{"a": int64(1)}, time.Unix(1530939936, 0)) - m2, _ := metric.New("m1", + m2 := metric.New("m1", tags2, map[string]interface{}{"a": int64(2)}, time.Unix(1530939937, 0)) - m3, _ := metric.New("m1", + m3 := metric.New("m1", tags1, map[string]interface{}{"a": int64(3)}, time.Unix(1530939938, 0)) @@ -98,19 +98,19 @@ func TestLongDifference(t *testing.T) { now := time.Now() - m1, _ := metric.New("m", + m1 := metric.New("m", tags, map[string]interface{}{"a": int64(1)}, now.Add(time.Second*-290)) - m2, _ := metric.New("m", + m2 := metric.New("m", tags, map[string]interface{}{"a": int64(2)}, now.Add(time.Second*-275)) - m3, _ := metric.New("m", + m3 := metric.New("m", tags, map[string]interface{}{"a": int64(3)}, now.Add(time.Second*-100)) - m4, _ := metric.New("m", + m4 := metric.New("m", tags, map[string]interface{}{"a": int64(4)}, now.Add(time.Second*-20)) diff --git a/plugins/aggregators/histogram/histogram_test.go b/plugins/aggregators/histogram/histogram_test.go index aa6214b3babab..c2a05cc283c3d 100644 --- a/plugins/aggregators/histogram/histogram_test.go +++ b/plugins/aggregators/histogram/histogram_test.go @@ -25,7 +25,7 @@ func NewTestHistogram(cfg []config, reset bool, cumulative bool) telegraf.Aggreg } // firstMetric1 is the first test metric -var firstMetric1, _ = metric.New( +var firstMetric1 = metric.New( "first_metric_name", tags{}, fields{ @@ -36,7 +36,7 @@ var firstMetric1, _ = metric.New( ) // firstMetric1 is the first test metric with other value -var firstMetric2, _ = metric.New( +var firstMetric2 = metric.New( "first_metric_name", tags{}, fields{ @@ -47,7 +47,7 @@ var firstMetric2, _ = metric.New( ) // secondMetric is the second metric -var secondMetric, _ = metric.New( +var secondMetric = metric.New( "second_metric_name", tags{}, fields{ diff --git a/plugins/aggregators/merge/merge_test.go b/plugins/aggregators/merge/merge_test.go index 552c8618e3482..94e54590b586f 100644 --- a/plugins/aggregators/merge/merge_test.go +++ b/plugins/aggregators/merge/merge_test.go @@ -187,7 +187,7 @@ func TestReset(t *testing.T) { testutil.RequireMetricsEqual(t, expected, acc.GetTelegrafMetrics()) } -var m1, _ = metric.New( +var m1 = metric.New( "mymetric", map[string]string{ "host": "host.example.com", @@ -206,7 +206,7 @@ var m1, _ = metric.New( }, time.Now(), ) -var m2, _ = metric.New( +var m2 = metric.New( "mymetric", map[string]string{ "host": "host.example.com", diff --git a/plugins/aggregators/minmax/minmax_test.go b/plugins/aggregators/minmax/minmax_test.go index e7c3cf4eb2024..7835d95e9c72e 100644 --- a/plugins/aggregators/minmax/minmax_test.go +++ b/plugins/aggregators/minmax/minmax_test.go @@ -8,7 +8,7 @@ import ( "github.com/influxdata/telegraf/testutil" ) -var m1, _ = metric.New("m1", +var m1 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "a": int64(1), @@ -24,7 +24,7 @@ var m1, _ = metric.New("m1", }, time.Now(), ) -var m2, _ = metric.New("m1", +var m2 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "a": int64(1), diff --git a/plugins/aggregators/valuecounter/valuecounter_test.go b/plugins/aggregators/valuecounter/valuecounter_test.go index 8cec5f36653c4..75aa6deb01bf4 100644 --- a/plugins/aggregators/valuecounter/valuecounter_test.go +++ b/plugins/aggregators/valuecounter/valuecounter_test.go @@ -19,7 +19,7 @@ func NewTestValueCounter(fields []string) telegraf.Aggregator { return vc } -var m1, _ = metric.New("m1", +var m1 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "status": 200, @@ -28,7 +28,7 @@ var m1, _ = metric.New("m1", time.Now(), ) -var m2, _ = metric.New("m1", +var m2 = metric.New("m1", map[string]string{"foo": "bar"}, map[string]interface{}{ "status": "OK", diff --git a/plugins/common/parallel/parallel_test.go b/plugins/common/parallel/parallel_test.go index c24f67e17c79d..1e2eaccb98654 100644 --- a/plugins/common/parallel/parallel_test.go +++ b/plugins/common/parallel/parallel_test.go @@ -18,14 +18,13 @@ func TestOrderedJobsStayOrdered(t *testing.T) { p := parallel.NewOrdered(acc, jobFunc, 10000, 10) now := time.Now() for i := 0; i < 20000; i++ { - m, err := metric.New("test", + m := metric.New("test", map[string]string{}, map[string]interface{}{ "val": i, }, now, ) - require.NoError(t, err) now = now.Add(1) p.Enqueue(m) } @@ -51,14 +50,13 @@ func TestUnorderedJobsDontDropAnyJobs(t *testing.T) { expectedTotal := 0 for i := 0; i < 20000; i++ { expectedTotal += i - m, err := metric.New("test", + m := metric.New("test", map[string]string{}, map[string]interface{}{ "val": i, }, now, ) - require.NoError(t, err) now = now.Add(1) p.Enqueue(m) } @@ -79,7 +77,7 @@ func BenchmarkOrdered(b *testing.B) { p := parallel.NewOrdered(acc, jobFunc, 10000, 10) - m, _ := metric.New("test", + m := metric.New("test", map[string]string{}, map[string]interface{}{ "val": 1, @@ -99,7 +97,7 @@ func BenchmarkUnordered(b *testing.B) { p := parallel.NewUnordered(acc, jobFunc, 10) - m, _ := metric.New("test", + m := metric.New("test", map[string]string{}, map[string]interface{}{ "val": 1, diff --git a/plugins/common/shim/output_test.go b/plugins/common/shim/output_test.go index 5a74d59edb240..468ae28e05eee 100644 --- a/plugins/common/shim/output_test.go +++ b/plugins/common/shim/output_test.go @@ -34,7 +34,7 @@ func TestOutputShim(t *testing.T) { serializer, _ := serializers.NewInfluxSerializer() - m, _ := metric.New("thing", + m := metric.New("thing", map[string]string{ "a": "b", }, diff --git a/plugins/common/shim/processor_test.go b/plugins/common/shim/processor_test.go index b4cf01ae0236f..6126656b8fcc6 100644 --- a/plugins/common/shim/processor_test.go +++ b/plugins/common/shim/processor_test.go @@ -40,7 +40,7 @@ func TestProcessorShim(t *testing.T) { serializer, _ := serializers.NewInfluxSerializer() parser, _ := parsers.NewInfluxParser() - m, _ := metric.New("thing", + m := metric.New("thing", map[string]string{ "a": "b", }, diff --git a/plugins/inputs/execd/execd_test.go b/plugins/inputs/execd/execd_test.go index ab67af0ab84cd..e95ed133f9cba 100644 --- a/plugins/inputs/execd/execd_test.go +++ b/plugins/inputs/execd/execd_test.go @@ -170,7 +170,7 @@ func runCounterProgram() { scanner := bufio.NewScanner(os.Stdin) for scanner.Scan() { - metric, _ := metric.New("counter", + m := metric.New("counter", map[string]string{}, map[string]interface{}{ "count": i, @@ -179,7 +179,7 @@ func runCounterProgram() { ) i++ - b, err := serializer.Serialize(metric) + b, err := serializer.Serialize(m) if err != nil { fmt.Fprintf(os.Stderr, "ERR %v\n", err) os.Exit(1) diff --git a/plugins/inputs/prometheus/parser.go b/plugins/inputs/prometheus/parser.go index 9a4b5a4837643..7d3140dc7d627 100644 --- a/plugins/inputs/prometheus/parser.go +++ b/plugins/inputs/prometheus/parser.go @@ -81,10 +81,8 @@ func Parse(buf []byte, header http.Header) ([]telegraf.Metric, error) { } else { t = now } - metric, err := metric.New(metricName, tags, fields, t, common.ValueType(mf.GetType())) - if err == nil { - metrics = append(metrics, metric) - } + m := metric.New(metricName, tags, fields, t, common.ValueType(mf.GetType())) + metrics = append(metrics, m) } } } diff --git a/plugins/inputs/riemann_listener/riemann_listener.go b/plugins/inputs/riemann_listener/riemann_listener.go index b20094176ceb8..24bdd11540e1b 100644 --- a/plugins/inputs/riemann_listener/riemann_listener.go +++ b/plugins/inputs/riemann_listener/riemann_listener.go @@ -221,13 +221,7 @@ func (rsl *riemannListener) read(conn net.Conn) { tags["State"] = m.State fieldValues["Metric"] = m.Metric fieldValues["TTL"] = m.TTL.Seconds() - singleMetric, err := metric.New(m.Service, tags, fieldValues, m.Time, telegraf.Untyped) - if err != nil { - rsl.Log.Debugf("Could not create metric for service %s at %s", m.Service, m.Time.String()) - riemannReturnErrorResponse(conn, "Could not create metric") - return - } - + singleMetric := metric.New(m.Service, tags, fieldValues, m.Time, telegraf.Untyped) rsl.AddMetric(singleMetric) } riemannReturnResponse(conn) diff --git a/plugins/inputs/sflow/metricencoder.go b/plugins/inputs/sflow/metricencoder.go index ffc9d8e023849..2dc1fb122b096 100644 --- a/plugins/inputs/sflow/metricencoder.go +++ b/plugins/inputs/sflow/metricencoder.go @@ -34,10 +34,7 @@ func makeMetrics(p *V5Format) ([]telegraf.Metric, error) { for k, v := range fields { fields2[k] = v } - m, err := metric.New("sflow", tags2, fields2, now) - if err != nil { - return nil, err - } + m := metric.New("sflow", tags2, fields2, now) metrics = append(metrics, m) } } diff --git a/plugins/inputs/webhooks/github/github_webhooks_models.go b/plugins/inputs/webhooks/github/github_webhooks_models.go index 88c75526b28cf..497d3f13c575e 100644 --- a/plugins/inputs/webhooks/github/github_webhooks_models.go +++ b/plugins/inputs/webhooks/github/github_webhooks_models.go @@ -106,7 +106,7 @@ func (s CommitCommentEvent) NewMetric() telegraf.Metric { "commit": s.Comment.Commit, "comment": s.Comment.Body, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -133,7 +133,7 @@ func (s CreateEvent) NewMetric() telegraf.Metric { "ref": s.Ref, "refType": s.RefType, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -160,7 +160,7 @@ func (s DeleteEvent) NewMetric() telegraf.Metric { "ref": s.Ref, "refType": s.RefType, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -188,7 +188,7 @@ func (s DeploymentEvent) NewMetric() telegraf.Metric { "environment": s.Deployment.Environment, "description": s.Deployment.Description, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -219,7 +219,7 @@ func (s DeploymentStatusEvent) NewMetric() telegraf.Metric { "depState": s.DeploymentStatus.State, "depDescription": s.DeploymentStatus.Description, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -244,7 +244,7 @@ func (s ForkEvent) NewMetric() telegraf.Metric { "issues": s.Repository.Issues, "fork": s.Forkee.Repository, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -269,7 +269,7 @@ func (s GollumEvent) NewMetric() telegraf.Metric { "forks": s.Repository.Forks, "issues": s.Repository.Issues, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -298,7 +298,7 @@ func (s IssueCommentEvent) NewMetric() telegraf.Metric { "comments": s.Issue.Comments, "body": s.Comment.Body, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -327,7 +327,7 @@ func (s IssuesEvent) NewMetric() telegraf.Metric { "title": s.Issue.Title, "comments": s.Issue.Comments, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -353,7 +353,7 @@ func (s MemberEvent) NewMetric() telegraf.Metric { "newMember": s.Member.User, "newMemberStatus": s.Member.Admin, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -376,7 +376,7 @@ func (s MembershipEvent) NewMetric() telegraf.Metric { "newMember": s.Member.User, "newMemberStatus": s.Member.Admin, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -399,7 +399,7 @@ func (s PageBuildEvent) NewMetric() telegraf.Metric { "forks": s.Repository.Forks, "issues": s.Repository.Issues, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -422,7 +422,7 @@ func (s PublicEvent) NewMetric() telegraf.Metric { "forks": s.Repository.Forks, "issues": s.Repository.Issues, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -456,7 +456,7 @@ func (s PullRequestEvent) NewMetric() telegraf.Metric { "deletions": s.PullRequest.Deletions, "changedFiles": s.PullRequest.ChangedFiles, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -491,7 +491,7 @@ func (s PullRequestReviewCommentEvent) NewMetric() telegraf.Metric { "commentFile": s.Comment.File, "comment": s.Comment.Comment, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -520,7 +520,7 @@ func (s PushEvent) NewMetric() telegraf.Metric { "before": s.Before, "after": s.After, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -545,7 +545,7 @@ func (s ReleaseEvent) NewMetric() telegraf.Metric { "issues": s.Repository.Issues, "tagName": s.Release.TagName, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -568,7 +568,7 @@ func (s RepositoryEvent) NewMetric() telegraf.Metric { "forks": s.Repository.Forks, "issues": s.Repository.Issues, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -595,7 +595,7 @@ func (s StatusEvent) NewMetric() telegraf.Metric { "commit": s.Commit, "state": s.State, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -620,7 +620,7 @@ func (s TeamAddEvent) NewMetric() telegraf.Metric { "issues": s.Repository.Issues, "teamName": s.Team.Name, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } @@ -643,6 +643,6 @@ func (s WatchEvent) NewMetric() telegraf.Metric { "forks": s.Repository.Forks, "issues": s.Repository.Issues, } - m, _ := metric.New(meas, t, f, time.Now()) + m := metric.New(meas, t, f, time.Now()) return m } diff --git a/plugins/outputs/application_insights/application_insights_test.go b/plugins/outputs/application_insights/application_insights_test.go index ce36c141b2b52..c5a5c0a3eebed 100644 --- a/plugins/outputs/application_insights/application_insights_test.go +++ b/plugins/outputs/application_insights/application_insights_test.go @@ -1,11 +1,12 @@ package application_insights import ( - "github.com/influxdata/telegraf/testutil" "math" "testing" "time" + "github.com/influxdata/telegraf/testutil" + "github.com/Microsoft/ApplicationInsights-Go/appinsights" "github.com/influxdata/telegraf" @@ -143,13 +144,12 @@ func TestAggregateMetricCreated(t *testing.T) { transmitter.On("Track", mock.Anything) metricName := "ShouldBeAggregateMetric" - m, err := metric.New( + m := metric.New( metricName, nil, // tags tt.fields, now, ) - assert.NoError(err) ai := ApplicationInsights{ transmitter: transmitter, @@ -157,7 +157,7 @@ func TestAggregateMetricCreated(t *testing.T) { Log: testutil.Logger{}, } - err = ai.Connect() + err := ai.Connect() assert.NoError(err) mSet := []telegraf.Metric{m} @@ -202,13 +202,12 @@ func TestSimpleMetricCreated(t *testing.T) { transmitter.On("Track", mock.Anything) metricName := "ShouldBeSimpleMetric" - m, err := metric.New( + m := metric.New( metricName, nil, // tags tt.fields, now, ) - assert.NoError(err) ai := ApplicationInsights{ transmitter: transmitter, @@ -216,7 +215,7 @@ func TestSimpleMetricCreated(t *testing.T) { Log: testutil.Logger{}, } - err = ai.Connect() + err := ai.Connect() assert.NoError(err) mSet := []telegraf.Metric{m} @@ -273,13 +272,12 @@ func TestTagsAppliedToTelemetry(t *testing.T) { transmitter.On("Track", mock.Anything) metricName := "ShouldBeSimpleMetric" - m, err := metric.New( + m := metric.New( metricName, tt.tags, tt.fields, now, ) - assert.NoError(err) ai := ApplicationInsights{ transmitter: transmitter, @@ -287,7 +285,7 @@ func TestTagsAppliedToTelemetry(t *testing.T) { Log: testutil.Logger{}, } - err = ai.Connect() + err := ai.Connect() assert.NoError(err) mSet := []telegraf.Metric{m} @@ -310,13 +308,12 @@ func TestContextTagsSetOnSimpleTelemetry(t *testing.T) { transmitter := new(mocks.Transmitter) transmitter.On("Track", mock.Anything) - m, err := metric.New( + m := metric.New( "SimpleMetric", map[string]string{"kubernetes_container_name": "atcsvc", "kubernetes_pod_name": "bunkie17554"}, map[string]interface{}{"value": 23.0}, now, ) - assert.NoError(err) ai := ApplicationInsights{ transmitter: transmitter, @@ -329,7 +326,7 @@ func TestContextTagsSetOnSimpleTelemetry(t *testing.T) { Log: testutil.Logger{}, } - err = ai.Connect() + err := ai.Connect() assert.NoError(err) mSet := []telegraf.Metric{m} @@ -348,13 +345,12 @@ func TestContextTagsSetOnAggregateTelemetry(t *testing.T) { transmitter := new(mocks.Transmitter) transmitter.On("Track", mock.Anything) - m, err := metric.New( + m := metric.New( "AggregateMetric", map[string]string{"kubernetes_container_name": "atcsvc", "kubernetes_pod_name": "bunkie17554"}, map[string]interface{}{"value": 23.0, "count": 5}, now, ) - assert.NoError(err) ai := ApplicationInsights{ transmitter: transmitter, @@ -367,7 +363,7 @@ func TestContextTagsSetOnAggregateTelemetry(t *testing.T) { Log: testutil.Logger{}, } - err = ai.Connect() + err := ai.Connect() assert.NoError(err) mSet := []telegraf.Metric{m} diff --git a/plugins/outputs/azure_monitor/azure_monitor.go b/plugins/outputs/azure_monitor/azure_monitor.go index 193c9b2c40c4f..e513dbdca23e9 100644 --- a/plugins/outputs/azure_monitor/azure_monitor.go +++ b/plugins/outputs/azure_monitor/azure_monitor.go @@ -599,7 +599,7 @@ func (a *AzureMonitor) Push() []telegraf.Metric { tags[tag.name] = tag.value } - m, err := metric.New(agg.name, + m := metric.New(agg.name, tags, map[string]interface{}{ "min": agg.min, @@ -610,10 +610,6 @@ func (a *AzureMonitor) Push() []telegraf.Metric { tbucket, ) - if err != nil { - a.Log.Errorf("Could not create metric for aggregation %q; discarding point", agg.name) - } - metrics = append(metrics, m) } } diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go index f0956689a5685..95987f591830d 100644 --- a/plugins/outputs/cloudwatch/cloudwatch_test.go +++ b/plugins/outputs/cloudwatch/cloudwatch_test.go @@ -83,7 +83,7 @@ func TestBuildMetricDatums(t *testing.T) { assert.Equal(0, len(datums), fmt.Sprintf("Valid point should not create a Datum {value: %v}", point)) } - statisticMetric, _ := metric.New( + statisticMetric := metric.New( "test1", map[string]string{"tag1": "value1"}, map[string]interface{}{"value_max": float64(10), "value_min": float64(0), "value_sum": float64(100), "value_count": float64(20)}, @@ -92,7 +92,7 @@ func TestBuildMetricDatums(t *testing.T) { datums := BuildMetricDatum(true, false, statisticMetric) assert.Equal(1, len(datums), fmt.Sprintf("Valid point should create a Datum {value: %v}", statisticMetric)) - multiFieldsMetric, _ := metric.New( + multiFieldsMetric := metric.New( "test1", map[string]string{"tag1": "value1"}, map[string]interface{}{"valueA": float64(10), "valueB": float64(0), "valueC": float64(100), "valueD": float64(20)}, @@ -101,7 +101,7 @@ func TestBuildMetricDatums(t *testing.T) { datums = BuildMetricDatum(true, false, multiFieldsMetric) assert.Equal(4, len(datums), fmt.Sprintf("Each field should create a Datum {value: %v}", multiFieldsMetric)) - multiStatisticMetric, _ := metric.New( + multiStatisticMetric := metric.New( "test1", map[string]string{"tag1": "value1"}, map[string]interface{}{ diff --git a/plugins/outputs/cratedb/cratedb_test.go b/plugins/outputs/cratedb/cratedb_test.go index 8d7fe1c80ae0a..66a2bfa794cc9 100644 --- a/plugins/outputs/cratedb/cratedb_test.go +++ b/plugins/outputs/cratedb/cratedb_test.go @@ -203,13 +203,12 @@ func Test_hashID(t *testing.T) { } for i, test := range tests { - m, err := metric.New( + m := metric.New( test.Name, test.Tags, test.Fields, time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC), ) - require.NoError(t, err) if got := hashID(m); got != test.Want { t.Errorf("test #%d: got=%d want=%d", i, got, test.Want) } diff --git a/plugins/outputs/dynatrace/dynatrace_test.go b/plugins/outputs/dynatrace/dynatrace_test.go index 6dc558836a59c..a930a542d3692 100644 --- a/plugins/outputs/dynatrace/dynatrace_test.go +++ b/plugins/outputs/dynatrace/dynatrace_test.go @@ -2,16 +2,17 @@ package dynatrace import ( "encoding/json" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/config" - "github.com/influxdata/telegraf/metric" - "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" "io/ioutil" "net/http" "net/http/httptest" "testing" "time" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/config" + "github.com/influxdata/telegraf/metric" + "github.com/influxdata/telegraf/testutil" + "github.com/stretchr/testify/require" ) func TestNilMetrics(t *testing.T) { @@ -142,14 +143,14 @@ func TestSendMetric(t *testing.T) { // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1", "nix": "nix"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -191,7 +192,7 @@ func TestSendSingleMetricWithUnorderedTags(t *testing.T) { // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"a": "test", "c": "test", "b": "test"}, map[string]interface{}{"myfield": float64(3.14)}, @@ -233,7 +234,7 @@ func TestSendMetricWithoutTags(t *testing.T) { // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{}, map[string]interface{}{"myfield": float64(3.14)}, @@ -275,7 +276,7 @@ func TestSendMetricWithUpperCaseTagKeys(t *testing.T) { // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"AAA": "test", "CcC": "test", "B B": "test"}, map[string]interface{}{"myfield": float64(3.14)}, @@ -317,7 +318,7 @@ func TestSendBooleanMetricWithoutTags(t *testing.T) { // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{}, map[string]interface{}{"myfield": bool(true)}, diff --git a/plugins/outputs/execd/execd_test.go b/plugins/outputs/execd/execd_test.go index 46bde795ec2ed..c14339d31a85a 100644 --- a/plugins/outputs/execd/execd_test.go +++ b/plugins/outputs/execd/execd_test.go @@ -55,13 +55,12 @@ func TestExternalOutputWorks(t *testing.T) { wg.Done() } - m, err := metric.New( + m := metric.New( "cpu", map[string]string{"name": "cpu1"}, map[string]interface{}{"idle": 50, "sys": 30}, now, ) - require.NoError(t, err) require.NoError(t, e.Connect()) require.NoError(t, e.Write([]telegraf.Metric{m})) diff --git a/plugins/outputs/graphite/graphite_test.go b/plugins/outputs/graphite/graphite_test.go index 38a9691e0b73a..1cb58b19485fc 100644 --- a/plugins/outputs/graphite/graphite_test.go +++ b/plugins/outputs/graphite/graphite_test.go @@ -2,13 +2,14 @@ package graphite import ( "bufio" - "github.com/influxdata/telegraf/testutil" "net" "net/textproto" "sync" "testing" "time" + "github.com/influxdata/telegraf/testutil" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" @@ -24,7 +25,7 @@ func TestGraphiteError(t *testing.T) { Log: testutil.Logger{}, } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"mymeasurement": float64(3.14)}, @@ -56,19 +57,19 @@ func TestGraphiteOK(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -118,19 +119,19 @@ func TestGraphiteOkWithSeparatorDot(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -180,19 +181,19 @@ func TestGraphiteOkWithSeparatorUnderscore(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -246,19 +247,19 @@ func TestGraphiteOKWithMultipleTemplates(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1", "mytag": "valuetag"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1", "mytag": "valuetag"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1", "mytag": "valuetag"}, map[string]interface{}{"value": float64(3.14)}, @@ -308,19 +309,19 @@ func TestGraphiteOkWithTags(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -371,19 +372,19 @@ func TestGraphiteOkWithTagsAndSeparatorDot(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, @@ -434,19 +435,19 @@ func TestGraphiteOkWithTagsAndSeparatorUnderscore(t *testing.T) { } // Init metrics - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "my_measurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, diff --git a/plugins/outputs/http/http_test.go b/plugins/outputs/http/http_test.go index abcf2db33dabc..a09f7dd7ea28f 100644 --- a/plugins/outputs/http/http_test.go +++ b/plugins/outputs/http/http_test.go @@ -18,7 +18,7 @@ import ( ) func getMetric() telegraf.Metric { - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -26,9 +26,7 @@ func getMetric() telegraf.Metric { }, time.Unix(0, 0), ) - if err != nil { - panic(err) - } + return m } diff --git a/plugins/outputs/influxdb/http_test.go b/plugins/outputs/influxdb/http_test.go index 2115ad5918a65..2f46e2441e937 100644 --- a/plugins/outputs/influxdb/http_test.go +++ b/plugins/outputs/influxdb/http_test.go @@ -490,7 +490,7 @@ func TestHTTP_Write(t *testing.T) { ctx := context.Background() - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -498,7 +498,6 @@ func TestHTTP_Write(t *testing.T) { }, time.Unix(0, 0), ) - require.NoError(t, err) metrics := []telegraf.Metric{m} client, err := influxdb.NewHTTPClient(tt.config) @@ -541,7 +540,7 @@ func TestHTTP_WritePathPrefix(t *testing.T) { ctx := context.Background() - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -549,7 +548,6 @@ func TestHTTP_WritePathPrefix(t *testing.T) { }, time.Unix(0, 0), ) - require.NoError(t, err) metrics := []telegraf.Metric{m} config := influxdb.HTTPConfig{ @@ -595,7 +593,7 @@ func TestHTTP_WriteContentEncodingGzip(t *testing.T) { ctx := context.Background() - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ diff --git a/plugins/outputs/influxdb/influxdb_test.go b/plugins/outputs/influxdb/influxdb_test.go index 9de246ec7f3f7..d0f50bbfed94f 100644 --- a/plugins/outputs/influxdb/influxdb_test.go +++ b/plugins/outputs/influxdb/influxdb_test.go @@ -200,7 +200,7 @@ func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) { err := output.Connect() require.NoError(t, err) - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -208,7 +208,6 @@ func TestWriteRecreateDatabaseIfDatabaseNotFound(t *testing.T) { }, time.Unix(0, 0), ) - require.NoError(t, err) metrics := []telegraf.Metric{m} err = output.Write(metrics) diff --git a/plugins/outputs/influxdb/udp_test.go b/plugins/outputs/influxdb/udp_test.go index 1c5696cf10fe5..25e03f72173ee 100644 --- a/plugins/outputs/influxdb/udp_test.go +++ b/plugins/outputs/influxdb/udp_test.go @@ -23,7 +23,7 @@ var ( ) func getMetric() telegraf.Metric { - metric, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -31,10 +31,8 @@ func getMetric() telegraf.Metric { }, time.Unix(0, 0), ) - if err != nil { - panic(err) - } - return metric + + return m } func getURL() *url.URL { @@ -202,7 +200,7 @@ func TestUDP_ErrorLogging(t *testing.T) { }, metrics: []telegraf.Metric{ func() telegraf.Metric { - metric, _ := metric.New( + m := metric.New( "cpu", map[string]string{ "host": "example.org", @@ -210,7 +208,7 @@ func TestUDP_ErrorLogging(t *testing.T) { map[string]interface{}{}, time.Unix(0, 0), ) - return metric + return m }(), }, logContains: `could not serialize metric: "cpu,host=example.org": no serializable fields`, diff --git a/plugins/outputs/instrumental/instrumental_test.go b/plugins/outputs/instrumental/instrumental_test.go index 6752069bb226b..f72b9e90f0806 100644 --- a/plugins/outputs/instrumental/instrumental_test.go +++ b/plugins/outputs/instrumental/instrumental_test.go @@ -25,13 +25,13 @@ func TestWrite(t *testing.T) { } // Default to gauge - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"myfield": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1", "metric_type": "set"}, map[string]interface{}{"value": float64(3.14)}, @@ -42,27 +42,27 @@ func TestWrite(t *testing.T) { i.Write(metrics) // Counter and Histogram are increments - m3, _ := metric.New( + m3 := metric.New( "my_histogram", map[string]string{"host": "192.168.0.1", "metric_type": "histogram"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) // We will modify metric names that won't be accepted by Instrumental - m4, _ := metric.New( + m4 := metric.New( "bad_metric_name", map[string]string{"host": "192.168.0.1:8888::123", "metric_type": "counter"}, map[string]interface{}{"value": 1}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) // We will drop metric values that won't be accepted by Instrumental - m5, _ := metric.New( + m5 := metric.New( "bad_values", map[string]string{"host": "192.168.0.1", "metric_type": "counter"}, map[string]interface{}{"value": "\" 3:30\""}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m6, _ := metric.New( + m6 := metric.New( "my_counter", map[string]string{"host": "192.168.0.1", "metric_type": "counter"}, map[string]interface{}{"value": float64(3.14)}, diff --git a/plugins/outputs/kafka/kafka_test.go b/plugins/outputs/kafka/kafka_test.go index 2d786013c9a24..0edaed31f41f3 100644 --- a/plugins/outputs/kafka/kafka_test.go +++ b/plugins/outputs/kafka/kafka_test.go @@ -117,7 +117,7 @@ func TestRoutingKey(t *testing.T) { RoutingKey: "static", }, metric: func() telegraf.Metric { - m, _ := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -137,7 +137,7 @@ func TestRoutingKey(t *testing.T) { RoutingKey: "random", }, metric: func() telegraf.Metric { - m, _ := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ diff --git a/plugins/outputs/librato/librato_test.go b/plugins/outputs/librato/librato_test.go index 5a425afca5f1f..f88ced5b67f33 100644 --- a/plugins/outputs/librato/librato_test.go +++ b/plugins/outputs/librato/librato_test.go @@ -161,7 +161,7 @@ func TestBuildGauge(t *testing.T) { } func newHostMetric(value interface{}, name, host string) telegraf.Metric { - m, _ := metric.New( + m := metric.New( name, map[string]string{"host": host}, map[string]interface{}{"value": value}, @@ -172,19 +172,19 @@ func newHostMetric(value interface{}, name, host string) telegraf.Metric { func TestBuildGaugeWithSource(t *testing.T) { mtime := time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC) - pt1, _ := metric.New( + pt1 := metric.New( "test1", map[string]string{"hostname": "192.168.0.1", "tag1": "value1"}, map[string]interface{}{"value": 0.0}, mtime, ) - pt2, _ := metric.New( + pt2 := metric.New( "test2", map[string]string{"hostnam": "192.168.0.1", "tag1": "value1"}, map[string]interface{}{"value": 1.0}, mtime, ) - pt3, _ := metric.New( + pt3 := metric.New( "test3", map[string]string{ "hostname": "192.168.0.1", @@ -193,7 +193,7 @@ func TestBuildGaugeWithSource(t *testing.T) { map[string]interface{}{"value": 1.0}, mtime, ) - pt4, _ := metric.New( + pt4 := metric.New( "test4", map[string]string{ "hostname": "192.168.0.1", diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go index e53258c1bff7a..b56fb33e114be 100644 --- a/plugins/outputs/riemann/riemann_test.go +++ b/plugins/outputs/riemann/riemann_test.go @@ -1,10 +1,11 @@ package riemann import ( - "github.com/influxdata/telegraf/testutil" "testing" "time" + "github.com/influxdata/telegraf/testutil" + "github.com/amir/raidman" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/require" @@ -76,7 +77,7 @@ func TestMetricEvents(t *testing.T) { } // build a single event - m, _ := metric.New( + m := metric.New( "test1", map[string]string{"tag1": "value1", "host": "abc123"}, map[string]interface{}{"value": 5.6}, @@ -101,7 +102,7 @@ func TestMetricEvents(t *testing.T) { require.Equal(t, expectedEvent, events[0]) // build 2 events - m, _ = metric.New( + m = metric.New( "test2", map[string]string{"host": "xyz987"}, map[string]interface{}{"point": 1}, @@ -136,7 +137,7 @@ func TestStateEvents(t *testing.T) { } // string metrics will be skipped unless explicitly enabled - m, _ := metric.New( + m := metric.New( "test", map[string]string{"host": "host"}, map[string]interface{}{"value": "running"}, diff --git a/plugins/outputs/signalfx/signalfx_test.go b/plugins/outputs/signalfx/signalfx_test.go index 3f081a16cbbd8..d21cff82f62a2 100644 --- a/plugins/outputs/signalfx/signalfx_test.go +++ b/plugins/outputs/signalfx/signalfx_test.go @@ -429,12 +429,10 @@ func TestSignalFx_SignalFx(t *testing.T) { measurements := []telegraf.Metric{} for _, measurement := range tt.measurements { - m, err := metric.New( + m := metric.New( measurement.name, measurement.tags, measurement.fields, measurement.time, measurement.tp, ) - if err != nil { - t.Errorf("Error creating measurement %v", measurement) - } + measurements = append(measurements, m) } @@ -594,12 +592,10 @@ func TestSignalFx_Errors(t *testing.T) { } for _, measurement := range tt.measurements { - m, err := metric.New( + m := metric.New( measurement.name, measurement.tags, measurement.fields, measurement.time, measurement.tp, ) - if err != nil { - t.Errorf("Error creating measurement %v", measurement) - } + s.Write([]telegraf.Metric{m}) } for !(len(s.client.(*errorsink).dps) == len(tt.want.datapoints) && len(s.client.(*errorsink).evs) == len(tt.want.events)) { diff --git a/plugins/outputs/sumologic/sumologic_test.go b/plugins/outputs/sumologic/sumologic_test.go index b7fc917b43368..5ce502bab2c0e 100644 --- a/plugins/outputs/sumologic/sumologic_test.go +++ b/plugins/outputs/sumologic/sumologic_test.go @@ -27,7 +27,7 @@ import ( ) func getMetric(t *testing.T) telegraf.Metric { - m, err := metric.New( + m := metric.New( "cpu", map[string]string{}, map[string]interface{}{ @@ -35,7 +35,6 @@ func getMetric(t *testing.T) telegraf.Metric { }, time.Unix(0, 0), ) - require.NoError(t, err) return m } @@ -44,7 +43,7 @@ func getMetrics(t *testing.T) []telegraf.Metric { var metrics = make([]telegraf.Metric, count) for i := 0; i < count; i++ { - m, err := metric.New( + m := metric.New( fmt.Sprintf("cpu-%d", i), map[string]string{ "ec2_instance": "aws-129038123", @@ -59,7 +58,6 @@ func getMetrics(t *testing.T) []telegraf.Metric { }, time.Unix(0, 0), ) - require.NoError(t, err) metrics[i] = m } return metrics diff --git a/plugins/outputs/syslog/syslog_mapper_test.go b/plugins/outputs/syslog/syslog_mapper_test.go index 300d5fcabe561..d4bbc1d6f0ed9 100644 --- a/plugins/outputs/syslog/syslog_mapper_test.go +++ b/plugins/outputs/syslog/syslog_mapper_test.go @@ -15,7 +15,7 @@ func TestSyslogMapperWithDefaults(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{}, map[string]interface{}{}, @@ -34,7 +34,7 @@ func TestSyslogMapperWithHostname(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "hostname": "testhost", @@ -54,7 +54,7 @@ func TestSyslogMapperWithHostnameSourceFallback(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "source": "sourcevalue", @@ -74,7 +74,7 @@ func TestSyslogMapperWithHostnameHostFallback(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "host": "hostvalue", @@ -94,7 +94,7 @@ func TestSyslogMapperWithDefaultSdid(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "appname": "testapp", @@ -130,7 +130,7 @@ func TestSyslogMapperWithDefaultSdidAndOtherSdids(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "appname": "testapp", @@ -167,7 +167,7 @@ func TestSyslogMapperWithNoSdids(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "appname": "testapp", diff --git a/plugins/outputs/syslog/syslog_test.go b/plugins/outputs/syslog/syslog_test.go index 7581a7b5380d5..d9e082e5f9042 100644 --- a/plugins/outputs/syslog/syslog_test.go +++ b/plugins/outputs/syslog/syslog_test.go @@ -20,7 +20,7 @@ func TestGetSyslogMessageWithFramingOctectCounting(t *testing.T) { s.initializeSyslogMapper() // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "hostname": "testhost", @@ -44,7 +44,7 @@ func TestGetSyslogMessageWithFramingNonTransparent(t *testing.T) { s.Framing = framing.NonTransparent // Init metrics - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{ "hostname": "testhost", @@ -92,7 +92,7 @@ func TestSyslogWriteWithUdp(t *testing.T) { func testSyslogWriteWithStream(t *testing.T, s *Syslog, lconn net.Conn) { metrics := []telegraf.Metric{} - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{}, map[string]interface{}{}, @@ -116,7 +116,7 @@ func testSyslogWriteWithStream(t *testing.T, s *Syslog, lconn net.Conn) { func testSyslogWriteWithPacket(t *testing.T, s *Syslog, lconn net.PacketConn) { s.Framing = framing.NonTransparent metrics := []telegraf.Metric{} - m1, _ := metric.New( + m1 := metric.New( "testmetric", map[string]string{}, map[string]interface{}{}, diff --git a/plugins/outputs/wavefront/wavefront_test.go b/plugins/outputs/wavefront/wavefront_test.go index e96e05919b6ef..d745108dc7e94 100644 --- a/plugins/outputs/wavefront/wavefront_test.go +++ b/plugins/outputs/wavefront/wavefront_test.go @@ -1,14 +1,15 @@ package wavefront import ( - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/metric" - "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" "reflect" "strings" "testing" "time" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/metric" + "github.com/influxdata/telegraf/testutil" + "github.com/stretchr/testify/require" ) // default config used by Tests @@ -32,7 +33,7 @@ func TestBuildMetrics(t *testing.T) { pathReplacer = strings.NewReplacer("_", w.MetricSeparator) - testMetric1, _ := metric.New( + testMetric1 := metric.New( "test.simple.metric", map[string]string{"tag1": "value1", "host": "testHost"}, map[string]interface{}{"value": 123}, @@ -121,7 +122,7 @@ func TestBuildMetricsWithSimpleFields(t *testing.T) { pathReplacer = strings.NewReplacer("_", w.MetricSeparator) - testMetric1, _ := metric.New( + testMetric1 := metric.New( "test.simple.metric", map[string]string{"tag1": "value1"}, map[string]interface{}{"value": 123}, diff --git a/plugins/parsers/collectd/parser.go b/plugins/parsers/collectd/parser.go index 692307abe868b..f0f9773472c4f 100644 --- a/plugins/parsers/collectd/parser.go +++ b/plugins/parsers/collectd/parser.go @@ -156,11 +156,7 @@ func UnmarshalValueList(vl *api.ValueList, multiValue string) []telegraf.Metric } // Drop invalid points - m, err := metric.New(name, tags, fields, timestamp) - if err != nil { - log.Printf("E! Dropping metric %v: %v", name, err) - continue - } + m := metric.New(name, tags, fields, timestamp) metrics = append(metrics, m) } @@ -192,10 +188,7 @@ func UnmarshalValueList(vl *api.ValueList, multiValue string) []telegraf.Metric } } - m, err := metric.New(name, tags, fields, timestamp) - if err != nil { - log.Printf("E! Dropping metric %v: %v", name, err) - } + m := metric.New(name, tags, fields, timestamp) metrics = append(metrics, m) default: diff --git a/plugins/parsers/csv/parser.go b/plugins/parsers/csv/parser.go index 9b3219a0580fb..8f4969efb70bd 100644 --- a/plugins/parsers/csv/parser.go +++ b/plugins/parsers/csv/parser.go @@ -280,10 +280,8 @@ outer: delete(recordFields, p.TimestampColumn) delete(recordFields, p.MeasurementColumn) - m, err := metric.New(measurementName, tags, recordFields, metricTime) - if err != nil { - return nil, err - } + m := metric.New(measurementName, tags, recordFields, metricTime) + return m, nil } diff --git a/plugins/parsers/csv/parser_test.go b/plugins/parsers/csv/parser_test.go index f942eb0716346..8e4a5181c7969 100644 --- a/plugins/parsers/csv/parser_test.go +++ b/plugins/parsers/csv/parser_test.go @@ -226,10 +226,8 @@ func TestValueConversion(t *testing.T) { metrics, err := p.Parse([]byte(testCSV)) require.NoError(t, err) - expectedMetric, err1 := metric.New("test_value", expectedTags, expectedFields, time.Unix(0, 0)) - returnedMetric, err2 := metric.New(metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields(), time.Unix(0, 0)) - require.NoError(t, err1) - require.NoError(t, err2) + expectedMetric := metric.New("test_value", expectedTags, expectedFields, time.Unix(0, 0)) + returnedMetric := metric.New(metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields(), time.Unix(0, 0)) //deep equal fields require.Equal(t, expectedMetric.Fields(), returnedMetric.Fields()) @@ -240,8 +238,7 @@ func TestValueConversion(t *testing.T) { metrics, err = p.Parse([]byte(testCSV)) require.NoError(t, err) - returnedMetric, err2 = metric.New(metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields(), time.Unix(0, 0)) - require.NoError(t, err2) + returnedMetric = metric.New(metrics[0].Name(), metrics[0].Tags(), metrics[0].Fields(), time.Unix(0, 0)) //deep equal fields require.Equal(t, expectedMetric.Fields(), returnedMetric.Fields()) diff --git a/plugins/parsers/dropwizard/parser.go b/plugins/parsers/dropwizard/parser.go index 43b8c139f3220..2115bd8a07e78 100644 --- a/plugins/parsers/dropwizard/parser.go +++ b/plugins/parsers/dropwizard/parser.go @@ -227,11 +227,7 @@ func (p *parser) readDWMetrics(metricType string, dwms interface{}, metrics []te parsed, err := p.seriesParser.Parse([]byte(measurementName)) var m telegraf.Metric if err != nil || len(parsed) != 1 { - m, err = metric.New(measurementName, map[string]string{}, map[string]interface{}{}, tm) - if err != nil { - log.Printf("W! failed to create metric of type '%s': %s\n", metricType, err) - continue - } + m = metric.New(measurementName, map[string]string{}, map[string]interface{}{}, tm) } else { m = parsed[0] m.SetTime(tm) diff --git a/plugins/parsers/dropwizard/parser_test.go b/plugins/parsers/dropwizard/parser_test.go index df75c7f252969..b867670c9400e 100644 --- a/plugins/parsers/dropwizard/parser_test.go +++ b/plugins/parsers/dropwizard/parser_test.go @@ -497,13 +497,6 @@ func containsAll(t1 map[string]string, t2 map[string]string) bool { return true } -func Metric(v telegraf.Metric, err error) telegraf.Metric { - if err != nil { - panic(err) - } - return v -} - func NoError(t *testing.T, err error) { require.NoError(t, err) } @@ -519,17 +512,15 @@ func TestDropWizard(t *testing.T) { name: "minimal", input: []byte(`{"version": "3.0.0", "counters": {"cpu": {"value": 42}}}`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "metric_type": "counter", - }, - map[string]interface{}{ - "value": 42.0, - }, - testTimeFunc(), - ), + metric.New( + "cpu", + map[string]string{ + "metric_type": "counter", + }, + map[string]interface{}{ + "value": 42.0, + }, + testTimeFunc(), ), }, errFunc: NoError, @@ -538,17 +529,15 @@ func TestDropWizard(t *testing.T) { name: "name with space unescaped", input: []byte(`{"version": "3.0.0", "counters": {"hello world": {"value": 42}}}`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "hello world", - map[string]string{ - "metric_type": "counter", - }, - map[string]interface{}{ - "value": 42.0, - }, - testTimeFunc(), - ), + metric.New( + "hello world", + map[string]string{ + "metric_type": "counter", + }, + map[string]interface{}{ + "value": 42.0, + }, + testTimeFunc(), ), }, errFunc: NoError, @@ -564,17 +553,15 @@ func TestDropWizard(t *testing.T) { name: "name with space double slash escape", input: []byte(`{"version": "3.0.0", "counters": {"hello\\ world": {"value": 42}}}`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "hello world", - map[string]string{ - "metric_type": "counter", - }, - map[string]interface{}{ - "value": 42.0, - }, - testTimeFunc(), - ), + metric.New( + "hello world", + map[string]string{ + "metric_type": "counter", + }, + map[string]interface{}{ + "value": 42.0, + }, + testTimeFunc(), ), }, errFunc: NoError, diff --git a/plugins/parsers/form_urlencoded/parser.go b/plugins/parsers/form_urlencoded/parser.go index f38d87a80eac0..f26740709251a 100644 --- a/plugins/parsers/form_urlencoded/parser.go +++ b/plugins/parsers/form_urlencoded/parser.go @@ -47,12 +47,9 @@ func (p Parser) Parse(buf []byte) ([]telegraf.Metric, error) { tags[key] = value } - metric, err := metric.New(p.MetricName, tags, fields, time.Now().UTC()) - if err != nil { - return nil, err - } + m := metric.New(p.MetricName, tags, fields, time.Now().UTC()) - return []telegraf.Metric{metric}, nil + return []telegraf.Metric{m}, nil } // ParseLine delegates a single line of text to the Parse function diff --git a/plugins/parsers/graphite/parser.go b/plugins/parsers/graphite/parser.go index 5c0f3a8070452..dac4f55f83f25 100644 --- a/plugins/parsers/graphite/parser.go +++ b/plugins/parsers/graphite/parser.go @@ -174,7 +174,7 @@ func (p *GraphiteParser) ParseLine(line string) (telegraf.Metric, error) { } } - return metric.New(measurement, tags, fieldValues, timestamp) + return metric.New(measurement, tags, fieldValues, timestamp), nil } // ApplyTemplate extracts the template fields from the given line and diff --git a/plugins/parsers/graphite/parser_test.go b/plugins/parsers/graphite/parser_test.go index 1bc4f6363c3e4..991cce661762c 100644 --- a/plugins/parsers/graphite/parser_test.go +++ b/plugins/parsers/graphite/parser_test.go @@ -472,11 +472,10 @@ func TestFilterMatchDefault(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("miss.servers.localhost.cpu_load", + exp := metric.New("miss.servers.localhost.cpu_load", map[string]string{}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) - assert.NoError(t, err) m, err := p.ParseLine("miss.servers.localhost.cpu_load 11 1435077219") assert.NoError(t, err) @@ -490,11 +489,10 @@ func TestFilterMatchMultipleMeasurement(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("cpu.cpu_load.10", + exp := metric.New("cpu.cpu_load.10", map[string]string{"host": "localhost"}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) - assert.NoError(t, err) m, err := p.ParseLine("servers.localhost.cpu.cpu_load.10 11 1435077219") assert.NoError(t, err) @@ -509,11 +507,10 @@ func TestFilterMatchMultipleMeasurementSeparator(t *testing.T) { ) assert.NoError(t, err) - exp, err := metric.New("cpu_cpu_load_10", + exp := metric.New("cpu_cpu_load_10", map[string]string{"host": "localhost"}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) - assert.NoError(t, err) m, err := p.ParseLine("servers.localhost.cpu.cpu_load.10 11 1435077219") assert.NoError(t, err) @@ -527,7 +524,7 @@ func TestFilterMatchSingle(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("cpu_load", + exp := metric.New("cpu_load", map[string]string{"host": "localhost"}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) @@ -544,11 +541,10 @@ func TestParseNoMatch(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("servers.localhost.memory.VmallocChunk", + exp := metric.New("servers.localhost.memory.VmallocChunk", map[string]string{}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) - assert.NoError(t, err) m, err := p.ParseLine("servers.localhost.memory.VmallocChunk 11 1435077219") assert.NoError(t, err) @@ -562,11 +558,10 @@ func TestFilterMatchWildcard(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("cpu_load", + exp := metric.New("cpu_load", map[string]string{"host": "localhost"}, 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) @@ -582,11 +577,10 @@ func TestFilterMatchExactBeforeWildcard(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("cpu_load", + exp := metric.New("cpu_load", map[string]string{"host": "localhost"}, 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) @@ -631,11 +625,10 @@ func TestFilterMatchMultipleWildcards(t *testing.T) { t.Fatalf("unexpected error creating parser, got %v", err) } - exp, err := metric.New("cpu_load", + exp := metric.New("cpu_load", map[string]string{"host": "server01"}, map[string]interface{}{"value": float64(11)}, time.Unix(1435077219, 0)) - assert.NoError(t, err) m, err := p.ParseLine("servers.server01.cpu_load 11 1435077219") assert.NoError(t, err) diff --git a/plugins/parsers/grok/parser.go b/plugins/parsers/grok/parser.go index 7037473e851da..57e6269994ed2 100644 --- a/plugins/parsers/grok/parser.go +++ b/plugins/parsers/grok/parser.go @@ -370,10 +370,10 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) { } if p.UniqueTimestamp != "auto" { - return metric.New(p.Measurement, tags, fields, timestamp) + return metric.New(p.Measurement, tags, fields, timestamp), nil } - return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp)) + return metric.New(p.Measurement, tags, fields, p.tsModder.tsMod(timestamp)), nil } func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) { diff --git a/plugins/parsers/influx/handler.go b/plugins/parsers/influx/handler.go index efd7329ca9c29..7d1a3af3e12a1 100644 --- a/plugins/parsers/influx/handler.go +++ b/plugins/parsers/influx/handler.go @@ -46,10 +46,9 @@ func (h *MetricHandler) Metric() (telegraf.Metric, error) { } func (h *MetricHandler) SetMeasurement(name []byte) error { - var err error - h.metric, err = metric.New(nameUnescape(name), + h.metric = metric.New(nameUnescape(name), nil, nil, time.Time{}) - return err + return nil } func (h *MetricHandler) AddTag(key []byte, value []byte) error { diff --git a/plugins/parsers/influx/parser_test.go b/plugins/parsers/influx/parser_test.go index 5c780f070fce5..c5a39801782c1 100644 --- a/plugins/parsers/influx/parser_test.go +++ b/plugins/parsers/influx/parser_test.go @@ -15,13 +15,6 @@ import ( "github.com/stretchr/testify/require" ) -func Metric(v telegraf.Metric, err error) telegraf.Metric { - if err != nil { - panic(err) - } - return v -} - var DefaultTime = func() time.Time { return time.Unix(42, 0) } @@ -37,15 +30,13 @@ var ptests = []struct { name: "minimal", input: []byte("cpu value=42 0"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, err: nil, @@ -54,15 +45,13 @@ var ptests = []struct { name: "minimal with newline", input: []byte("cpu value=42 0\n"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, err: nil, @@ -71,15 +60,13 @@ var ptests = []struct { name: "measurement escape space", input: []byte(`c\ pu value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "c pu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "c pu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -88,15 +75,13 @@ var ptests = []struct { name: "measurement escape comma", input: []byte(`c\,pu value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "c,pu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "c,pu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -105,18 +90,16 @@ var ptests = []struct { name: "tags", input: []byte(`cpu,cpu=cpu0,host=localhost value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "cpu": "cpu0", - "host": "localhost", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "cpu": "cpu0", + "host": "localhost", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -125,17 +108,15 @@ var ptests = []struct { name: "tags escape unescapable", input: []byte(`cpu,ho\st=localhost value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - `ho\st`: "localhost", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + `ho\st`: "localhost", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -144,17 +125,15 @@ var ptests = []struct { name: "tags escape equals", input: []byte(`cpu,ho\=st=localhost value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "ho=st": "localhost", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "ho=st": "localhost", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -163,17 +142,15 @@ var ptests = []struct { name: "tags escape comma", input: []byte(`cpu,ho\,st=localhost value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "ho,st": "localhost", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "ho,st": "localhost", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -182,17 +159,15 @@ var ptests = []struct { name: "tag value escape space", input: []byte(`cpu,host=two\ words value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "host": "two words", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "host": "two words", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -201,17 +176,15 @@ var ptests = []struct { name: "tag value double escape space", input: []byte(`cpu,host=two\\ words value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "host": `two\ words`, - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "host": `two\ words`, + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -220,17 +193,15 @@ var ptests = []struct { name: "tag value triple escape space", input: []byte(`cpu,host=two\\\ words value=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "host": `two\\ words`, - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{ + "host": `two\\ words`, + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -239,15 +210,13 @@ var ptests = []struct { name: "field key escape not escapable", input: []byte(`cpu va\lue=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `va\lue`: 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `va\lue`: 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -256,15 +225,13 @@ var ptests = []struct { name: "field key escape equals", input: []byte(`cpu va\=lue=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `va=lue`: 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `va=lue`: 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -273,15 +240,13 @@ var ptests = []struct { name: "field key escape comma", input: []byte(`cpu va\,lue=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `va,lue`: 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `va,lue`: 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -290,15 +255,13 @@ var ptests = []struct { name: "field key escape space", input: []byte(`cpu va\ lue=42`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `va lue`: 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `va lue`: 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -307,15 +270,13 @@ var ptests = []struct { name: "field int", input: []byte("cpu value=42i"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42, + }, + time.Unix(42, 0), ), }, err: nil, @@ -336,15 +297,13 @@ var ptests = []struct { name: "field int max value", input: []byte("cpu value=9223372036854775807i"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": int64(9223372036854775807), - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": int64(9223372036854775807), + }, + time.Unix(42, 0), ), }, err: nil, @@ -353,15 +312,13 @@ var ptests = []struct { name: "field uint", input: []byte("cpu value=42u"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(42), - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(42), + }, + time.Unix(42, 0), ), }, err: nil, @@ -382,15 +339,13 @@ var ptests = []struct { name: "field uint max value", input: []byte("cpu value=18446744073709551615u"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(18446744073709551615), - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(18446744073709551615), + }, + time.Unix(42, 0), ), }, err: nil, @@ -399,15 +354,13 @@ var ptests = []struct { name: "field boolean", input: []byte("cpu value=true"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": true, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": true, + }, + time.Unix(42, 0), ), }, err: nil, @@ -416,15 +369,13 @@ var ptests = []struct { name: "field string", input: []byte(`cpu value="42"`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": "42", - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": "42", + }, + time.Unix(42, 0), ), }, err: nil, @@ -433,15 +384,13 @@ var ptests = []struct { name: "field string escape quote", input: []byte(`cpu value="how\"dy"`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `value`: `how"dy`, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `value`: `how"dy`, + }, + time.Unix(42, 0), ), }, err: nil, @@ -450,15 +399,13 @@ var ptests = []struct { name: "field string escape backslash", input: []byte(`cpu value="how\\dy"`), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - `value`: `how\dy`, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + `value`: `how\dy`, + }, + time.Unix(42, 0), ), }, err: nil, @@ -467,15 +414,13 @@ var ptests = []struct { name: "field string newline", input: []byte("cpu value=\"4\n2\""), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": "4\n2", - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": "4\n2", + }, + time.Unix(42, 0), ), }, err: nil, @@ -484,15 +429,13 @@ var ptests = []struct { name: "no timestamp", input: []byte("cpu value=42"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -504,15 +447,13 @@ var ptests = []struct { return time.Unix(42, 123456789) }, metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 123456789), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 123456789), ), }, err: nil, @@ -521,25 +462,21 @@ var ptests = []struct { name: "multiple lines", input: []byte("cpu value=42\ncpu value=42"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(42, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(42, 0), ), }, err: nil, @@ -560,69 +497,67 @@ var ptests = []struct { name: "procstat", input: []byte("procstat,exe=bash,process_name=bash voluntary_context_switches=42i,memory_rss=5103616i,rlimit_memory_data_hard=2147483647i,cpu_time_user=0.02,rlimit_file_locks_soft=2147483647i,pid=29417i,cpu_time_nice=0,rlimit_memory_locked_soft=65536i,read_count=259i,rlimit_memory_vms_hard=2147483647i,memory_swap=0i,rlimit_num_fds_soft=1024i,rlimit_nice_priority_hard=0i,cpu_time_soft_irq=0,cpu_time=0i,rlimit_memory_locked_hard=65536i,realtime_priority=0i,signals_pending=0i,nice_priority=20i,cpu_time_idle=0,memory_stack=139264i,memory_locked=0i,rlimit_memory_stack_soft=8388608i,cpu_time_iowait=0,cpu_time_guest=0,cpu_time_guest_nice=0,rlimit_memory_data_soft=2147483647i,read_bytes=0i,rlimit_cpu_time_soft=2147483647i,involuntary_context_switches=2i,write_bytes=106496i,cpu_time_system=0,cpu_time_irq=0,cpu_usage=0,memory_vms=21659648i,memory_data=1576960i,rlimit_memory_stack_hard=2147483647i,num_threads=1i,rlimit_memory_rss_soft=2147483647i,rlimit_realtime_priority_soft=0i,num_fds=4i,write_count=35i,rlimit_signals_pending_soft=78994i,cpu_time_steal=0,rlimit_num_fds_hard=4096i,rlimit_file_locks_hard=2147483647i,rlimit_cpu_time_hard=2147483647i,rlimit_signals_pending_hard=78994i,rlimit_nice_priority_soft=0i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_realtime_priority_hard=0i 1517620624000000000"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "procstat", - map[string]string{ - "exe": "bash", - "process_name": "bash", - }, - map[string]interface{}{ - "cpu_time": 0, - "cpu_time_guest": float64(0), - "cpu_time_guest_nice": float64(0), - "cpu_time_idle": float64(0), - "cpu_time_iowait": float64(0), - "cpu_time_irq": float64(0), - "cpu_time_nice": float64(0), - "cpu_time_soft_irq": float64(0), - "cpu_time_steal": float64(0), - "cpu_time_system": float64(0), - "cpu_time_user": float64(0.02), - "cpu_usage": float64(0), - "involuntary_context_switches": 2, - "memory_data": 1576960, - "memory_locked": 0, - "memory_rss": 5103616, - "memory_stack": 139264, - "memory_swap": 0, - "memory_vms": 21659648, - "nice_priority": 20, - "num_fds": 4, - "num_threads": 1, - "pid": 29417, - "read_bytes": 0, - "read_count": 259, - "realtime_priority": 0, - "rlimit_cpu_time_hard": 2147483647, - "rlimit_cpu_time_soft": 2147483647, - "rlimit_file_locks_hard": 2147483647, - "rlimit_file_locks_soft": 2147483647, - "rlimit_memory_data_hard": 2147483647, - "rlimit_memory_data_soft": 2147483647, - "rlimit_memory_locked_hard": 65536, - "rlimit_memory_locked_soft": 65536, - "rlimit_memory_rss_hard": 2147483647, - "rlimit_memory_rss_soft": 2147483647, - "rlimit_memory_stack_hard": 2147483647, - "rlimit_memory_stack_soft": 8388608, - "rlimit_memory_vms_hard": 2147483647, - "rlimit_memory_vms_soft": 2147483647, - "rlimit_nice_priority_hard": 0, - "rlimit_nice_priority_soft": 0, - "rlimit_num_fds_hard": 4096, - "rlimit_num_fds_soft": 1024, - "rlimit_realtime_priority_hard": 0, - "rlimit_realtime_priority_soft": 0, - "rlimit_signals_pending_hard": 78994, - "rlimit_signals_pending_soft": 78994, - "signals_pending": 0, - "voluntary_context_switches": 42, - "write_bytes": 106496, - "write_count": 35, - }, - time.Unix(0, 1517620624000000000), - ), + metric.New( + "procstat", + map[string]string{ + "exe": "bash", + "process_name": "bash", + }, + map[string]interface{}{ + "cpu_time": 0, + "cpu_time_guest": float64(0), + "cpu_time_guest_nice": float64(0), + "cpu_time_idle": float64(0), + "cpu_time_iowait": float64(0), + "cpu_time_irq": float64(0), + "cpu_time_nice": float64(0), + "cpu_time_soft_irq": float64(0), + "cpu_time_steal": float64(0), + "cpu_time_system": float64(0), + "cpu_time_user": float64(0.02), + "cpu_usage": float64(0), + "involuntary_context_switches": 2, + "memory_data": 1576960, + "memory_locked": 0, + "memory_rss": 5103616, + "memory_stack": 139264, + "memory_swap": 0, + "memory_vms": 21659648, + "nice_priority": 20, + "num_fds": 4, + "num_threads": 1, + "pid": 29417, + "read_bytes": 0, + "read_count": 259, + "realtime_priority": 0, + "rlimit_cpu_time_hard": 2147483647, + "rlimit_cpu_time_soft": 2147483647, + "rlimit_file_locks_hard": 2147483647, + "rlimit_file_locks_soft": 2147483647, + "rlimit_memory_data_hard": 2147483647, + "rlimit_memory_data_soft": 2147483647, + "rlimit_memory_locked_hard": 65536, + "rlimit_memory_locked_soft": 65536, + "rlimit_memory_rss_hard": 2147483647, + "rlimit_memory_rss_soft": 2147483647, + "rlimit_memory_stack_hard": 2147483647, + "rlimit_memory_stack_soft": 8388608, + "rlimit_memory_vms_hard": 2147483647, + "rlimit_memory_vms_soft": 2147483647, + "rlimit_nice_priority_hard": 0, + "rlimit_nice_priority_soft": 0, + "rlimit_num_fds_hard": 4096, + "rlimit_num_fds_soft": 1024, + "rlimit_realtime_priority_hard": 0, + "rlimit_realtime_priority_soft": 0, + "rlimit_signals_pending_hard": 78994, + "rlimit_signals_pending_soft": 78994, + "signals_pending": 0, + "voluntary_context_switches": 42, + "write_bytes": 106496, + "write_count": 35, + }, + time.Unix(0, 1517620624000000000), ), }, err: nil, @@ -712,13 +647,11 @@ func TestSeriesParser(t *testing.T) { name: "minimal", input: []byte("cpu"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{}, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{}, + time.Unix(0, 0), ), }, }, @@ -726,16 +659,14 @@ func TestSeriesParser(t *testing.T) { name: "tags", input: []byte("cpu,a=x,b=y"), metrics: []telegraf.Metric{ - Metric( - metric.New( - "cpu", - map[string]string{ - "a": "x", - "b": "y", - }, - map[string]interface{}{}, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{ + "a": "x", + "b": "y", + }, + map[string]interface{}{}, + time.Unix(0, 0), ), }, }, diff --git a/plugins/parsers/json/parser.go b/plugins/parsers/json/parser.go index 1830e2a6a4d0e..a651ae5343770 100644 --- a/plugins/parsers/json/parser.go +++ b/plugins/parsers/json/parser.go @@ -142,11 +142,9 @@ func (p *Parser) parseObject(data map[string]interface{}, timestamp time.Time) ( } tags, nFields := p.switchFieldToTag(tags, f.Fields) - metric, err := metric.New(name, tags, nFields, timestamp) - if err != nil { - return nil, err - } - return []telegraf.Metric{metric}, nil + m := metric.New(name, tags, nFields, timestamp) + + return []telegraf.Metric{m}, nil } // will take in field map with strings and bools, diff --git a/plugins/parsers/logfmt/parser.go b/plugins/parsers/logfmt/parser.go index 603dbbae862b9..01da916a2850d 100644 --- a/plugins/parsers/logfmt/parser.go +++ b/plugins/parsers/logfmt/parser.go @@ -67,10 +67,7 @@ func (p *Parser) Parse(b []byte) ([]telegraf.Metric, error) { continue } - m, err := metric.New(p.MetricName, map[string]string{}, fields, p.Now()) - if err != nil { - return nil, err - } + m := metric.New(p.MetricName, map[string]string{}, fields, p.Now()) metrics = append(metrics, m) } diff --git a/plugins/parsers/logfmt/parser_test.go b/plugins/parsers/logfmt/parser_test.go index dfacd8c8fae0d..f2a7174891fa9 100644 --- a/plugins/parsers/logfmt/parser_test.go +++ b/plugins/parsers/logfmt/parser_test.go @@ -11,10 +11,8 @@ import ( func MustMetric(t *testing.T, m *testutil.Metric) telegraf.Metric { t.Helper() - v, err := metric.New(m.Measurement, m.Tags, m.Fields, m.Time) - if err != nil { - t.Fatal(err) - } + v := metric.New(m.Measurement, m.Tags, m.Fields, m.Time) + return v } diff --git a/plugins/parsers/nagios/parser.go b/plugins/parsers/nagios/parser.go index b347195ab3c37..81e116178bf2b 100644 --- a/plugins/parsers/nagios/parser.go +++ b/plugins/parsers/nagios/parser.go @@ -65,10 +65,8 @@ func TryAddState(runErr error, metrics []telegraf.Metric) ([]telegraf.Metric, er f := map[string]interface{}{ "state": state, } - m, err := metric.New("nagios_state", nil, f, ts) - if err != nil { - return metrics, err - } + m := metric.New("nagios_state", nil, f, ts) + metrics = append(metrics, m) return metrics, nil } @@ -166,12 +164,8 @@ func (p *NagiosParser) Parse(buf []byte) ([]telegraf.Metric, error) { fields["long_service_output"] = longmsg.String() } - m, err := metric.New("nagios_state", nil, fields, ts) - if err == nil { - metrics = append(metrics, m) - } else { - log.Printf("E! [parser.nagios] failed to add nagios_state: %s\n", err) - } + m := metric.New("nagios_state", nil, fields, ts) + metrics = append(metrics, m) return metrics, nil } @@ -247,12 +241,10 @@ func parsePerfData(perfdatas string, timestamp time.Time) ([]telegraf.Metric, er } // Create metric - metric, err := metric.New("nagios", tags, fields, timestamp) - if err != nil { - return nil, err - } + m := metric.New("nagios", tags, fields, timestamp) + // Add Metric - metrics = append(metrics, metric) + metrics = append(metrics, m) } return metrics, nil diff --git a/plugins/parsers/nagios/parser_test.go b/plugins/parsers/nagios/parser_test.go index d269debd62ce7..2173af15214ba 100644 --- a/plugins/parsers/nagios/parser_test.go +++ b/plugins/parsers/nagios/parser_test.go @@ -74,10 +74,7 @@ func (b *metricBuilder) f(k string, v interface{}) *metricBuilder { } func (b *metricBuilder) b() telegraf.Metric { - m, err := metric.New(b.name, b.tags, b.fields, b.timestamp) - if err != nil { - panic(err) - } + m := metric.New(b.name, b.tags, b.fields, b.timestamp) return m } diff --git a/plugins/parsers/prometheus/parser.go b/plugins/parsers/prometheus/parser.go index bf5ebf7f12f19..e55789f7957b4 100644 --- a/plugins/parsers/prometheus/parser.go +++ b/plugins/parsers/prometheus/parser.go @@ -4,13 +4,14 @@ import ( "bufio" "bytes" "fmt" - "github.com/matttproud/golang_protobuf_extensions/pbutil" "io" "math" "mime" "net/http" "time" + "github.com/matttproud/golang_protobuf_extensions/pbutil" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/parsers/prometheus/common" @@ -80,10 +81,8 @@ func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) { // converting to telegraf metric if len(fields) > 0 { t := getTimestamp(m, now) - metric, err := metric.New("prometheus", tags, fields, t, common.ValueType(mf.GetType())) - if err == nil { - metrics = append(metrics, metric) - } + m := metric.New("prometheus", tags, fields, t, common.ValueType(mf.GetType())) + metrics = append(metrics, m) } } } @@ -121,10 +120,8 @@ func makeQuantiles(m *dto.Metric, tags map[string]string, metricName string, met fields[metricName+"_count"] = float64(m.GetSummary().GetSampleCount()) fields[metricName+"_sum"] = float64(m.GetSummary().GetSampleSum()) - met, err := metric.New("prometheus", tags, fields, t, common.ValueType(metricType)) - if err == nil { - metrics = append(metrics, met) - } + met := metric.New("prometheus", tags, fields, t, common.ValueType(metricType)) + metrics = append(metrics, met) for _, q := range m.GetSummary().Quantile { newTags := tags @@ -133,10 +130,8 @@ func makeQuantiles(m *dto.Metric, tags map[string]string, metricName string, met newTags["quantile"] = fmt.Sprint(q.GetQuantile()) fields[metricName] = float64(q.GetValue()) - quantileMetric, err := metric.New("prometheus", newTags, fields, t, common.ValueType(metricType)) - if err == nil { - metrics = append(metrics, quantileMetric) - } + quantileMetric := metric.New("prometheus", newTags, fields, t, common.ValueType(metricType)) + metrics = append(metrics, quantileMetric) } return metrics } @@ -150,10 +145,8 @@ func makeBuckets(m *dto.Metric, tags map[string]string, metricName string, metri fields[metricName+"_count"] = float64(m.GetHistogram().GetSampleCount()) fields[metricName+"_sum"] = float64(m.GetHistogram().GetSampleSum()) - met, err := metric.New("prometheus", tags, fields, t, common.ValueType(metricType)) - if err == nil { - metrics = append(metrics, met) - } + met := metric.New("prometheus", tags, fields, t, common.ValueType(metricType)) + metrics = append(metrics, met) for _, b := range m.GetHistogram().Bucket { newTags := tags @@ -161,10 +154,8 @@ func makeBuckets(m *dto.Metric, tags map[string]string, metricName string, metri newTags["le"] = fmt.Sprint(b.GetUpperBound()) fields[metricName+"_bucket"] = float64(b.GetCumulativeCount()) - histogramMetric, err := metric.New("prometheus", newTags, fields, t, common.ValueType(metricType)) - if err == nil { - metrics = append(metrics, histogramMetric) - } + histogramMetric := metric.New("prometheus", newTags, fields, t, common.ValueType(metricType)) + metrics = append(metrics, histogramMetric) } return metrics } diff --git a/plugins/parsers/prometheusremotewrite/parser.go b/plugins/parsers/prometheusremotewrite/parser.go index 90921dfb14e7a..9f0a08a682a19 100644 --- a/plugins/parsers/prometheusremotewrite/parser.go +++ b/plugins/parsers/prometheusremotewrite/parser.go @@ -55,10 +55,7 @@ func (p *Parser) Parse(buf []byte) ([]telegraf.Metric, error) { if s.Timestamp > 0 { t = time.Unix(0, s.Timestamp*1000000) } - m, err := metric.New("prometheus_remote_write", tags, fields, t) - if err != nil { - return nil, fmt.Errorf("unable to convert to telegraf metric: %s", err) - } + m := metric.New("prometheus_remote_write", tags, fields, t) metrics = append(metrics, m) } } diff --git a/plugins/parsers/value/parser.go b/plugins/parsers/value/parser.go index d4a9046e020a9..dc496663e98d9 100644 --- a/plugins/parsers/value/parser.go +++ b/plugins/parsers/value/parser.go @@ -48,13 +48,10 @@ func (v *ValueParser) Parse(buf []byte) ([]telegraf.Metric, error) { } fields := map[string]interface{}{v.FieldName: value} - metric, err := metric.New(v.MetricName, v.DefaultTags, + m := metric.New(v.MetricName, v.DefaultTags, fields, time.Now().UTC()) - if err != nil { - return nil, err - } - return []telegraf.Metric{metric}, nil + return []telegraf.Metric{m}, nil } func (v *ValueParser) ParseLine(line string) (telegraf.Metric, error) { diff --git a/plugins/parsers/wavefront/parser.go b/plugins/parsers/wavefront/parser.go index 5fba2d5ded74b..ad3e704c58390 100644 --- a/plugins/parsers/wavefront/parser.go +++ b/plugins/parsers/wavefront/parser.go @@ -152,10 +152,7 @@ func (p *PointParser) convertPointToTelegrafMetric(points []Point) ([]telegraf.M } fields["value"] = v - m, err := metric.New(point.Name, tags, fields, time.Unix(point.Timestamp, 0)) - if err != nil { - return nil, err - } + m := metric.New(point.Name, tags, fields, time.Unix(point.Timestamp, 0)) metrics = append(metrics, m) } diff --git a/plugins/parsers/wavefront/parser_test.go b/plugins/parsers/wavefront/parser_test.go index 1f1801730c73b..0165b499946e0 100644 --- a/plugins/parsers/wavefront/parser_test.go +++ b/plugins/parsers/wavefront/parser_test.go @@ -14,77 +14,65 @@ func TestParse(t *testing.T) { parsedMetrics, err := parser.Parse([]byte("test.metric 1")) assert.NoError(t, err) - testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) - assert.NoError(t, err) + testMetric := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) assert.Equal(t, parsedMetrics[0].Name(), testMetric.Name()) assert.Equal(t, parsedMetrics[0].Fields(), testMetric.Fields()) parsedMetrics, err = parser.Parse([]byte("\u2206test.delta 1 1530939936")) assert.NoError(t, err) - testMetric, err = metric.New("\u2206test.delta", map[string]string{}, + testMetric = metric.New("\u2206test.delta", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\u0394test.delta 1 1530939936")) assert.NoError(t, err) - testMetric, err = metric.New("\u0394test.delta", map[string]string{}, + testMetric = metric.New("\u0394test.delta", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\u0394test.delta 1.234 1530939936 source=\"mysource\" tag2=value2")) assert.NoError(t, err) - testMetric, err = metric.New("\u0394test.delta", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("\u0394test.delta", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 source=\"mysource\"")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" -1.1234 1530939936 \"source\"=\"mysource\" tag2=value2")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": -1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": -1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234e04 1530939936 \"source\"=\"mysource\" tag2=value2")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234e04}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234e04}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234e-04 1530939936 \"source\"=\"mysource\" tag2=value2")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234e-04}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234e-04}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("test.metric 1.1234 1530939936 source=\"mysource\" tag2=value2 ")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) } @@ -93,39 +81,33 @@ func TestParseLine(t *testing.T) { parsedMetric, err := parser.ParseLine("test.metric 1") assert.NoError(t, err) - testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) - assert.NoError(t, err) + testMetric := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) assert.Equal(t, parsedMetric.Name(), testMetric.Name()) assert.Equal(t, parsedMetric.Fields(), testMetric.Fields()) parsedMetric, err = parser.ParseLine("test.metric 1 1530939936") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) parsedMetric, err = parser.ParseLine("test.metric 1 1530939936 source=mysource") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) parsedMetric, err = parser.ParseLine("\"test.metric\" 1.1234 1530939936 source=\"mysource\"") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) parsedMetric, err = parser.ParseLine("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) parsedMetric, err = parser.ParseLine("test.metric 1.1234 1530939936 source=\"mysource\" tag2=value2 ") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) } @@ -134,10 +116,8 @@ func TestParseMultiple(t *testing.T) { parsedMetrics, err := parser.Parse([]byte("test.metric 1\ntest.metric2 2 1530939936")) assert.NoError(t, err) - testMetric1, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) - assert.NoError(t, err) - testMetric2, err := metric.New("test.metric2", map[string]string{}, map[string]interface{}{"value": 2.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric1 := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(0, 0)) + testMetric2 := metric.New("test.metric2", map[string]string{}, map[string]interface{}{"value": 2.}, time.Unix(1530939936, 0)) testMetrics := []telegraf.Metric{testMetric1, testMetric2} assert.Equal(t, parsedMetrics[0].Name(), testMetrics[0].Name()) assert.Equal(t, parsedMetrics[0].Fields(), testMetrics[0].Fields()) @@ -145,30 +125,23 @@ func TestParseMultiple(t *testing.T) { parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource\n\"test.metric\" 1.1234 1530939936 source=\"mysource\"")) assert.NoError(t, err) - testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) - testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric1 = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) + testMetric2 = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) testMetrics = []telegraf.Metric{testMetric1, testMetric2} assert.EqualValues(t, parsedMetrics, testMetrics) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 \"source\"=\"mysource\" tag2=value2\ntest.metric 1.1234 1530939936 source=\"mysource\" tag2=value2 ")) assert.NoError(t, err) - testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) - testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric1 = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) + testMetric2 = metric.New("test.metric", map[string]string{"source": "mysource", "tag2": "value2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) testMetrics = []telegraf.Metric{testMetric1, testMetric2} assert.EqualValues(t, parsedMetrics, testMetrics) parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource\n\"test.metric\" 1.1234 1530939936 source=\"mysource\"\ntest.metric3 333 1530939936 tagit=valueit")) assert.NoError(t, err) - testMetric1, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) - testMetric2, err = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) - testMetric3, err := metric.New("test.metric3", map[string]string{"tagit": "valueit"}, map[string]interface{}{"value": 333.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric1 = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) + testMetric2 = metric.New("test.metric", map[string]string{"source": "mysource"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) + testMetric3 := metric.New("test.metric3", map[string]string{"tagit": "valueit"}, map[string]interface{}{"value": 333.}, time.Unix(1530939936, 0)) testMetrics = []telegraf.Metric{testMetric1, testMetric2, testMetric3} assert.EqualValues(t, parsedMetrics, testMetrics) } @@ -178,14 +151,12 @@ func TestParseSpecial(t *testing.T) { parsedMetric, err := parser.ParseLine("\"test.metric\" 1 1530939936") assert.NoError(t, err) - testMetric, err := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric := metric.New("test.metric", map[string]string{}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) parsedMetric, err = parser.ParseLine("test.metric 1 1530939936 tag1=\"val\\\"ue1\"") assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"tag1": "val\\\"ue1"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"tag1": "val\\\"ue1"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetric, testMetric) } @@ -225,19 +196,16 @@ func TestParseDefaultTags(t *testing.T) { parsedMetrics, err := parser.Parse([]byte("test.metric 1 1530939936")) assert.NoError(t, err) - testMetric, err := metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric := metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("test.metric 1 1530939936 source=mysource")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2", "source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2", "source": "mysource"}, map[string]interface{}{"value": 1.}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) parsedMetrics, err = parser.Parse([]byte("\"test.metric\" 1.1234 1530939936 another=\"test3\"")) assert.NoError(t, err) - testMetric, err = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) - assert.NoError(t, err) + testMetric = metric.New("test.metric", map[string]string{"myDefault": "value1", "another": "test2"}, map[string]interface{}{"value": 1.1234}, time.Unix(1530939936, 0)) assert.EqualValues(t, parsedMetrics[0], testMetric) } diff --git a/plugins/parsers/xml/parser.go b/plugins/parsers/xml/parser.go index 75c79fbd71bae..9282aab1f2e25 100644 --- a/plugins/parsers/xml/parser.go +++ b/plugins/parsers/xml/parser.go @@ -292,7 +292,7 @@ func (p *Parser) parseQuery(starttime time.Time, doc, selected *xmlquery.Node, c } } - return metric.New(metricname, tags, fields, timestamp) + return metric.New(metricname, tags, fields, timestamp), nil } func getNodePath(node, relativeTo *xmlquery.Node, sep string) string { diff --git a/plugins/processors/clone/clone_test.go b/plugins/processors/clone/clone_test.go index f1b8dc5b29c03..20bec925e7acb 100644 --- a/plugins/processors/clone/clone_test.go +++ b/plugins/processors/clone/clone_test.go @@ -10,12 +10,12 @@ import ( ) func createTestMetric() telegraf.Metric { - metric, _ := metric.New("m1", + m := metric.New("m1", map[string]string{"metric_tag": "from_metric"}, map[string]interface{}{"value": int64(1)}, time.Now(), ) - return metric + return m } func calculateProcessedTags(processor Clone, metric telegraf.Metric) map[string]string { diff --git a/plugins/processors/date/date_test.go b/plugins/processors/date/date_test.go index c6d98051e7dec..aa7efc64edbff 100644 --- a/plugins/processors/date/date_test.go +++ b/plugins/processors/date/date_test.go @@ -19,7 +19,7 @@ func MustMetric(name string, tags map[string]string, fields map[string]interface if fields == nil { fields = map[string]interface{}{} } - m, _ := metric.New(name, tags, fields, metricTime) + m := metric.New(name, tags, fields, metricTime) return m } diff --git a/plugins/processors/dedup/dedup_test.go b/plugins/processors/dedup/dedup_test.go index 80dde9057b0da..4f3d109345b32 100644 --- a/plugins/processors/dedup/dedup_test.go +++ b/plugins/processors/dedup/dedup_test.go @@ -14,7 +14,7 @@ import ( const metricName = "m1" func createMetric(value int64, when time.Time) telegraf.Metric { - m, _ := metric.New(metricName, + m := metric.New(metricName, map[string]string{"tag": "tag_value"}, map[string]interface{}{"value": value}, when, @@ -162,7 +162,7 @@ func TestSameTimestamp(t *testing.T) { var in telegraf.Metric var out []telegraf.Metric - in, _ = metric.New("metric", + in = metric.New("metric", map[string]string{"tag": "value"}, map[string]interface{}{"foo": 1}, // field now, @@ -170,7 +170,7 @@ func TestSameTimestamp(t *testing.T) { out = dedup.Apply(in) require.Equal(t, []telegraf.Metric{in}, out) // pass - in, _ = metric.New("metric", + in = metric.New("metric", map[string]string{"tag": "value"}, map[string]interface{}{"bar": 1}, // different field now, @@ -178,7 +178,7 @@ func TestSameTimestamp(t *testing.T) { out = dedup.Apply(in) require.Equal(t, []telegraf.Metric{in}, out) // pass - in, _ = metric.New("metric", + in = metric.New("metric", map[string]string{"tag": "value"}, map[string]interface{}{"bar": 2}, // same field different value now, @@ -186,7 +186,7 @@ func TestSameTimestamp(t *testing.T) { out = dedup.Apply(in) require.Equal(t, []telegraf.Metric{in}, out) // pass - in, _ = metric.New("metric", + in = metric.New("metric", map[string]string{"tag": "value"}, map[string]interface{}{"bar": 2}, // same field same value now, diff --git a/plugins/processors/enum/enum_test.go b/plugins/processors/enum/enum_test.go index fdf9131ef3d8d..f8e3a34d0381c 100644 --- a/plugins/processors/enum/enum_test.go +++ b/plugins/processors/enum/enum_test.go @@ -11,7 +11,7 @@ import ( ) func createTestMetric() telegraf.Metric { - metric, _ := metric.New("m1", + m := metric.New("m1", map[string]string{ "tag": "tag_value", "duplicate_tag": "tag_value", @@ -26,7 +26,7 @@ func createTestMetric() telegraf.Metric { }, time.Now(), ) - return metric + return m } func calculateProcessedValues(mapper EnumMapper, metric telegraf.Metric) map[string]interface{} { diff --git a/plugins/processors/execd/execd_test.go b/plugins/processors/execd/execd_test.go index 3cccc9fbb156e..c226725e1844e 100644 --- a/plugins/processors/execd/execd_test.go +++ b/plugins/processors/execd/execd_test.go @@ -34,7 +34,7 @@ func TestExternalProcessorWorks(t *testing.T) { orig := now metrics := []telegraf.Metric{} for i := 0; i < 10; i++ { - m, err := metric.New("test", + m := metric.New("test", map[string]string{ "city": "Toronto", }, @@ -43,7 +43,6 @@ func TestExternalProcessorWorks(t *testing.T) { "count": 1, }, now) - require.NoError(t, err) metrics = append(metrics, m) now = now.Add(1) @@ -96,7 +95,7 @@ func TestParseLinesWithNewLines(t *testing.T) { now := time.Now() orig := now - m, err := metric.New("test", + m := metric.New("test", map[string]string{ "author": "Mr. Gopher", }, @@ -106,8 +105,6 @@ func TestParseLinesWithNewLines(t *testing.T) { }, now) - require.NoError(t, err) - e.Add(m, acc) acc.Wait(1) diff --git a/plugins/processors/override/override_test.go b/plugins/processors/override/override_test.go index 433751af96255..5e3c118e8f268 100644 --- a/plugins/processors/override/override_test.go +++ b/plugins/processors/override/override_test.go @@ -10,12 +10,12 @@ import ( ) func createTestMetric() telegraf.Metric { - metric, _ := metric.New("m1", + m := metric.New("m1", map[string]string{"metric_tag": "from_metric"}, map[string]interface{}{"value": int64(1)}, time.Now(), ) - return metric + return m } func calculateProcessedTags(processor Override, metric telegraf.Metric) map[string]string { diff --git a/plugins/processors/parser/parser_test.go b/plugins/processors/parser/parser_test.go index ac042848f67ec..512a6118dd0f4 100644 --- a/plugins/processors/parser/parser_test.go +++ b/plugins/processors/parser/parser_test.go @@ -21,13 +21,6 @@ func compareMetrics(t *testing.T, expected, actual []telegraf.Metric) { } } -func Metric(v telegraf.Metric, err error) telegraf.Metric { - if err != nil { - panic(err) - } - return v -} - func TestApply(t *testing.T) { tests := []struct { name string @@ -51,18 +44,17 @@ func TestApply(t *testing.T) { "method", }, }, - input: Metric( - metric.New( - "singleField", - map[string]string{ - "some": "tag", - }, - map[string]interface{}{ - "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "singleField", + map[string]string{ + "some": "tag", + }, + map[string]interface{}{ + "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "singleField", map[string]string{ "ts": "2018-07-24T19:43:40.275Z", @@ -71,7 +63,7 @@ func TestApply(t *testing.T) { "method": "POST", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -88,18 +80,17 @@ func TestApply(t *testing.T) { "method", }, }, - input: Metric( - metric.New( - "singleField", - map[string]string{ - "some": "tag", - }, - map[string]interface{}{ - "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "singleField", + map[string]string{ + "some": "tag", + }, + map[string]interface{}{ + "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "singleField", map[string]string{ "some": "tag", @@ -111,7 +102,7 @@ func TestApply(t *testing.T) { map[string]interface{}{ "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -127,18 +118,17 @@ func TestApply(t *testing.T) { "method", }, }, - input: Metric( - metric.New( - "singleField", - map[string]string{ - "some": "tag", - }, - map[string]interface{}{ - "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "singleField", + map[string]string{ + "some": "tag", + }, + map[string]interface{}{ + "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "singleField", map[string]string{ "some": "tag", @@ -146,8 +136,8 @@ func TestApply(t *testing.T) { map[string]interface{}{ "sample": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, }, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "singleField", map[string]string{ "ts": "2018-07-24T19:43:40.275Z", @@ -156,7 +146,7 @@ func TestApply(t *testing.T) { "method": "POST", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -166,23 +156,22 @@ func TestApply(t *testing.T) { DataFormat: "influx", }, dropOriginal: false, - input: Metric( - metric.New( - "influxField", - map[string]string{}, - map[string]interface{}{ - "message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790", - }, - time.Unix(0, 0))), + input: metric.New( + "influxField", + map[string]string{}, + map[string]interface{}{ + "message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "influxField", map[string]string{}, map[string]interface{}{ "message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790", }, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "deal", map[string]string{ "computer_name": "hosta", @@ -190,7 +179,7 @@ func TestApply(t *testing.T) { map[string]interface{}{ "message": "stuff", }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -201,18 +190,17 @@ func TestApply(t *testing.T) { config: parsers.Config{ DataFormat: "influx", }, - input: Metric( - metric.New( - "influxField", - map[string]string{ - "some": "tag", - }, - map[string]interface{}{ - "message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790", - }, - time.Unix(0, 0))), + input: metric.New( + "influxField", + map[string]string{ + "some": "tag", + }, + map[string]interface{}{ + "message": "deal,computer_name=hosta message=\"stuff\" 1530654676316265790", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "deal", map[string]string{ "computer_name": "hosta", @@ -221,7 +209,7 @@ func TestApply(t *testing.T) { map[string]interface{}{ "message": "stuff", }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -232,16 +220,15 @@ func TestApply(t *testing.T) { DataFormat: "grok", GrokPatterns: []string{"%{COMBINED_LOG_FORMAT}"}, }, - input: Metric( - metric.New( - "success", - map[string]string{}, - map[string]interface{}{ - "grokSample": "127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] \"GET /xampp/status.php HTTP/1.1\" 200 3891 \"http://cadenza/xampp/navi.php\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\"", - }, - time.Unix(0, 0))), + input: metric.New( + "success", + map[string]string{}, + map[string]interface{}{ + "grokSample": "127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] \"GET /xampp/status.php HTTP/1.1\" 200 3891 \"http://cadenza/xampp/navi.php\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\"", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "success", map[string]string{ "resp_code": "200", @@ -257,7 +244,7 @@ func TestApply(t *testing.T) { "ident": "-", "http_version": float64(1.1), }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -268,30 +255,29 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl", "err"}, }, - input: Metric( - metric.New( - "bigMeasure", - map[string]string{}, - map[string]interface{}{ - "field_1": `{"lvl":"info","msg":"http request"}`, - "field_2": `{"err":"fatal","fatal":"security threat"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "bigMeasure", + map[string]string{}, + map[string]interface{}{ + "field_1": `{"lvl":"info","msg":"http request"}`, + "field_2": `{"err":"fatal","fatal":"security threat"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "bigMeasure", map[string]string{ "lvl": "info", }, map[string]interface{}{}, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "bigMeasure", map[string]string{ "err": "fatal", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -303,17 +289,16 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl", "msg", "err", "fatal"}, }, - input: Metric( - metric.New( - "bigMeasure", - map[string]string{}, - map[string]interface{}{ - "field_1": `{"lvl":"info","msg":"http request"}`, - "field_2": `{"err":"fatal","fatal":"security threat"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "bigMeasure", + map[string]string{}, + map[string]interface{}{ + "field_1": `{"lvl":"info","msg":"http request"}`, + "field_2": `{"err":"fatal","fatal":"security threat"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "bigMeasure", map[string]string{ "lvl": "info", @@ -325,7 +310,7 @@ func TestApply(t *testing.T) { "field_1": `{"lvl":"info","msg":"http request"}`, "field_2": `{"err":"fatal","fatal":"security threat"}`, }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -336,40 +321,39 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl", "msg", "err", "fatal"}, }, - input: Metric( - metric.New( - "bigMeasure", - map[string]string{}, - map[string]interface{}{ - "field_1": `{"lvl":"info","msg":"http request"}`, - "field_2": `{"err":"fatal","fatal":"security threat"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "bigMeasure", + map[string]string{}, + map[string]interface{}{ + "field_1": `{"lvl":"info","msg":"http request"}`, + "field_2": `{"err":"fatal","fatal":"security threat"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "bigMeasure", map[string]string{}, map[string]interface{}{ "field_1": `{"lvl":"info","msg":"http request"}`, "field_2": `{"err":"fatal","fatal":"security threat"}`, }, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "bigMeasure", map[string]string{ "lvl": "info", "msg": "http request", }, map[string]interface{}{}, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "bigMeasure", map[string]string{ "err": "fatal", "fatal": "security threat", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -380,31 +364,30 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl"}, }, - input: Metric( - metric.New( - "success", - map[string]string{}, - map[string]interface{}{ - "good": `{"lvl":"info"}`, - "bad": "why", - }, - time.Unix(0, 0))), + input: metric.New( + "success", + map[string]string{}, + map[string]interface{}{ + "good": `{"lvl":"info"}`, + "bad": "why", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "success", map[string]string{}, map[string]interface{}{ "good": `{"lvl":"info"}`, "bad": "why", }, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "success", map[string]string{ "lvl": "info", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -415,18 +398,17 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl", "thing"}, }, - input: Metric( - metric.New( - "success", - map[string]string{}, - map[string]interface{}{ - "bad": "why", - "good": `{"lvl":"info"}`, - "ok": `{"thing":"thang"}`, - }, - time.Unix(0, 0))), + input: metric.New( + "success", + map[string]string{}, + map[string]interface{}{ + "bad": "why", + "good": `{"lvl":"info"}`, + "ok": `{"thing":"thang"}`, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "success", map[string]string{}, map[string]interface{}{ @@ -434,21 +416,21 @@ func TestApply(t *testing.T) { "good": `{"lvl":"info"}`, "ok": `{"thing":"thang"}`, }, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "success", map[string]string{ "lvl": "info", }, map[string]interface{}{}, - time.Unix(0, 0))), - Metric(metric.New( + time.Unix(0, 0)), + metric.New( "success", map[string]string{ "thing": "thang", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -460,19 +442,18 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl"}, }, - input: Metric( - metric.New( - "success", - map[string]string{ - "a": "tag", - }, - map[string]interface{}{ - "good": `{"lvl":"info"}`, - "bad": "why", - }, - time.Unix(0, 0))), + input: metric.New( + "success", + map[string]string{ + "a": "tag", + }, + map[string]interface{}{ + "good": `{"lvl":"info"}`, + "bad": "why", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "success", map[string]string{ "a": "tag", @@ -482,7 +463,7 @@ func TestApply(t *testing.T) { "good": `{"lvl":"info"}`, "bad": "why", }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -493,25 +474,24 @@ func TestApply(t *testing.T) { DataFormat: "json", TagKeys: []string{"lvl"}, }, - input: Metric( - metric.New( - "success", - map[string]string{ - "thing": "tag", - }, - map[string]interface{}{ - "good": `{"lvl":"info"}`, - "bad": "why", - }, - time.Unix(0, 0))), + input: metric.New( + "success", + map[string]string{ + "thing": "tag", + }, + map[string]interface{}{ + "good": `{"lvl":"info"}`, + "bad": "why", + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "success", map[string]string{ "lvl": "info", }, map[string]interface{}{}, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, } @@ -546,22 +526,21 @@ func TestBadApply(t *testing.T) { config: parsers.Config{ DataFormat: "json", }, - input: Metric( - metric.New( - "bad", - map[string]string{}, - map[string]interface{}{ - "some_field": 5, - }, - time.Unix(0, 0))), + input: metric.New( + "bad", + map[string]string{}, + map[string]interface{}{ + "some_field": 5, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "bad", map[string]string{}, map[string]interface{}{ "some_field": 5, }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, { @@ -570,22 +549,21 @@ func TestBadApply(t *testing.T) { config: parsers.Config{ DataFormat: "json", }, - input: Metric( - metric.New( - "bad", - map[string]string{}, - map[string]interface{}{ - "some_field": 5, - }, - time.Unix(0, 0))), + input: metric.New( + "bad", + map[string]string{}, + map[string]interface{}{ + "some_field": 5, + }, + time.Unix(0, 0)), expected: []telegraf.Metric{ - Metric(metric.New( + metric.New( "bad", map[string]string{}, map[string]interface{}{ "some_field": 5, }, - time.Unix(0, 0))), + time.Unix(0, 0)), }, }, } @@ -626,7 +604,7 @@ func getMetricFieldList(metric telegraf.Metric) interface{} { } func BenchmarkFieldListing(b *testing.B) { - metric := Metric(metric.New( + m := metric.New( "test", map[string]string{ "some": "tag", @@ -640,15 +618,15 @@ func BenchmarkFieldListing(b *testing.B) { "field5": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, "field6": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, }, - time.Unix(0, 0))) + time.Unix(0, 0)) for n := 0; n < b.N; n++ { - getMetricFieldList(metric) + getMetricFieldList(m) } } func BenchmarkFields(b *testing.B) { - metric := Metric(metric.New( + m := metric.New( "test", map[string]string{ "some": "tag", @@ -662,9 +640,9 @@ func BenchmarkFields(b *testing.B) { "field5": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, "field6": `{"ts":"2018-07-24T19:43:40.275Z","lvl":"info","msg":"http request","method":"POST"}`, }, - time.Unix(0, 0))) + time.Unix(0, 0)) for n := 0; n < b.N; n++ { - getMetricFields(metric) + getMetricFields(m) } } diff --git a/plugins/processors/regex/regex_test.go b/plugins/processors/regex/regex_test.go index b0ddf47d08a7b..2f8890bba7e9e 100644 --- a/plugins/processors/regex/regex_test.go +++ b/plugins/processors/regex/regex_test.go @@ -10,7 +10,7 @@ import ( ) func newM1() telegraf.Metric { - m1, _ := metric.New("access_log", + m1 := metric.New("access_log", map[string]string{ "verb": "GET", "resp_code": "200", @@ -24,7 +24,7 @@ func newM1() telegraf.Metric { } func newM2() telegraf.Metric { - m2, _ := metric.New("access_log", + m2 := metric.New("access_log", map[string]string{ "verb": "GET", "resp_code": "200", diff --git a/plugins/processors/rename/rename_test.go b/plugins/processors/rename/rename_test.go index 1f8e0b7db3a4a..36e8aaeed43a0 100644 --- a/plugins/processors/rename/rename_test.go +++ b/plugins/processors/rename/rename_test.go @@ -16,7 +16,7 @@ func newMetric(name string, tags map[string]string, fields map[string]interface{ if fields == nil { fields = map[string]interface{}{} } - m, _ := metric.New(name, tags, fields, time.Now()) + m := metric.New(name, tags, fields, time.Now()) return m } diff --git a/plugins/processors/reverse_dns/reversedns_test.go b/plugins/processors/reverse_dns/reversedns_test.go index 660c25e3015e8..5fcce5fb4725a 100644 --- a/plugins/processors/reverse_dns/reversedns_test.go +++ b/plugins/processors/reverse_dns/reversedns_test.go @@ -14,7 +14,7 @@ import ( func TestSimpleReverseLookup(t *testing.T) { now := time.Now() - m, _ := metric.New("name", map[string]string{ + m := metric.New("name", map[string]string{ "dest_ip": "8.8.8.8", }, map[string]interface{}{ "source_ip": "127.0.0.1", diff --git a/plugins/processors/starlark/builtins.go b/plugins/processors/starlark/builtins.go index 8537c92f34953..6876fe9636ab5 100644 --- a/plugins/processors/starlark/builtins.go +++ b/plugins/processors/starlark/builtins.go @@ -15,10 +15,7 @@ func newMetric(_ *starlark.Thread, _ *starlark.Builtin, args starlark.Tuple, kwa return nil, err } - m, err := metric.New(string(name), nil, nil, time.Now()) - if err != nil { - return nil, err - } + m := metric.New(string(name), nil, nil, time.Now()) return &Metric{metric: m}, nil } diff --git a/plugins/processors/strings/strings_test.go b/plugins/processors/strings/strings_test.go index 2c1be510ef9b6..40d798a6db0e3 100644 --- a/plugins/processors/strings/strings_test.go +++ b/plugins/processors/strings/strings_test.go @@ -12,7 +12,7 @@ import ( ) func newM1() telegraf.Metric { - m1, _ := metric.New("IIS_log", + m1 := metric.New("IIS_log", map[string]string{ "verb": "GET", "s-computername": "MIXEDCASE_hostname", @@ -27,7 +27,7 @@ func newM1() telegraf.Metric { } func newM2() telegraf.Metric { - m1, _ := metric.New("IIS_log", + m1 := metric.New("IIS_log", map[string]string{ "verb": "GET", "S-ComputerName": "MIXEDCASE_hostname", @@ -795,7 +795,7 @@ func TestMultipleConversions(t *testing.T) { }, } - m, _ := metric.New("IIS_log", + m := metric.New("IIS_log", map[string]string{ "verb": "GET", "resp_code": "200", @@ -856,7 +856,7 @@ func TestReadmeExample(t *testing.T) { }, } - m, _ := metric.New("iis_log", + m := metric.New("iis_log", map[string]string{ "verb": "get", "uri_stem": "/API/HealthCheck", @@ -895,7 +895,7 @@ func TestReadmeExample(t *testing.T) { func newMetric(name string) telegraf.Metric { tags := map[string]string{} fields := map[string]interface{}{} - m, _ := metric.New(name, tags, fields, time.Now()) + m := metric.New(name, tags, fields, time.Now()) return m } diff --git a/plugins/processors/tag_limit/tag_limit_test.go b/plugins/processors/tag_limit/tag_limit_test.go index 9412d866b78e8..d9c361ed07296 100644 --- a/plugins/processors/tag_limit/tag_limit_test.go +++ b/plugins/processors/tag_limit/tag_limit_test.go @@ -16,7 +16,7 @@ func MustMetric(name string, tags map[string]string, fields map[string]interface if fields == nil { fields = map[string]interface{}{} } - m, _ := metric.New(name, tags, fields, metricTime) + m := metric.New(name, tags, fields, metricTime) return m } diff --git a/plugins/processors/topk/test_sets.go b/plugins/processors/topk/test_sets.go index aea2c44c8052b..69f957817eca0 100644 --- a/plugins/processors/topk/test_sets.go +++ b/plugins/processors/topk/test_sets.go @@ -1,13 +1,14 @@ package topk import ( + "time" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" - "time" ) ///// Test set 1 ///// -var metric11, _ = metric.New( +var metric11 = metric.New( "m1", map[string]string{"tag_name": "tag_value1"}, map[string]interface{}{ @@ -17,7 +18,7 @@ var metric11, _ = metric.New( time.Now(), ) -var metric12, _ = metric.New( +var metric12 = metric.New( "m1", map[string]string{"tag_name": "tag_value1"}, map[string]interface{}{ @@ -26,7 +27,7 @@ var metric12, _ = metric.New( time.Now(), ) -var metric13, _ = metric.New( +var metric13 = metric.New( "m1", map[string]string{"tag_name": "tag_value1"}, map[string]interface{}{ @@ -36,7 +37,7 @@ var metric13, _ = metric.New( time.Now(), ) -var metric14, _ = metric.New( +var metric14 = metric.New( "m1", map[string]string{"tag_name": "tag_value1"}, map[string]interface{}{ @@ -46,7 +47,7 @@ var metric14, _ = metric.New( time.Now(), ) -var metric15, _ = metric.New( +var metric15 = metric.New( "m1", map[string]string{"tag_name": "tag_value1"}, map[string]interface{}{ @@ -60,7 +61,7 @@ var metric15, _ = metric.New( var MetricsSet1 = []telegraf.Metric{metric11, metric12, metric13, metric14, metric15} ///// Test set 2 ///// -var metric21, _ = metric.New( +var metric21 = metric.New( "metric1", map[string]string{ "id": "1", @@ -77,7 +78,7 @@ var metric21, _ = metric.New( time.Now(), ) -var metric22, _ = metric.New( +var metric22 = metric.New( "metric1", map[string]string{ "id": "2", @@ -93,7 +94,7 @@ var metric22, _ = metric.New( time.Now(), ) -var metric23, _ = metric.New( +var metric23 = metric.New( "metric1", map[string]string{ "id": "3", @@ -110,7 +111,7 @@ var metric23, _ = metric.New( time.Now(), ) -var metric24, _ = metric.New( +var metric24 = metric.New( "metric2", map[string]string{ "id": "4", @@ -126,7 +127,7 @@ var metric24, _ = metric.New( time.Now(), ) -var metric25, _ = metric.New( +var metric25 = metric.New( "metric2", map[string]string{ "id": "5", @@ -143,7 +144,7 @@ var metric25, _ = metric.New( time.Now(), ) -var metric26, _ = metric.New( +var metric26 = metric.New( "metric2", map[string]string{ "id": "6", diff --git a/plugins/processors/topk/topk.go b/plugins/processors/topk/topk.go index d94d452ace262..b7c8f50d9dfde 100644 --- a/plugins/processors/topk/topk.go +++ b/plugins/processors/topk/topk.go @@ -312,10 +312,7 @@ func (t *TopK) push() []telegraf.Metric { result := make([]telegraf.Metric, 0, len(ret)) for _, m := range ret { - newMetric, err := metric.New(m.Name(), m.Tags(), m.Fields(), m.Time(), m.Type()) - if err != nil { - continue - } + newMetric := metric.New(m.Name(), m.Tags(), m.Fields(), m.Time(), m.Type()) result = append(result, newMetric) } diff --git a/plugins/serializers/carbon2/carbon2_test.go b/plugins/serializers/carbon2/carbon2_test.go index 4afc0932cc7ba..86f1b66db8932 100644 --- a/plugins/serializers/carbon2/carbon2_test.go +++ b/plugins/serializers/carbon2/carbon2_test.go @@ -12,13 +12,6 @@ import ( "github.com/influxdata/telegraf/metric" ) -func MustMetric(v telegraf.Metric, err error) telegraf.Metric { - if err != nil { - panic(err) - } - return v -} - func TestSerializeMetricFloat(t *testing.T) { now := time.Now() tags := map[string]string{ @@ -27,8 +20,7 @@ func TestSerializeMetricFloat(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - require.NoError(t, err) + m := metric.New("cpu", tags, fields, now) testcases := []struct { format format @@ -65,8 +57,7 @@ func TestSerializeMetricWithEmptyStringTag(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - require.NoError(t, err) + m := metric.New("cpu", tags, fields, now) testcases := []struct { format format @@ -103,8 +94,7 @@ func TestSerializeWithSpaces(t *testing.T) { fields := map[string]interface{}{ "usage_idle 1": float64(91.5), } - m, err := metric.New("cpu metric", tags, fields, now) - require.NoError(t, err) + m := metric.New("cpu metric", tags, fields, now) testcases := []struct { format format @@ -141,8 +131,7 @@ func TestSerializeMetricInt(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(90), } - m, err := metric.New("cpu", tags, fields, now) - require.NoError(t, err) + m := metric.New("cpu", tags, fields, now) testcases := []struct { format format @@ -179,8 +168,7 @@ func TestSerializeMetricString(t *testing.T) { fields := map[string]interface{}{ "usage_idle": "foobar", } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) testcases := []struct { format format @@ -218,8 +206,7 @@ func TestSerializeMetricBool(t *testing.T) { "java_lang_GarbageCollector_Valid": value, } - m, err := metric.New("cpu", tags, fields, tim) - require.NoError(t, err) + m := metric.New("cpu", tags, fields, tim) return m } @@ -267,15 +254,13 @@ func TestSerializeMetricBool(t *testing.T) { } func TestSerializeBatch(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m, m} @@ -315,14 +300,14 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { now := time.Now() testcases := []struct { - metricFunc func() (telegraf.Metric, error) + metricFunc func() telegraf.Metric format format expected string replaceChar string expectedErr bool }{ { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -333,7 +318,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: DefaultSanitizeReplaceChar, }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -344,7 +329,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: "_", }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -355,7 +340,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: DefaultSanitizeReplaceChar, }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -366,7 +351,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: DefaultSanitizeReplaceChar, }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -377,7 +362,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: DefaultSanitizeReplaceChar, }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -388,7 +373,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { replaceChar: "_", }, { - metricFunc: func() (telegraf.Metric, error) { + metricFunc: func() telegraf.Metric { fields := map[string]interface{}{ "usage_idle": float64(91.5), } @@ -402,8 +387,7 @@ func TestSerializeMetricIsProperlySanitized(t *testing.T) { for _, tc := range testcases { t.Run(string(tc.format), func(t *testing.T) { - m, err := tc.metricFunc() - require.NoError(t, err) + m := tc.metricFunc() s, err := NewSerializer(string(tc.format), tc.replaceChar) if tc.expectedErr { diff --git a/plugins/serializers/graphite/graphite_test.go b/plugins/serializers/graphite/graphite_test.go index 2b93b16df4e4d..0a2e0bd7beaa1 100644 --- a/plugins/serializers/graphite/graphite_test.go +++ b/plugins/serializers/graphite/graphite_test.go @@ -32,19 +32,19 @@ const ( ) func TestGraphiteTags(t *testing.T) { - m1, _ := metric.New( + m1 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m2, _ := metric.New( + m2 := metric.New( "mymeasurement", map[string]string{"host": "192.168.0.1", "afoo": "first", "bfoo": "second"}, map[string]interface{}{"value": float64(3.14)}, time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC), ) - m3, _ := metric.New( + m3 := metric.New( "mymeasurement", map[string]string{"afoo": "first", "bfoo": "second"}, map[string]interface{}{"value": float64(3.14)}, @@ -70,13 +70,11 @@ func TestSerializeMetricNoHost(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu0.us-west-2.cpu.usage_idle 91.5 %d", now.Unix()), @@ -97,8 +95,7 @@ func TestSerializeMetricNoHostWithTagSupport(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -106,7 +103,6 @@ func TestSerializeMetricNoHostWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu.usage_idle;cpu=cpu0;datacenter=us-west-2 91.5 %d", now.Unix()), @@ -128,13 +124,11 @@ func TestSerializeMetricHost(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu0.us-west-2.cpu.usage_idle 91.5 %d", now.Unix()), @@ -156,9 +150,8 @@ func TestSerializeMetricHostWithMultipleTemplates(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m1, err := metric.New("cpu", tags, fields, now) - m2, err := metric.New("new_cpu", tags, fields, now) - assert.NoError(t, err) + m1 := metric.New("cpu", tags, fields, now) + m2 := metric.New("new_cpu", tags, fields, now) templates, defaultTemplate, err := InitGraphiteTemplates([]string{ "cp* tags.measurement.host.field", @@ -201,9 +194,8 @@ func TestSerializeMetricHostWithMultipleTemplatesWithDefault(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m1, err := metric.New("cpu", tags, fields, now) - m2, err := metric.New("new_cpu", tags, fields, now) - assert.NoError(t, err) + m1 := metric.New("cpu", tags, fields, now) + m2 := metric.New("new_cpu", tags, fields, now) templates, defaultTemplate, err := InitGraphiteTemplates([]string{ "cp* tags.measurement.host.field", @@ -247,8 +239,7 @@ func TestSerializeMetricHostWithTagSupport(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -256,7 +247,6 @@ func TestSerializeMetricHostWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu.usage_idle;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()), @@ -278,13 +268,11 @@ func TestSerializeValueField(t *testing.T) { fields := map[string]interface{}{ "value": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), @@ -302,8 +290,7 @@ func TestSerializeValueFieldWithTagSupport(t *testing.T) { fields := map[string]interface{}{ "value": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -311,7 +298,6 @@ func TestSerializeValueFieldWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()), @@ -330,15 +316,13 @@ func TestSerializeValueField2(t *testing.T) { fields := map[string]interface{}{ "value": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "host.field.tags.measurement", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), @@ -356,15 +340,13 @@ func TestSerializeValueString(t *testing.T) { fields := map[string]interface{}{ "value": "asdasd", } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "host.field.tags.measurement", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) assert.Equal(t, "", mS[0]) } @@ -378,8 +360,7 @@ func TestSerializeValueStringWithTagSupport(t *testing.T) { fields := map[string]interface{}{ "value": "asdasd", } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -387,7 +368,6 @@ func TestSerializeValueStringWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) assert.Equal(t, "", mS[0]) } @@ -402,15 +382,13 @@ func TestSerializeValueBoolean(t *testing.T) { "enabled": true, "disabled": false, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "host.field.tags.measurement", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.enabled.cpu0.us-west-2.cpu 1 %d", now.Unix()), @@ -432,8 +410,7 @@ func TestSerializeValueBooleanWithTagSupport(t *testing.T) { "enabled": true, "disabled": false, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -441,7 +418,6 @@ func TestSerializeValueBooleanWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu.enabled;cpu=cpu0;datacenter=us-west-2;host=localhost 1 %d", now.Unix()), @@ -458,8 +434,7 @@ func TestSerializeValueUnsigned(t *testing.T) { fields := map[string]interface{}{ "free": uint64(42), } - m, err := metric.New("mem", tags, fields, now) - require.NoError(t, err) + m := metric.New("mem", tags, fields, now) s := GraphiteSerializer{} buf, err := s.Serialize(m) @@ -479,15 +454,13 @@ func TestSerializeFieldWithSpaces(t *testing.T) { fields := map[string]interface{}{ `field\ with\ spaces`: float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "host.tags.measurement.field", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu0.us-west-2.cpu.field_with_spaces 91.5 %d", now.Unix()), @@ -505,8 +478,7 @@ func TestSerializeFieldWithSpacesWithTagSupport(t *testing.T) { fields := map[string]interface{}{ `field\ with\ spaces`: float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -514,7 +486,6 @@ func TestSerializeFieldWithSpacesWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu.field_with_spaces;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()), @@ -533,15 +504,13 @@ func TestSerializeTagWithSpaces(t *testing.T) { fields := map[string]interface{}{ `field_with_spaces`: float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "host.tags.measurement.field", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu_0.us-west-2.cpu.field_with_spaces 91.5 %d", now.Unix()), @@ -559,8 +528,7 @@ func TestSerializeTagWithSpacesWithTagSupport(t *testing.T) { fields := map[string]interface{}{ `field_with_spaces`: float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ TagSupport: true, @@ -568,7 +536,6 @@ func TestSerializeTagWithSpacesWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("cpu.field_with_spaces;cpu=cpu_0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()), @@ -587,15 +554,13 @@ func TestSerializeValueField3(t *testing.T) { fields := map[string]interface{}{ "value": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: "field.host.tags.measurement", } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.cpu0.us-west-2.cpu 91.5 %d", now.Unix()), @@ -614,15 +579,13 @@ func TestSerializeValueField5(t *testing.T) { fields := map[string]interface{}{ "value": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Template: template5, } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("localhost.us-west-2.cpu0.cpu 91.5 %d", now.Unix()), @@ -641,13 +604,11 @@ func TestSerializeMetricPrefix(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{Prefix: "prefix"} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("prefix.localhost.cpu0.us-west-2.cpu.usage_idle 91.5 %d", now.Unix()), @@ -669,8 +630,7 @@ func TestSerializeMetricPrefixWithTagSupport(t *testing.T) { "usage_idle": float64(91.5), "usage_busy": float64(8.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := GraphiteSerializer{ Prefix: "prefix", @@ -679,7 +639,6 @@ func TestSerializeMetricPrefixWithTagSupport(t *testing.T) { } buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{ fmt.Sprintf("prefix.cpu.usage_idle;cpu=cpu0;datacenter=us-west-2;host=localhost 91.5 %d", now.Unix()), @@ -699,8 +658,7 @@ func TestSerializeBucketNameNoHost(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), "", "") @@ -713,8 +671,7 @@ func TestSerializeBucketNameHost(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), "", "") @@ -727,8 +684,7 @@ func TestSerializeBucketNamePrefix(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), "", "prefix") @@ -741,8 +697,7 @@ func TestTemplate1(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), template1, "") @@ -755,8 +710,7 @@ func TestTemplate2(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), template2, "") @@ -769,8 +723,7 @@ func TestTemplate3(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), template3, "") @@ -783,8 +736,7 @@ func TestTemplate4(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), template4, "") @@ -797,8 +749,7 @@ func TestTemplate6(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", defaultTags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", defaultTags, fields, now) mS := SerializeBucketName(m.Name(), m.Tags(), template6, "") @@ -890,8 +841,7 @@ func TestClean(t *testing.T) { s := GraphiteSerializer{} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m, err := metric.New(tt.metricName, tt.tags, tt.fields, now) - assert.NoError(t, err) + m := metric.New(tt.metricName, tt.tags, tt.fields, now) actual, _ := s.Serialize(m) require.Equal(t, tt.expected, string(actual)) }) @@ -985,8 +935,7 @@ func TestCleanWithTagsSupport(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m, err := metric.New(tt.metricName, tt.tags, tt.fields, now) - assert.NoError(t, err) + m := metric.New(tt.metricName, tt.tags, tt.fields, now) actual, _ := s.Serialize(m) require.Equal(t, tt.expected, string(actual)) }) @@ -1014,8 +963,7 @@ func TestSerializeBatch(t *testing.T) { s := GraphiteSerializer{} for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m, err := metric.New(tt.metricName, tt.tags, tt.fields, now) - assert.NoError(t, err) + m := metric.New(tt.metricName, tt.tags, tt.fields, now) actual, _ := s.SerializeBatch([]telegraf.Metric{m, m}) require.Equal(t, tt.expected, string(actual)) }) @@ -1046,8 +994,7 @@ func TestSerializeBatchWithTagsSupport(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m, err := metric.New(tt.metricName, tt.tags, tt.fields, now) - assert.NoError(t, err) + m := metric.New(tt.metricName, tt.tags, tt.fields, now) actual, _ := s.SerializeBatch([]telegraf.Metric{m, m}) require.Equal(t, tt.expected, string(actual)) }) diff --git a/plugins/serializers/influx/influx_test.go b/plugins/serializers/influx/influx_test.go index a86215d94bf4b..f80718b3aa8e6 100644 --- a/plugins/serializers/influx/influx_test.go +++ b/plugins/serializers/influx/influx_test.go @@ -10,13 +10,6 @@ import ( "github.com/stretchr/testify/require" ) -func MustMetric(v telegraf.Metric, err error) telegraf.Metric { - if err != nil { - panic(err) - } - return v -} - var tests = []struct { name string maxBytes int @@ -27,506 +20,446 @@ var tests = []struct { }{ { name: "minimal", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), output: []byte("cpu value=42 0\n"), }, { name: "multiple tags", - input: MustMetric( - metric.New( - "cpu", - map[string]string{ - "host": "localhost", - "cpu": "CPU0", - }, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{ + "host": "localhost", + "cpu": "CPU0", + }, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), output: []byte("cpu,cpu=CPU0,host=localhost value=42 0\n"), }, { name: "multiple fields", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "x": 42.0, - "y": 42.0, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "x": 42.0, + "y": 42.0, + }, + time.Unix(0, 0), ), output: []byte("cpu x=42,y=42 0\n"), }, { name: "float NaN", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "x": math.NaN(), - "y": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "x": math.NaN(), + "y": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu y=42i 0\n"), }, { name: "float NaN only", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": math.NaN(), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": math.NaN(), + }, + time.Unix(0, 0), ), errReason: NoFields, }, { name: "float Inf", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": math.Inf(1), - "y": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": math.Inf(1), + "y": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu y=42i 0\n"), }, { name: "integer field", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu value=42i 0\n"), }, { name: "integer field 64-bit", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": int64(123456789012345), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": int64(123456789012345), + }, + time.Unix(0, 0), ), output: []byte("cpu value=123456789012345i 0\n"), }, { name: "uint field", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(42), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(42), + }, + time.Unix(0, 0), ), output: []byte("cpu value=42u 0\n"), typeSupport: UintSupport, }, { name: "uint field max value", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(18446744073709551615), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(18446744073709551615), + }, + time.Unix(0, 0), ), output: []byte("cpu value=18446744073709551615u 0\n"), typeSupport: UintSupport, }, { name: "uint field no uint support", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(42), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(42), + }, + time.Unix(0, 0), ), output: []byte("cpu value=42i 0\n"), }, { name: "uint field no uint support overflow", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": uint64(18446744073709551615), - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": uint64(18446744073709551615), + }, + time.Unix(0, 0), ), output: []byte("cpu value=9223372036854775807i 0\n"), }, { name: "bool field", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": true, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": true, + }, + time.Unix(0, 0), ), output: []byte("cpu value=true 0\n"), }, { name: "string field", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": "howdy", - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": "howdy", + }, + time.Unix(0, 0), ), output: []byte("cpu value=\"howdy\" 0\n"), }, { name: "timestamp", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(1519194109, 42), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(1519194109, 42), ), output: []byte("cpu value=42 1519194109000000042\n"), }, { name: "split fields exact", maxBytes: 33, - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "abc": 123, - "def": 456, - }, - time.Unix(1519194109, 42), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "abc": 123, + "def": 456, + }, + time.Unix(1519194109, 42), ), output: []byte("cpu abc=123i 1519194109000000042\ncpu def=456i 1519194109000000042\n"), }, { name: "split fields extra", maxBytes: 34, - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "abc": 123, - "def": 456, - }, - time.Unix(1519194109, 42), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "abc": 123, + "def": 456, + }, + time.Unix(1519194109, 42), ), output: []byte("cpu abc=123i 1519194109000000042\ncpu def=456i 1519194109000000042\n"), }, { name: "split_fields_overflow", maxBytes: 43, - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "abc": 123, - "def": 456, - "ghi": 789, - "jkl": 123, - }, - time.Unix(1519194109, 42), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "abc": 123, + "def": 456, + "ghi": 789, + "jkl": 123, + }, + time.Unix(1519194109, 42), ), output: []byte("cpu abc=123i,def=456i 1519194109000000042\ncpu ghi=789i,jkl=123i 1519194109000000042\n"), }, { name: "name newline", - input: MustMetric( - metric.New( - "c\npu", - map[string]string{}, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "c\npu", + map[string]string{}, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("c\\npu value=42i 0\n"), }, { name: "tag newline", - input: MustMetric( - metric.New( - "cpu", - map[string]string{ - "host": "x\ny", - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{ + "host": "x\ny", + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu,host=x\\ny value=42i 0\n"), }, { name: "empty tag value is removed", - input: MustMetric( - metric.New( - "cpu", - map[string]string{ - "host": "", - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{ + "host": "", + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu value=42i 0\n"), }, { name: "empty tag key is removed", - input: MustMetric( - metric.New( - "cpu", - map[string]string{ - "": "example.org", - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{ + "": "example.org", + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("cpu value=42i 0\n"), }, { name: "tag value ends with backslash is trimmed", - input: MustMetric( - metric.New( - "disk", - map[string]string{ - "path": `C:\`, - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "disk", + map[string]string{ + "path": `C:\`, + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("disk,path=C: value=42i 0\n"), }, { name: "tag key ends with backslash is trimmed", - input: MustMetric( - metric.New( - "disk", - map[string]string{ - `path\`: "/", - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "disk", + map[string]string{ + `path\`: "/", + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("disk,path=/ value=42i 0\n"), }, { name: "tag key backslash is trimmed and removed", - input: MustMetric( - metric.New( - "disk", - map[string]string{ - `\`: "example.org", - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "disk", + map[string]string{ + `\`: "example.org", + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("disk value=42i 0\n"), }, { name: "tag value backslash is trimmed and removed", - input: MustMetric( - metric.New( - "disk", - map[string]string{ - "host": `\`, - }, - map[string]interface{}{ - "value": 42, - }, - time.Unix(0, 0), - ), + input: metric.New( + "disk", + map[string]string{ + "host": `\`, + }, + map[string]interface{}{ + "value": 42, + }, + time.Unix(0, 0), ), output: []byte("disk value=42i 0\n"), }, { name: "string newline", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": "x\ny", - }, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": "x\ny", + }, + time.Unix(0, 0), ), output: []byte("cpu value=\"x\ny\" 0\n"), }, { name: "need more space", maxBytes: 32, - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "abc": 123, - "def": 456, - }, - time.Unix(1519194109, 42), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "abc": 123, + "def": 456, + }, + time.Unix(1519194109, 42), ), output: nil, errReason: NeedMoreSpace, }, { name: "no fields", - input: MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{}, - time.Unix(0, 0), - ), + input: metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{}, + time.Unix(0, 0), ), errReason: NoFields, }, { name: "procstat", - input: MustMetric( - metric.New( - "procstat", - map[string]string{ - "exe": "bash", - "process_name": "bash", - }, - map[string]interface{}{ - "cpu_time": 0, - "cpu_time_guest": float64(0), - "cpu_time_guest_nice": float64(0), - "cpu_time_idle": float64(0), - "cpu_time_iowait": float64(0), - "cpu_time_irq": float64(0), - "cpu_time_nice": float64(0), - "cpu_time_soft_irq": float64(0), - "cpu_time_steal": float64(0), - "cpu_time_system": float64(0), - "cpu_time_user": float64(0.02), - "cpu_usage": float64(0), - "involuntary_context_switches": 2, - "memory_data": 1576960, - "memory_locked": 0, - "memory_rss": 5103616, - "memory_stack": 139264, - "memory_swap": 0, - "memory_vms": 21659648, - "nice_priority": 20, - "num_fds": 4, - "num_threads": 1, - "pid": 29417, - "read_bytes": 0, - "read_count": 259, - "realtime_priority": 0, - "rlimit_cpu_time_hard": 2147483647, - "rlimit_cpu_time_soft": 2147483647, - "rlimit_file_locks_hard": 2147483647, - "rlimit_file_locks_soft": 2147483647, - "rlimit_memory_data_hard": 2147483647, - "rlimit_memory_data_soft": 2147483647, - "rlimit_memory_locked_hard": 65536, - "rlimit_memory_locked_soft": 65536, - "rlimit_memory_rss_hard": 2147483647, - "rlimit_memory_rss_soft": 2147483647, - "rlimit_memory_stack_hard": 2147483647, - "rlimit_memory_stack_soft": 8388608, - "rlimit_memory_vms_hard": 2147483647, - "rlimit_memory_vms_soft": 2147483647, - "rlimit_nice_priority_hard": 0, - "rlimit_nice_priority_soft": 0, - "rlimit_num_fds_hard": 4096, - "rlimit_num_fds_soft": 1024, - "rlimit_realtime_priority_hard": 0, - "rlimit_realtime_priority_soft": 0, - "rlimit_signals_pending_hard": 78994, - "rlimit_signals_pending_soft": 78994, - "signals_pending": 0, - "voluntary_context_switches": 42, - "write_bytes": 106496, - "write_count": 35, - }, - time.Unix(0, 1517620624000000000), - ), + input: metric.New( + "procstat", + map[string]string{ + "exe": "bash", + "process_name": "bash", + }, + map[string]interface{}{ + "cpu_time": 0, + "cpu_time_guest": float64(0), + "cpu_time_guest_nice": float64(0), + "cpu_time_idle": float64(0), + "cpu_time_iowait": float64(0), + "cpu_time_irq": float64(0), + "cpu_time_nice": float64(0), + "cpu_time_soft_irq": float64(0), + "cpu_time_steal": float64(0), + "cpu_time_system": float64(0), + "cpu_time_user": float64(0.02), + "cpu_usage": float64(0), + "involuntary_context_switches": 2, + "memory_data": 1576960, + "memory_locked": 0, + "memory_rss": 5103616, + "memory_stack": 139264, + "memory_swap": 0, + "memory_vms": 21659648, + "nice_priority": 20, + "num_fds": 4, + "num_threads": 1, + "pid": 29417, + "read_bytes": 0, + "read_count": 259, + "realtime_priority": 0, + "rlimit_cpu_time_hard": 2147483647, + "rlimit_cpu_time_soft": 2147483647, + "rlimit_file_locks_hard": 2147483647, + "rlimit_file_locks_soft": 2147483647, + "rlimit_memory_data_hard": 2147483647, + "rlimit_memory_data_soft": 2147483647, + "rlimit_memory_locked_hard": 65536, + "rlimit_memory_locked_soft": 65536, + "rlimit_memory_rss_hard": 2147483647, + "rlimit_memory_rss_soft": 2147483647, + "rlimit_memory_stack_hard": 2147483647, + "rlimit_memory_stack_soft": 8388608, + "rlimit_memory_vms_hard": 2147483647, + "rlimit_memory_vms_soft": 2147483647, + "rlimit_nice_priority_hard": 0, + "rlimit_nice_priority_soft": 0, + "rlimit_num_fds_hard": 4096, + "rlimit_num_fds_soft": 1024, + "rlimit_realtime_priority_hard": 0, + "rlimit_realtime_priority_soft": 0, + "rlimit_signals_pending_hard": 78994, + "rlimit_signals_pending_soft": 78994, + "signals_pending": 0, + "voluntary_context_switches": 42, + "write_bytes": 106496, + "write_count": 35, + }, + time.Unix(0, 1517620624000000000), ), output: []byte("procstat,exe=bash,process_name=bash cpu_time=0i,cpu_time_guest=0,cpu_time_guest_nice=0,cpu_time_idle=0,cpu_time_iowait=0,cpu_time_irq=0,cpu_time_nice=0,cpu_time_soft_irq=0,cpu_time_steal=0,cpu_time_system=0,cpu_time_user=0.02,cpu_usage=0,involuntary_context_switches=2i,memory_data=1576960i,memory_locked=0i,memory_rss=5103616i,memory_stack=139264i,memory_swap=0i,memory_vms=21659648i,nice_priority=20i,num_fds=4i,num_threads=1i,pid=29417i,read_bytes=0i,read_count=259i,realtime_priority=0i,rlimit_cpu_time_hard=2147483647i,rlimit_cpu_time_soft=2147483647i,rlimit_file_locks_hard=2147483647i,rlimit_file_locks_soft=2147483647i,rlimit_memory_data_hard=2147483647i,rlimit_memory_data_soft=2147483647i,rlimit_memory_locked_hard=65536i,rlimit_memory_locked_soft=65536i,rlimit_memory_rss_hard=2147483647i,rlimit_memory_rss_soft=2147483647i,rlimit_memory_stack_hard=2147483647i,rlimit_memory_stack_soft=8388608i,rlimit_memory_vms_hard=2147483647i,rlimit_memory_vms_soft=2147483647i,rlimit_nice_priority_hard=0i,rlimit_nice_priority_soft=0i,rlimit_num_fds_hard=4096i,rlimit_num_fds_soft=1024i,rlimit_realtime_priority_hard=0i,rlimit_realtime_priority_soft=0i,rlimit_signals_pending_hard=78994i,rlimit_signals_pending_soft=78994i,signals_pending=0i,voluntary_context_switches=42i,write_bytes=106496i,write_count=35i 1517620624000000000\n"), }, @@ -565,15 +498,13 @@ func BenchmarkSerializer(b *testing.B) { } func TestSerialize_SerializeBatch(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m, m} diff --git a/plugins/serializers/influx/reader_test.go b/plugins/serializers/influx/reader_test.go index 1bb4a3b61cd4e..217660e43f4bd 100644 --- a/plugins/serializers/influx/reader_test.go +++ b/plugins/serializers/influx/reader_test.go @@ -24,15 +24,13 @@ func TestReader(t *testing.T) { maxLineBytes: 4096, bufferSize: 20, input: []telegraf.Metric{ - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, expected: []byte("cpu value=42 0\n"), @@ -42,25 +40,21 @@ func TestReader(t *testing.T) { maxLineBytes: 4096, bufferSize: 20, input: []telegraf.Metric{ - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, expected: []byte("cpu value=42 0\ncpu value=42 0\n"), @@ -70,15 +64,13 @@ func TestReader(t *testing.T) { maxLineBytes: 4096, bufferSize: 15, input: []telegraf.Metric{ - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, expected: []byte("cpu value=42 0\n"), @@ -88,25 +80,21 @@ func TestReader(t *testing.T) { maxLineBytes: 4096, bufferSize: 15, input: []telegraf.Metric{ - MustMetric( - metric.New( - "", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, expected: []byte("cpu value=42 0\n"), @@ -116,25 +104,21 @@ func TestReader(t *testing.T) { maxLineBytes: 4096, bufferSize: 15, input: []telegraf.Metric{ - MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), - MustMetric( - metric.New( - "", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + metric.New( + "", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ), }, expected: []byte("cpu value=42 0\n"), @@ -169,15 +153,13 @@ func TestReader(t *testing.T) { } func TestZeroLengthBufferNoError(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) serializer := NewSerializer() serializer.SetFieldSortOrder(SortFields) @@ -191,71 +173,68 @@ func TestZeroLengthBufferNoError(t *testing.T) { } func BenchmarkReader(b *testing.B) { - m := MustMetric( - metric.New( - "procstat", - map[string]string{ - "exe": "bash", - "process_name": "bash", - }, - map[string]interface{}{ - "cpu_time": 0, - "cpu_time_guest": float64(0), - "cpu_time_guest_nice": float64(0), - "cpu_time_idle": float64(0), - "cpu_time_iowait": float64(0), - "cpu_time_irq": float64(0), - "cpu_time_nice": float64(0), - "cpu_time_soft_irq": float64(0), - "cpu_time_steal": float64(0), - "cpu_time_system": float64(0), - "cpu_time_user": float64(0.02), - "cpu_usage": float64(0), - "involuntary_context_switches": 2, - "memory_data": 1576960, - "memory_locked": 0, - "memory_rss": 5103616, - "memory_stack": 139264, - "memory_swap": 0, - "memory_vms": 21659648, - "nice_priority": 20, - "num_fds": 4, - "num_threads": 1, - "pid": 29417, - "read_bytes": 0, - "read_count": 259, - "realtime_priority": 0, - "rlimit_cpu_time_hard": 2147483647, - "rlimit_cpu_time_soft": 2147483647, - "rlimit_file_locks_hard": 2147483647, - "rlimit_file_locks_soft": 2147483647, - "rlimit_memory_data_hard": 2147483647, - "rlimit_memory_data_soft": 2147483647, - "rlimit_memory_locked_hard": 65536, - "rlimit_memory_locked_soft": 65536, - "rlimit_memory_rss_hard": 2147483647, - "rlimit_memory_rss_soft": 2147483647, - "rlimit_memory_stack_hard": 2147483647, - "rlimit_memory_stack_soft": 8388608, - "rlimit_memory_vms_hard": 2147483647, - "rlimit_memory_vms_soft": 2147483647, - "rlimit_nice_priority_hard": 0, - "rlimit_nice_priority_soft": 0, - "rlimit_num_fds_hard": 4096, - "rlimit_num_fds_soft": 1024, - "rlimit_realtime_priority_hard": 0, - "rlimit_realtime_priority_soft": 0, - "rlimit_signals_pending_hard": 78994, - "rlimit_signals_pending_soft": 78994, - "signals_pending": 0, - "voluntary_context_switches": 42, - "write_bytes": 106496, - "write_count": 35, - }, - time.Unix(0, 1517620624000000000), - ), + m := metric.New( + "procstat", + map[string]string{ + "exe": "bash", + "process_name": "bash", + }, + map[string]interface{}{ + "cpu_time": 0, + "cpu_time_guest": float64(0), + "cpu_time_guest_nice": float64(0), + "cpu_time_idle": float64(0), + "cpu_time_iowait": float64(0), + "cpu_time_irq": float64(0), + "cpu_time_nice": float64(0), + "cpu_time_soft_irq": float64(0), + "cpu_time_steal": float64(0), + "cpu_time_system": float64(0), + "cpu_time_user": float64(0.02), + "cpu_usage": float64(0), + "involuntary_context_switches": 2, + "memory_data": 1576960, + "memory_locked": 0, + "memory_rss": 5103616, + "memory_stack": 139264, + "memory_swap": 0, + "memory_vms": 21659648, + "nice_priority": 20, + "num_fds": 4, + "num_threads": 1, + "pid": 29417, + "read_bytes": 0, + "read_count": 259, + "realtime_priority": 0, + "rlimit_cpu_time_hard": 2147483647, + "rlimit_cpu_time_soft": 2147483647, + "rlimit_file_locks_hard": 2147483647, + "rlimit_file_locks_soft": 2147483647, + "rlimit_memory_data_hard": 2147483647, + "rlimit_memory_data_soft": 2147483647, + "rlimit_memory_locked_hard": 65536, + "rlimit_memory_locked_soft": 65536, + "rlimit_memory_rss_hard": 2147483647, + "rlimit_memory_rss_soft": 2147483647, + "rlimit_memory_stack_hard": 2147483647, + "rlimit_memory_stack_soft": 8388608, + "rlimit_memory_vms_hard": 2147483647, + "rlimit_memory_vms_soft": 2147483647, + "rlimit_nice_priority_hard": 0, + "rlimit_nice_priority_soft": 0, + "rlimit_num_fds_hard": 4096, + "rlimit_num_fds_soft": 1024, + "rlimit_realtime_priority_hard": 0, + "rlimit_realtime_priority_soft": 0, + "rlimit_signals_pending_hard": 78994, + "rlimit_signals_pending_soft": 78994, + "signals_pending": 0, + "voluntary_context_switches": 42, + "write_bytes": 106496, + "write_count": 35, + }, + time.Unix(0, 1517620624000000000), ) - metrics := make([]telegraf.Metric, 1000) for i := range metrics { metrics[i] = m diff --git a/plugins/serializers/json/json_test.go b/plugins/serializers/json/json_test.go index 9ea304c88eedb..74d7f94166621 100644 --- a/plugins/serializers/json/json_test.go +++ b/plugins/serializers/json/json_test.go @@ -28,12 +28,11 @@ func TestSerializeMetricFloat(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(0) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`{"fields":{"usage_idle":91.5},"name":"cpu","tags":{"cpu":"cpu0"},"timestamp":%d}`, now.Unix()) + "\n") assert.Equal(t, string(expS), string(buf)) @@ -78,15 +77,13 @@ func TestSerialize_TimestampUnits(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(1525478795, 123456789), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(1525478795, 123456789), ) s, _ := NewSerializer(tt.timestampUnits) actual, err := s.Serialize(m) @@ -104,12 +101,11 @@ func TestSerializeMetricInt(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(90), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(0) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`{"fields":{"usage_idle":90},"name":"cpu","tags":{"cpu":"cpu0"},"timestamp":%d}`, now.Unix()) + "\n") @@ -124,12 +120,11 @@ func TestSerializeMetricString(t *testing.T) { fields := map[string]interface{}{ "usage_idle": "foobar", } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(0) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`{"fields":{"usage_idle":"foobar"},"name":"cpu","tags":{"cpu":"cpu0"},"timestamp":%d}`, now.Unix()) + "\n") @@ -145,12 +140,11 @@ func TestSerializeMultiFields(t *testing.T) { "usage_idle": int64(90), "usage_total": 8559615, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(0) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`{"fields":{"usage_idle":90,"usage_total":8559615},"name":"cpu","tags":{"cpu":"cpu0"},"timestamp":%d}`, now.Unix()) + "\n") @@ -165,8 +159,7 @@ func TestSerializeMetricWithEscapes(t *testing.T) { fields := map[string]interface{}{ "U,age=Idle": int64(90), } - m, err := metric.New("My CPU", tags, fields, now) - assert.NoError(t, err) + m := metric.New("My CPU", tags, fields, now) s, _ := NewSerializer(0) buf, err := s.Serialize(m) @@ -177,15 +170,13 @@ func TestSerializeMetricWithEscapes(t *testing.T) { } func TestSerializeBatch(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m, m} diff --git a/plugins/serializers/msgpack/msgpack_test.go b/plugins/serializers/msgpack/msgpack_test.go index a44ffae4515e3..36cc66ea52c59 100644 --- a/plugins/serializers/msgpack/msgpack_test.go +++ b/plugins/serializers/msgpack/msgpack_test.go @@ -10,8 +10,7 @@ import ( ) func toTelegrafMetric(m Metric) telegraf.Metric { - tm, _ := metric.New(m.Name, m.Tags, m.Fields, m.Time.time) - + tm := metric.New(m.Name, m.Tags, m.Fields, m.Time.time) return tm } diff --git a/plugins/serializers/nowmetric/nowmetric_test.go b/plugins/serializers/nowmetric/nowmetric_test.go index e49b81c2d232c..b9e7914a6adbf 100644 --- a/plugins/serializers/nowmetric/nowmetric_test.go +++ b/plugins/serializers/nowmetric/nowmetric_test.go @@ -27,12 +27,11 @@ func TestSerializeMetricFloat(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer() var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`[{"metric_type":"usage_idle","resource":"","node":"","value":91.5,"timestamp":%d,"ci2metric_id":null,"source":"Telegraf"}]`, (now.UnixNano() / int64(time.Millisecond)))) assert.Equal(t, string(expS), string(buf)) @@ -67,15 +66,13 @@ func TestSerialize_TimestampUnits(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(1525478795, 123456789), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(1525478795, 123456789), ) s, _ := NewSerializer() actual, err := s.Serialize(m) @@ -93,12 +90,11 @@ func TestSerializeMetricInt(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(90), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer() var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`[{"metric_type":"usage_idle","resource":"","node":"","value":90,"timestamp":%d,"ci2metric_id":null,"source":"Telegraf"}]`, (now.UnixNano() / int64(time.Millisecond)))) @@ -113,12 +109,11 @@ func TestSerializeMetricString(t *testing.T) { fields := map[string]interface{}{ "usage_idle": "foobar", } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer() var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) assert.Equal(t, "null", string(buf)) @@ -133,8 +128,7 @@ func TestSerializeMultiFields(t *testing.T) { "usage_idle": int64(90), "usage_total": 8559615, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) // Sort for predictable field order sort.Slice(m.FieldList(), func(i, j int) bool { @@ -143,7 +137,7 @@ func TestSerializeMultiFields(t *testing.T) { s, _ := NewSerializer() var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := []byte(fmt.Sprintf(`[{"metric_type":"usage_idle","resource":"","node":"","value":90,"timestamp":%d,"ci2metric_id":null,"source":"Telegraf"},{"metric_type":"usage_total","resource":"","node":"","value":8559615,"timestamp":%d,"ci2metric_id":null,"source":"Telegraf"}]`, (now.UnixNano() / int64(time.Millisecond)), (now.UnixNano() / int64(time.Millisecond)))) @@ -158,8 +152,7 @@ func TestSerializeMetricWithEscapes(t *testing.T) { fields := map[string]interface{}{ "U,age=Idle": int64(90), } - m, err := metric.New("My CPU", tags, fields, now) - assert.NoError(t, err) + m := metric.New("My CPU", tags, fields, now) s, _ := NewSerializer() buf, err := s.Serialize(m) @@ -170,17 +163,14 @@ func TestSerializeMetricWithEscapes(t *testing.T) { } func TestSerializeBatch(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) - metrics := []telegraf.Metric{m, m} s, _ := NewSerializer() buf, err := s.SerializeBatch(metrics) diff --git a/plugins/serializers/splunkmetric/splunkmetric_test.go b/plugins/serializers/splunkmetric/splunkmetric_test.go index f00d5d8da2176..c088d99f7f1a4 100644 --- a/plugins/serializers/splunkmetric/splunkmetric_test.go +++ b/plugins/serializers/splunkmetric/splunkmetric_test.go @@ -25,12 +25,11 @@ func TestSerializeMetricFloat(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(false, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"_value":91.5,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":1529875740.819}` assert.Equal(t, expS, string(buf)) @@ -45,12 +44,11 @@ func TestSerializeMetricFloatHec(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(true, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"time":1529875740.819,"fields":{"_value":91.5,"cpu":"cpu0","metric_name":"cpu.usage_idle"}}` assert.Equal(t, expS, string(buf)) @@ -64,12 +62,11 @@ func TestSerializeMetricInt(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(90), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(false, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"_value":90,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":0}` @@ -84,12 +81,11 @@ func TestSerializeMetricIntHec(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(90), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(true, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"time":0,"fields":{"_value":90,"cpu":"cpu0","metric_name":"cpu.usage_idle"}}` @@ -104,12 +100,11 @@ func TestSerializeMetricBool(t *testing.T) { fields := map[string]interface{}{ "oomkiller": bool(true), } - m, err := metric.New("docker", tags, fields, now) - assert.NoError(t, err) + m := metric.New("docker", tags, fields, now) s, _ := NewSerializer(false, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"_value":1,"container-name":"telegraf-test","metric_name":"docker.oomkiller","time":0}` @@ -124,12 +119,11 @@ func TestSerializeMetricBoolHec(t *testing.T) { fields := map[string]interface{}{ "oomkiller": bool(false), } - m, err := metric.New("docker", tags, fields, now) - assert.NoError(t, err) + m := metric.New("docker", tags, fields, now) s, _ := NewSerializer(true, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"time":0,"fields":{"_value":0,"container-name":"telegraf-test","metric_name":"docker.oomkiller"}}` @@ -145,12 +139,11 @@ func TestSerializeMetricString(t *testing.T) { "processorType": "ARMv7 Processor rev 4 (v7l)", "usage_idle": int64(5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s, _ := NewSerializer(false, false) var buf []byte - buf, err = s.Serialize(m) + buf, err := s.Serialize(m) assert.NoError(t, err) expS := `{"_value":5,"cpu":"cpu0","metric_name":"cpu.usage_idle","time":0}` @@ -159,25 +152,22 @@ func TestSerializeMetricString(t *testing.T) { } func TestSerializeBatch(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) - n := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 92.0, - }, - time.Unix(0, 0), - ), + + n := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 92.0, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m, n} @@ -190,16 +180,14 @@ func TestSerializeBatch(t *testing.T) { } func TestSerializeMulti(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "user": 42.0, - "system": 8.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "user": 42.0, + "system": 8.0, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m} @@ -212,27 +200,22 @@ func TestSerializeMulti(t *testing.T) { } func TestSerializeBatchHec(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 42.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 42.0, + }, + time.Unix(0, 0), ) - n := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "value": 92.0, - }, - time.Unix(0, 0), - ), + n := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "value": 92.0, + }, + time.Unix(0, 0), ) - metrics := []telegraf.Metric{m, n} s, _ := NewSerializer(true, false) buf, err := s.SerializeBatch(metrics) @@ -243,16 +226,14 @@ func TestSerializeBatchHec(t *testing.T) { } func TestSerializeMultiHec(t *testing.T) { - m := MustMetric( - metric.New( - "cpu", - map[string]string{}, - map[string]interface{}{ - "usage": 42.0, - "system": 8.0, - }, - time.Unix(0, 0), - ), + m := metric.New( + "cpu", + map[string]string{}, + map[string]interface{}{ + "usage": 42.0, + "system": 8.0, + }, + time.Unix(0, 0), ) metrics := []telegraf.Metric{m} diff --git a/plugins/serializers/wavefront/wavefront_test.go b/plugins/serializers/wavefront/wavefront_test.go index 548326e703e6c..ee653c62b4072 100755 --- a/plugins/serializers/wavefront/wavefront_test.go +++ b/plugins/serializers/wavefront/wavefront_test.go @@ -178,13 +178,11 @@ func TestSerializeMetricFloat(t *testing.T) { fields := map[string]interface{}{ "usage_idle": float64(91.5), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"cpu.usage.idle\" 91.500000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -199,13 +197,11 @@ func TestSerializeMetricInt(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(91), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"cpu.usage.idle\" 91.000000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -220,13 +216,11 @@ func TestSerializeMetricBoolTrue(t *testing.T) { fields := map[string]interface{}{ "usage_idle": true, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"cpu.usage.idle\" 1.000000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -241,13 +235,11 @@ func TestSerializeMetricBoolFalse(t *testing.T) { fields := map[string]interface{}{ "usage_idle": false, } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"cpu.usage.idle\" 0.000000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -262,13 +254,11 @@ func TestSerializeMetricFieldValue(t *testing.T) { fields := map[string]interface{}{ "value": int64(91), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"cpu\" 91.000000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -283,13 +273,11 @@ func TestSerializeMetricPrefix(t *testing.T) { fields := map[string]interface{}{ "usage_idle": int64(91), } - m, err := metric.New("cpu", tags, fields, now) - assert.NoError(t, err) + m := metric.New("cpu", tags, fields, now) s := WavefrontSerializer{Prefix: "telegraf."} buf, _ := s.Serialize(m) mS := strings.Split(strings.TrimSpace(string(buf)), "\n") - assert.NoError(t, err) expS := []string{fmt.Sprintf("\"telegraf.cpu.usage.idle\" 91.000000 %d source=\"realHost\" \"cpu\"=\"cpu0\"", now.UnixNano()/1000000000)} assert.Equal(t, expS, mS) @@ -306,10 +294,7 @@ func benchmarkMetrics(b *testing.B) [4]telegraf.Metric { fields := map[string]interface{}{ "usage_idle": v, } - m, err := metric.New("cpu", tags, fields, now) - if err != nil { - b.Fatal(err) - } + m := metric.New("cpu", tags, fields, now) return m } return [4]telegraf.Metric{ diff --git a/selfstat/selfstat.go b/selfstat/selfstat.go index bafd3bd129bd5..78107447d780c 100644 --- a/selfstat/selfstat.go +++ b/selfstat/selfstat.go @@ -7,7 +7,6 @@ package selfstat import ( "hash/fnv" - "log" "sort" "sync" "time" @@ -96,12 +95,8 @@ func Metrics() []telegraf.Metric { fields[fieldname] = stat.Get() j++ } - metric, err := metric.New(name, tags, fields, now) - if err != nil { - log.Printf("E! Error creating selfstat metric: %s", err) - continue - } - metrics[i] = metric + m := metric.New(name, tags, fields, now) + metrics[i] = m i++ } } diff --git a/testutil/metric.go b/testutil/metric.go index 1fb18991e1558..cd0a7ad25efc7 100644 --- a/testutil/metric.go +++ b/testutil/metric.go @@ -185,17 +185,11 @@ func MustMetric( tm time.Time, tp ...telegraf.ValueType, ) telegraf.Metric { - m, err := metric.New(name, tags, fields, tm, tp...) - if err != nil { - panic("MustMetric") - } + m := metric.New(name, tags, fields, tm, tp...) return m } func FromTestMetric(met *Metric) telegraf.Metric { - m, err := metric.New(met.Measurement, met.Tags, met.Fields, met.Time, met.Type) - if err != nil { - panic("MustMetric") - } + m := metric.New(met.Measurement, met.Tags, met.Fields, met.Time, met.Type) return m } diff --git a/testutil/metric_test.go b/testutil/metric_test.go index 0c999185a8fd4..e84fc569ed638 100644 --- a/testutil/metric_test.go +++ b/testutil/metric_test.go @@ -18,7 +18,7 @@ func TestRequireMetricEqual(t *testing.T) { { name: "equal metrics should be equal", got: func() telegraf.Metric { - m, _ := metric.New( + m := metric.New( "test", map[string]string{ "t1": "v1", @@ -34,7 +34,7 @@ func TestRequireMetricEqual(t *testing.T) { return m }(), want: func() telegraf.Metric { - m, _ := metric.New( + m := metric.New( "test", map[string]string{ "t1": "v1", diff --git a/testutil/testutil.go b/testutil/testutil.go index f2d95560d7fd6..1184aec05cb5b 100644 --- a/testutil/testutil.go +++ b/testutil/testutil.go @@ -56,7 +56,7 @@ func TestMetric(value interface{}, name ...string) telegraf.Metric { measurement = name[0] } tags := map[string]string{"tag1": "value1"} - pt, _ := metric.New( + pt := metric.New( measurement, tags, map[string]interface{}{"value": value},