feat(inputs): remove checks for service inputs

allseas · Oct 8, 2024 · a753fec · a753fec
1 parent 3e5fbcd
commit a753fec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/models/running_input.go b/models/running_input.go
@@ -117,14 +117,12 @@ func (r *RunningInput) Init() error {
 		return fmt.Errorf("invalid 'startup_error_behavior' setting %q", r.Config.StartupErrorBehavior)
 	}
 
-	if _, ok := r.Input.(telegraf.ServiceInput); !ok {
-		switch r.Config.TimeSource {
-		case "":
-			r.Config.TimeSource = "metric"
-		case "metric", "collection_start", "collection_end":
-		default:
-			return fmt.Errorf("invalid 'time_source' setting %q", r.Config.TimeSource)
-		}
+	switch r.Config.TimeSource {
+	case "":
+		r.Config.TimeSource = "metric"
+	case "metric", "collection_start", "collection_end":
+	default:
+		return fmt.Errorf("invalid 'time_source' setting %q", r.Config.TimeSource)
 	}
 
 	if p, ok := r.Input.(telegraf.Initializer); ok {
@@ -219,14 +217,12 @@ func (r *RunningInput) MakeMetric(metric telegraf.Metric) telegraf.Metric {
 		makemetric(metric, "", "", "", local, global)
 	}
 
-	if _, ok := r.Input.(telegraf.ServiceInput); !ok {
-		switch r.Config.TimeSource {
-		case "collection_start":
-			metric.SetTime(r.gatherStart)
-		case "collection_end":
-			metric.SetTime(r.gatherEnd)
-		default:
-		}
+	switch r.Config.TimeSource {
+	case "collection_start":
+		metric.SetTime(r.gatherStart)
+	case "collection_end":
+		metric.SetTime(r.gatherEnd)
+	default:
 	}
 
 	r.MetricsGathered.Incr(1)

diff --git a/models/running_input_test.go b/models/running_input_test.go
@@ -435,7 +435,7 @@ func TestMakeMetricWithGatherMetricTimeSource(t *testing.T) {
 		Filter:                  Filter{},
 		AlwaysIncludeLocalTags:  false,
 		AlwaysIncludeGlobalTags: false,
-		TimeSource:              TimeSourceMetric,
+		TimeSource:              "metric",
 	})
 	start := time.Now()
 	ri.gatherStart = start
@@ -457,7 +457,7 @@ func TestMakeMetricWithGatherStartTimeSource(t *testing.T) {
 		Filter:                  Filter{},
 		AlwaysIncludeLocalTags:  false,
 		AlwaysIncludeGlobalTags: false,
-		TimeSource:              TimeSourceCollectionStart,
+		TimeSource:              "collection_start",
 	})
 	ri.gatherStart = start
 
@@ -474,7 +474,7 @@ func TestMakeMetricWithGatherEndTimeSource(t *testing.T) {
 	end := time.Now()
 	ri := NewRunningInput(&testInput{}, &InputConfig{
 		Name:       "TestRunningInput",
-		TimeSource: TimeSourceCollectionEnd,
+		TimeSource: "collection_end",
 	})
 	ri.gatherEnd = end