json timestamp

runtime/metrics.go

@@ -170,7 +170,7 @@ func (m *Metrics) writeToInfluxDBSink(measurementType string) MetricSinkFn {
 
 			measurementName := fmt.Sprintf("%s.%s.%s", measurementType, vals[0], metric.Type.String())
 
-			p, err := client.NewPoint(measurementName, tags, fields, time.Unix(0, metric.Timestamp))
+			p, err := client.NewPoint(measurementName, tags, fields, time.Time(metric.Timestamp))
 			if err != nil {
 				return err
 			}

runtime/metrics_types.go

@@ -60,8 +60,23 @@ func (mt *MetricType) UnmarshalJSON(b []byte) error {
 	return fmt.Errorf("invalid metric type")
 }
 
+type JSONTime time.Time
+
+func (t *JSONTime) MarshalJSON() ([]byte, error) {
+	return []byte(fmt.Sprintf("\"%s\"", time.Time(*t).Format(time.RFC3339))), nil
+}
+
+func (t *JSONTime) UnmarshalJSON(b []byte) error {
+	tt, err := time.Parse(time.RFC3339, string(b[1:len(b)-1]))
+	if err != nil {
+		return err
+	}
+	*t = JSONTime(tt)
+	return nil
+}
+
 type Metric struct {
-	Timestamp int64                  `json:"ts"`
+	Timestamp JSONTime               `json:"ts"`
 	Type      MetricType             `json:"type"`
 	Name      string                 `json:"name"`
 	Measures  map[string]interface{} `json:"measures"`
@@ -75,7 +90,7 @@ func NewMetric(name string, i interface{}) *Metric {
 	var (
 		m  *Metric
 		t  MetricType
-		ts = time.Now().UnixNano()
+		ts = time.Now()
 	)
 
 	switch v := i.(type) {
@@ -163,7 +178,7 @@ func NewMetric(name string, i interface{}) *Metric {
 
 	}
 
-	m.Timestamp = ts
+	m.Timestamp = JSONTime(ts)
 	m.Type = t
 	m.Name = name
 	return m

runtime/runenv_test.go

@@ -177,7 +177,6 @@ func TestMetricsRecordedInFile(t *testing.T) {
 			na := make(map[string]struct{})
 			ty := make(map[string]struct{})
 			for _, m := range metrics {
-				require.Greater(m.Timestamp, int64(0))
 				na[m.Name] = struct{}{}
 				ty[m.Type.String()] = struct{}{}
 				require.NotZero(len(m.Measures))