Calculate interval only in the x-pack case

ycombinator · ycombinator · commit 3afa1a2a7ab5 · 2018-08-08T10:55:22.000-07:00
diff --git a/metricbeat/module/kibana/stats/stats.go b/metricbeat/module/kibana/stats/stats.go
@@ -131,34 +131,39 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 // It returns the event which is then forward to the output. In case of an error, a
 // descriptive error must be returned.
 func (m *MetricSet) Fetch(r mb.ReporterV2) {
-	intervalMs := m.Module().Config().Period.Nanoseconds() / 1000 / 1000
 	now := time.Now()
 
-	m.fetchStats(r, intervalMs, now)
+	m.fetchStats(r, now)
 	if m.xPackEnabled {
-		m.fetchSettings(r, intervalMs, now)
+		m.fetchSettings(r, now)
 	}
 }
 
-func (m *MetricSet) fetchStats(r mb.ReporterV2, intervalMs int64, now time.Time) {
+func (m *MetricSet) fetchStats(r mb.ReporterV2, now time.Time) {
 	content, err := m.statsHTTP.FetchContent()
 	if err != nil {
 		r.Error(err)
 		return
 	}
 
 	if m.xPackEnabled {
+		intervalMs := m.calculateIntervalMs()
 		eventMappingStatsXPack(r, intervalMs, now, content)
 	} else {
 		eventMapping(r, content)
 	}
 }
 
-func (m *MetricSet) fetchSettings(r mb.ReporterV2, intervalMs int64, now time.Time) {
+func (m *MetricSet) fetchSettings(r mb.ReporterV2, now time.Time) {
 	content, err := m.settingsHTTP.FetchContent()
 	if err != nil {
 		return
 	}
 
+	intervalMs := m.calculateIntervalMs()
 	eventMappingSettingsXPack(r, intervalMs, now, content)
 }
+
+func (m *MetricSet) calculateIntervalMs() int64 {
+	return m.Module().Config().Period.Nanoseconds() / 1000 / 1000
+}
