Start migration to github.com/ugorji/go/

app/router.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/PuerkitoBio/ghost/handlers"
 	"github.com/gorilla/mux"
-	"github.com/pquerna/ffjson/ffjson"
+	"github.com/ugorji/go/codec"
 
 	"github.com/weaveworks/scope/common/hostname"
 	"github.com/weaveworks/scope/common/xfer"
@@ -22,6 +22,7 @@ var (
 
 	// UniqueID - set at runtime.
 	UniqueID = "0"
+	h        codec.JsonHandle
 )
 
 // URLMatcher uses request.RequestURI (the raw, unparsed request) to attempt
@@ -134,7 +135,7 @@ func RegisterReportPostHandler(a Adder, router *mux.Router) {
 		decoder := gob.NewDecoder(reader).Decode
 		if strings.HasPrefix(r.Header.Get("Content-Type"), "application/json") {
 			decoder = func(i interface{}) error {
-				return ffjson.NewDecoder().DecodeReader(reader, i)
+				return codec.NewDecoder(reader, &h).Decode(i)
 			}
 		}
 		if err := decoder(&rpt); err != nil {

probe/appclient/report_publisher.go

@@ -3,11 +3,13 @@ package appclient
 import (
 	"bytes"
 	"compress/gzip"
-	"github.com/pquerna/ffjson/ffjson"
+	"github.com/ugorji/go/codec"
 
 	"github.com/weaveworks/scope/report"
 )
 
+var h codec.JsonHandle
+
 // A ReportPublisher uses a buffer pool to serialise reports, which it
 // then passes to a publisher
 type ReportPublisher struct {
@@ -25,7 +27,7 @@ func NewReportPublisher(publisher Publisher) *ReportPublisher {
 func (p *ReportPublisher) Publish(r report.Report) error {
 	buf := &bytes.Buffer{}
 	gzwriter := gzip.NewWriter(buf)
-	if err := ffjson.NewEncoder(gzwriter).Encode(r); err != nil {
+	if err := codec.NewEncoder(gzwriter, &h).Encode(r); err != nil {
 		return err
 	}
 	gzwriter.Close() // otherwise the content won't get flushed to the output stream