Move to jsoniter instead of default json package (#1249)

* Move to jsoniter instead of default json package

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Removes jsoniter on the logcli output

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

pkg/canary/reader/reader.go

@@ -2,7 +2,6 @@ package reader
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -14,12 +13,12 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+	loghttp "github.com/grafana/loki/pkg/loghttp/legacy"
+	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-
-	loghttp "github.com/grafana/loki/pkg/loghttp/legacy"
-	"github.com/grafana/loki/pkg/logproto"
 )
 
 var (

pkg/logcli/client/client.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -11,13 +10,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gorilla/websocket"
 	"github.com/grafana/loki/pkg/loghttp"
+	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/util"
-
-	"github.com/gorilla/websocket"
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/common/config"
-
-	"github.com/grafana/loki/pkg/logproto"
 )
 
 const (

pkg/logcli/query/query.go

@@ -1,7 +1,6 @@
 package query
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"sort"
@@ -9,13 +8,13 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/grafana/loki/pkg/loghttp"
-	"github.com/grafana/loki/pkg/logql"
-	"github.com/prometheus/prometheus/promql"
-
 	"github.com/grafana/loki/pkg/logcli/client"
 	"github.com/grafana/loki/pkg/logcli/output"
+	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logproto"
+	"github.com/grafana/loki/pkg/logql"
+	json "github.com/json-iterator/go"
+	"github.com/prometheus/prometheus/promql"
 )
 
 type streamEntryPair struct {

pkg/logentry/stages/json.go

@@ -1,15 +1,13 @@
 package stages
 
 import (
-	"encoding/json"
-	//"encoding/json"
-	//"fmt"
 	"reflect"
 	"time"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/jmespath/go-jmespath"
+	json "github.com/json-iterator/go"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"

pkg/loghttp/query.go

@@ -1,7 +1,6 @@
 package loghttp
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -9,6 +8,7 @@ import (
 	"time"
 
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/common/model"
 )
 

pkg/loghttp/tail.go

@@ -1,13 +1,13 @@
 package loghttp
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
 	"time"
 
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 )
 
 const (

pkg/logql/engine_test.go

@@ -2,13 +2,13 @@ package logql
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"testing"
 	"time"
 
 	"github.com/grafana/loki/pkg/iter"
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/assert"

pkg/logql/marshal/legacy/marshal.go

@@ -3,15 +3,14 @@
 package marshal
 
 import (
-	"encoding/json"
 	"fmt"
 	"io"
 
 	"github.com/gorilla/websocket"
 	loghttp "github.com/grafana/loki/pkg/loghttp/legacy"
 	"github.com/grafana/loki/pkg/logproto"
-
 	"github.com/grafana/loki/pkg/logql"
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/prometheus/promql"
 )
 

pkg/logql/marshal/legacy/marshal_test.go

@@ -2,7 +2,6 @@ package marshal
 
 import (
 	"bytes"
-	"encoding/json"
 	"log"
 	"testing"
 	"time"
@@ -10,6 +9,7 @@ import (
 	loghttp "github.com/grafana/loki/pkg/loghttp/legacy"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logql"
+	json "github.com/json-iterator/go"
 	"github.com/stretchr/testify/require"
 )
 

pkg/logql/marshal/marshal.go

@@ -3,14 +3,13 @@
 package marshal
 
 import (
-	"encoding/json"
 	"io"
 
 	"github.com/gorilla/websocket"
 	"github.com/grafana/loki/pkg/loghttp"
 	legacy "github.com/grafana/loki/pkg/loghttp/legacy"
-
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/prometheus/promql"
 )
 

pkg/logql/marshal/marshal_test.go

@@ -2,18 +2,16 @@ package marshal
 
 import (
 	"bytes"
-	"encoding/json"
 	"testing"
 	"time"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	legacy "github.com/grafana/loki/pkg/loghttp/legacy"
-
-	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/promql"
-
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logql"
+	json "github.com/json-iterator/go"
+	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/require"
 )
 

pkg/logql/unmarshal/legacy/unmarshal.go

@@ -1,10 +1,10 @@
 package unmarshal
 
 import (
-	"encoding/json"
 	"io"
 
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 )
 
 // DecodePushRequest directly decodes json to a logproto.PushRequest

pkg/logql/unmarshal/unmarshal.go

@@ -1,12 +1,11 @@
 package unmarshal
 
 import (
-	"encoding/json"
 	"io"
 
 	"github.com/grafana/loki/pkg/loghttp"
-
 	"github.com/grafana/loki/pkg/logproto"
+	json "github.com/json-iterator/go"
 )
 
 // DecodePushRequest directly decodes json to a logproto.PushRequest

pkg/promtail/api/entry_parser.go

@@ -1,12 +1,12 @@
 package api
 
 import (
-	"encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
 	"time"
 
+	json "github.com/json-iterator/go"
 	"github.com/prometheus/common/model"
 )