Merge pull request #96 from zianazhao/dev/timeZone

Dev/time zone
tencentyun · Feb 2, 2023 · 6f6e634 · 6f6e634
2 parents b792693 + 029afb9
commit 6f6e634
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/pkg/collector/handler_clb_private.go b/pkg/collector/handler_clb_private.go
@@ -145,7 +145,6 @@ func (h *ClbPrivateHandler) GetSeriesByCustom(m *metric.TcmMetric) ([]*metric.Tc
 	}
 	return slist, nil
 }
-
 func (h *ClbPrivateHandler) getSeriesByMetricType(m *metric.TcmMetric, ins instance.TcInstance) ([]*metric.TcmSeries, error) {
 	var dimensions []string
 	for _, v := range m.Meta.SupportDimensions {

diff --git a/pkg/metric/metric.go b/pkg/metric/metric.go
@@ -61,10 +61,11 @@ func (m *TcmMetric) GetLatestPromMetrics(repo TcmMetricRepository) (pms []promet
 	et := int64(0)
 	now := time.Now().Unix()
 	if m.Conf.StatDelaySeconds > 0 {
-		st = now - m.Conf.StatPeriodSeconds - m.Conf.StatDelaySeconds
+		st = now - m.Conf.StatNumSamples*m.Conf.StatPeriodSeconds - m.Conf.StatDelaySeconds
 		et = now - m.Conf.StatDelaySeconds
 	} else {
 		st = now - m.Conf.StatNumSamples*m.Conf.StatPeriodSeconds
+		et = now
 	}
 
 	samplesList, err := repo.ListSamples(m, st, et)

diff --git a/pkg/util/time.go b/pkg/util/time.go
@@ -6,10 +6,6 @@ import "time"
 func FormatTime(t time.Time, format string) string {
 	var local time.Time
 	_, offset := t.Zone()
-	if offset == 0 {
-		local = t.Add(8 * time.Hour)
-	} else {
-		local = t
-	}
+	local = t.Add(time.Duration(8*3600-offset) * time.Second)
 	return local.Format(format)
 }