Merge pull request #11 from FindHotel/context-fix

Returning context nesting

analytics_test.go

@@ -287,6 +287,7 @@ func ExampleTrackObjLess() {
 	//         "platform": "osx",
 	//         "version": "1.1.0"
 	//       },
+	//       "timestamp": 0,
 	//       "type": "track"
 	//     }
 	//   ],

s3client.go

@@ -223,7 +223,10 @@ func (c *s3Client) setTagsIfExsist(m Message) {
 
 func (c *s3Client) encodeMessage(bw *bufferedEncoder, m Message) (ready bool, err error) {
 	if c.config.S3.UnwrappedMessage {
-		return bw.Push(m)
+		type unwrappedMessage struct {
+			Event Message `json:"event"`
+		}
+		return bw.Push(unwrappedMessage{Event: m})
 	}
 
 	ts := c.now()

s3client_test.go

@@ -64,7 +64,7 @@ func TestTargetMessageMarshalling(t *testing.T) {
 	_, err = client.encodeMessage(encoder, m)
 	require.NoError(t, err)
 
-	expected = `{"userId":"tuna","event":"FooBared","timestamp":0,"properties":{"index":1,"qwer":3424}}` + "\n"
+	expected = `{"event":{"userId":"tuna","event":"FooBared","timestamp":0,"properties":{"index":1,"qwer":3424}}}` + "\n"
 	assertBuffer(t, encoder, expected)
 }
 

time.go

@@ -1,7 +1,6 @@
 package analytics
 
 import (
-	"encoding/json"
 	"strconv"
 	"time"
 )
@@ -11,11 +10,12 @@ type Time time.Time
 
 // MarshalJSON marshals time as unix milliseconds.
 func (t Time) MarshalJSON() ([]byte, error) {
-	if t == Time(time.Time{}) {
-		return json.Marshal(0)
+	var ts int64
+	if t != Time(time.Time{}) {
+		ts = time.Time(t).UnixNano() / int64(time.Millisecond)
 	}
-	millis := int64(time.Millisecond / time.Nanosecond)
-	return json.Marshal(time.Time(t).UnixNano() / millis)
+
+	return strconv.AppendInt(nil, ts, 10), nil
 }
 
 // UnmarshalJSON unmarshals milliseconds into Time.

track.go

@@ -56,7 +56,6 @@ type TrackObjLess struct {
 	// This field is exported for serialization purposes and shouldn't be set by
 	// the application, its value is always overwritten by the library.
 	Track
-	Timestamp  *Time       `json:"timestamp,omitempty"`
 	Properties interface{} `json:"properties,omitempty"`
 }