Merge pull request #275 from axw/extract-fastjson

Migrate to go.elastic.co/fastjson

go.mod

@@ -1,11 +1,17 @@
 module go.elastic.co/apm
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/elastic/go-sysinfo v0.0.0-20180725164248-b603f0b7f205
 	github.com/elastic/go-windows v0.0.0-20180725153217-f11b8c9a6253 // indirect
+	github.com/google/go-cmp v0.2.0
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/pkg/errors v0.8.0
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/procfs v0.0.0-20180705121852-ae68e2d4c00f // indirect
+	github.com/santhosh-tekuri/jsonschema v1.2.2
+	github.com/stretchr/testify v1.2.2
+	go.elastic.co/fastjson v1.0.0
 	golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8 // indirect
 	howett.net/plist v0.0.0-20180609054337-500bd5b9081b // indirect
 )

go.sum

@@ -1,15 +1,27 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/elastic/go-sysinfo v0.0.0-20180718020938-229091762cd7 h1:RzClQcNNrl1qQNKiTQkmL1q279aLoZ4VEph7kzhdkkY=
 github.com/elastic/go-sysinfo v0.0.0-20180718020938-229091762cd7/go.mod h1:5kYRMF9nitZzZ4odJqSHV1DddYPTJ+QB4YsyWmNyJzA=
 github.com/elastic/go-sysinfo v0.0.0-20180725164248-b603f0b7f205 h1:IhpGwT5dp42Pb5eMGKAkPOBIZ1pJLgNX7lZUIwc08hs=
 github.com/elastic/go-sysinfo v0.0.0-20180725164248-b603f0b7f205/go.mod h1:5kYRMF9nitZzZ4odJqSHV1DddYPTJ+QB4YsyWmNyJzA=
 github.com/elastic/go-windows v0.0.0-20180725153217-f11b8c9a6253 h1:2SgsfJiWHUSo6OjpqHbri9yKiR2XWwnlvfBSdfzFQ2U=
 github.com/elastic/go-windows v0.0.0-20180725153217-f11b8c9a6253/go.mod h1:jgPEIvw0E137UFC4zfkcjyM9T9shDL+JIfqFXQQhVwc=
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4=
 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/procfs v0.0.0-20180705121852-ae68e2d4c00f h1:c9M4CCa6g8WURSsbrl3lb/w/G1Z5xZpYvhhjdcVDOkE=
 github.com/prometheus/procfs v0.0.0-20180705121852-ae68e2d4c00f/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/santhosh-tekuri/jsonschema v1.2.2 h1:Ccczh1OKk94R6AIeRAD1ue6o3s/jad8TYKhv50K69Lw=
+github.com/santhosh-tekuri/jsonschema v1.2.2/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+go.elastic.co/fastjson v1.0.0 h1:ooXV/ABvf+tBul26jcVViPT3sBir0PvXgibYB1IQQzg=
+go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs=
 golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8 h1:7T3bTJEttnfJdEY+NY/VYT7IXRaul8potWiyw/n7LB8=
 golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 howett.net/plist v0.0.0-20180609054337-500bd5b9081b h1:r4LwkXZhdblHVSgAvfRjsFpQBorl6S9pAH+AOHVs+28=

gofuzz.go

@@ -18,9 +18,9 @@ import (
 	"github.com/santhosh-tekuri/jsonschema"
 
 	"go.elastic.co/apm/internal/apmschema"
-	"go.elastic.co/apm/internal/fastjson"
 	"go.elastic.co/apm/model"
 	"go.elastic.co/apm/stacktrace"
+	"go.elastic.co/fastjson"
 )
 
 func Fuzz(data []byte) int {
@@ -224,21 +224,27 @@ type gofuzzTransport struct {
 
 func (t *gofuzzTransport) SendErrors(ctx context.Context, payload *model.ErrorsPayload) error {
 	t.writer.Reset()
-	payload.MarshalFastJSON(&t.writer)
+	if err := payload.MarshalFastJSON(&t.writer); err != nil {
+		return err
+	}
 	t.validate(apmschema.Errors)
 	return nil
 }
 
 func (t *gofuzzTransport) SendMetrics(ctx context.Context, payload *model.MetricsPayload) error {
 	t.writer.Reset()
-	payload.MarshalFastJSON(&t.writer)
+	if err := payload.MarshalFastJSON(&t.writer); err != nil {
+		return err
+	}
 	t.validate(apmschema.Metrics)
 	return nil
 }
 
 func (t *gofuzzTransport) SendTransactions(ctx context.Context, payload *model.TransactionsPayload) error {
 	t.writer.Reset()
-	payload.MarshalFastJSON(&t.writer)
+	if err := payload.MarshalFastJSON(&t.writer); err != nil {
+		return err
+	}
 	t.validate(apmschema.Transactions)
 	return nil
 }

internal/apmhttputil/url_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.elastic.co/apm/internal/apmhttputil"
-	"go.elastic.co/apm/internal/fastjson"
 	"go.elastic.co/apm/model"
+	"go.elastic.co/fastjson"
 )
 
 func TestRequestURLClient(t *testing.T) {
@@ -97,12 +97,13 @@ func TestRequestURLHeaders(t *testing.T) {
 
 			// Marshal the URL to gets its "full" representation.
 			var w fastjson.Writer
-			out.MarshalFastJSON(&w)
+			err := out.MarshalFastJSON(&w)
+			assert.NoError(t, err)
 
 			var decoded struct {
 				Full string
 			}
-			err := json.Unmarshal(w.Bytes(), &decoded)
+			err = json.Unmarshal(w.Bytes(), &decoded)
 			assert.NoError(t, err)
 			assert.Equal(t, test.full, decoded.Full)
 		})