diff --git a/metrics/statsd.go b/metrics/statsd.go index cb69852bf..4e004d90a 100644 --- a/metrics/statsd.go +++ b/metrics/statsd.go @@ -36,14 +36,14 @@ func NewStatsdMonitor(client statsdClient, prefix string) *StatsdMonitor { // RecordRun records a run behavior func (m *StatsdMonitor) RecordRun(run agent.Run) { m.client.Timing( - m.createMetricName(runDurationMetricName, run.Recipe, run.Success, run.RecordCount), + m.createMetricName(runDurationMetricName, run.Recipe, run.Success), int64(run.DurationInMs), ) m.client.Increment( - m.createMetricName(runMetricName, run.Recipe, run.Success, run.RecordCount), + m.createMetricName(runMetricName, run.Recipe, run.Success), ) m.client.IncrementByValue( - m.createMetricName(runRecordCountMetricName, run.Recipe, run.Success, run.RecordCount), + m.createMetricName(runRecordCountMetricName, run.Recipe, run.Success), run.RecordCount, ) } @@ -64,19 +64,18 @@ func (m *StatsdMonitor) RecordPlugin(recipeName, pluginName, pluginType string, } // createMetricName creates a metric name for a given recipe and success -func (m *StatsdMonitor) createMetricName(metricName string, recipe recipe.Recipe, success bool, recordCount int) string { +func (m *StatsdMonitor) createMetricName(metricName string, recipe recipe.Recipe, success bool) string { var successText = "false" if success { successText = "true" } return fmt.Sprintf( - "%s.%s,name=%s,success=%s,records=%d,extractor=%s", + "%s.%s,name=%s,success=%s,extractor=%s", m.prefix, metricName, recipe.Name, successText, - recordCount, recipe.Source.Name, ) } diff --git a/metrics/statsd_test.go b/metrics/statsd_test.go index b808a38ee..814622a6d 100644 --- a/metrics/statsd_test.go +++ b/metrics/statsd_test.go @@ -87,27 +87,24 @@ func TestStatsdMonitorRecordRun(t *testing.T) { duration := 100 recordCount := 2 timingMetric := fmt.Sprintf( - "%s.runDuration,name=%s,success=%s,records=%d,extractor=%s", + "%s.runDuration,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "false", - recordCount, recipe.Source.Name, ) incrementMetric := fmt.Sprintf( - "%s.run,name=%s,success=%s,records=%d,extractor=%s", + "%s.run,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "false", - recordCount, recipe.Source.Name, ) recordIncrementMetric := fmt.Sprintf( - "%s.runRecordCount,name=%s,success=%s,records=%d,extractor=%s", + "%s.runRecordCount,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "false", - recordCount, recipe.Source.Name, ) @@ -118,7 +115,7 @@ func TestStatsdMonitorRecordRun(t *testing.T) { defer client.AssertExpectations(t) monitor := metrics.NewStatsdMonitor(client, statsdPrefix) - monitor.RecordRun(agent.Run{Recipe: recipe, DurationInMs: duration, RecordCount: 2, Success: false}) + monitor.RecordRun(agent.Run{Recipe: recipe, DurationInMs: duration, RecordCount: recordCount, Success: false}) }) t.Run("should set success field to true on success", func(t *testing.T) { @@ -131,27 +128,24 @@ func TestStatsdMonitorRecordRun(t *testing.T) { duration := 100 recordCount := 2 timingMetric := fmt.Sprintf( - "%s.runDuration,name=%s,success=%s,records=%d,extractor=%s", + "%s.runDuration,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "true", - recordCount, recipe.Source.Name, ) incrementMetric := fmt.Sprintf( - "%s.run,name=%s,success=%s,records=%d,extractor=%s", + "%s.run,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "true", - recordCount, recipe.Source.Name, ) recordIncrementMetric := fmt.Sprintf( - "%s.runRecordCount,name=%s,success=%s,records=%d,extractor=%s", + "%s.runRecordCount,name=%s,success=%s,extractor=%s", statsdPrefix, recipe.Name, "true", - recordCount, recipe.Source.Name, ) @@ -162,7 +156,7 @@ func TestStatsdMonitorRecordRun(t *testing.T) { defer client.AssertExpectations(t) monitor := metrics.NewStatsdMonitor(client, statsdPrefix) - monitor.RecordRun(agent.Run{Recipe: recipe, DurationInMs: duration, RecordCount: 2, Success: true}) + monitor.RecordRun(agent.Run{Recipe: recipe, DurationInMs: duration, RecordCount: recordCount, Success: true}) }) }