Changed encoding/json to json-iterator/go for perf (#1250)

- updated encoding/json to json-iterator/go for perf Signed-off-by: Neil Naveen <42328488+neilnaveen@users.noreply.github.com>
guacsec · Sep 18, 2023 · a79ec2e · a79ec2e
1 parent 58d623e
commit a79ec2e
Show file tree

Hide file tree

Showing 67 changed files with 131 additions and 74 deletions.
diff --git a/cmd/guacone/cmd/collectsub_client.go b/cmd/guacone/cmd/collectsub_client.go
@@ -17,11 +17,12 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"os"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/guacsec/guac/pkg/cli"
 	"github.com/guacsec/guac/pkg/collectsub/client"
 	"github.com/guacsec/guac/pkg/collectsub/collectsub"
@@ -31,6 +32,8 @@ import (
 	"github.com/spf13/viper"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 type csubClientOptions struct {
 	addr string
 }

diff --git a/internal/testing/cmd/pubsub_test/cmd/files.go b/internal/testing/cmd/pubsub_test/cmd/files.go
@@ -17,12 +17,13 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"sync"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/guacsec/guac/pkg/assembler"
 	"github.com/guacsec/guac/pkg/emitter"
 	"github.com/guacsec/guac/pkg/handler/collector"
@@ -37,6 +38,8 @@ import (
 	"github.com/spf13/viper"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 type options struct {
 	dbAddr string
 	user   string

diff --git a/internal/testing/cmd/pubsub_test/cmd/osv.go b/internal/testing/cmd/pubsub_test/cmd/osv.go
@@ -17,7 +17,6 @@ package cmd
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"

diff --git a/internal/testing/dochelper/dochelper.go b/internal/testing/dochelper/dochelper.go
@@ -16,15 +16,18 @@
 package dochelper
 
 import (
-	"encoding/json"
 	"fmt"
 	"reflect"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	attestation_vuln "github.com/guacsec/guac/pkg/certifier/attestation"
 	"github.com/guacsec/guac/pkg/handler/processor"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func existAndPop(nodes []*processor.DocumentNode, n *processor.DocumentNode) bool {
 	for i, nn := range nodes {
 		if DocTreeEqual(nn, n) {

diff --git a/internal/testing/testdata/testdata.go b/internal/testing/testdata/testdata.go
@@ -18,9 +18,10 @@ package testdata
 import (
 	_ "embed"
 	"encoding/base64"
-	"encoding/json"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/guacsec/guac/internal/testing/keyutil"
@@ -137,6 +138,8 @@ var (
 	//go:embed exampledata/ingest_predicates.json
 	IngestPredicatesExample []byte
 
+	// json format
+	json = jsoniter.ConfigCompatibleWithStandardLibrary
 	// CycloneDX VEX testdata unaffected
 	pkg, _   = asmhelpers.PurlToPkg("pkg:maven/com.fasterxml.jackson.core/jackson-databind@2.10.0?type=jar")
 	vulnSpec = &generated.VulnerabilityInputSpec{

diff --git a/pkg/assembler/assembler_test.go b/pkg/assembler/assembler_test.go
@@ -17,18 +17,21 @@ package assembler
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"testing"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/guacsec/guac/internal/testing/ptrfrom"
 	"github.com/guacsec/guac/pkg/assembler/clients/generated"
 	"github.com/guacsec/guac/pkg/assembler/helpers"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func TestIngestPredicates(t *testing.T) {
 	ctx := context.Background()
 	slsaStartTime, _ := time.Parse(time.RFC3339, "2020-08-19T08:38:00Z")

diff --git a/pkg/assembler/backends/arangodb/artifact.go b/pkg/assembler/backends/arangodb/artifact.go
@@ -17,14 +17,17 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/arangodb/go-driver"
 	"github.com/guacsec/guac/pkg/assembler/graphql/model"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func (c *arangoClient) Artifacts(ctx context.Context, artifactSpec *model.ArtifactSpec) ([]*model.Artifact, error) {
 	values := map[string]any{}
 

diff --git a/pkg/assembler/backends/arangodb/builder.go b/pkg/assembler/backends/arangodb/builder.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/certifyBad.go b/pkg/assembler/backends/arangodb/certifyBad.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/certifyGood.go b/pkg/assembler/backends/arangodb/certifyGood.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/certifyScorecard.go b/pkg/assembler/backends/arangodb/certifyScorecard.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strconv"

diff --git a/pkg/assembler/backends/arangodb/certifyVEXStatement.go b/pkg/assembler/backends/arangodb/certifyVEXStatement.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

diff --git a/pkg/assembler/backends/arangodb/certifyVuln.go b/pkg/assembler/backends/arangodb/certifyVuln.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

diff --git a/pkg/assembler/backends/arangodb/hasMetadata.go b/pkg/assembler/backends/arangodb/hasMetadata.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

diff --git a/pkg/assembler/backends/arangodb/hasSBOM.go b/pkg/assembler/backends/arangodb/hasSBOM.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/hasSLSA.go b/pkg/assembler/backends/arangodb/hasSLSA.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"

diff --git a/pkg/assembler/backends/arangodb/hashEqual.go b/pkg/assembler/backends/arangodb/hashEqual.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"

diff --git a/pkg/assembler/backends/arangodb/isDependency.go b/pkg/assembler/backends/arangodb/isDependency.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/isOccurrence.go b/pkg/assembler/backends/arangodb/isOccurrence.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/pkg.go b/pkg/assembler/backends/arangodb/pkg.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"

diff --git a/pkg/assembler/backends/arangodb/pkgEqual.go b/pkg/assembler/backends/arangodb/pkgEqual.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"

diff --git a/pkg/assembler/backends/arangodb/pointOfContact.go b/pkg/assembler/backends/arangodb/pointOfContact.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

diff --git a/pkg/assembler/backends/arangodb/src.go b/pkg/assembler/backends/arangodb/src.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/arangodb/vulnEqual.go b/pkg/assembler/backends/arangodb/vulnEqual.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"

diff --git a/pkg/assembler/backends/arangodb/vulnMetadata.go b/pkg/assembler/backends/arangodb/vulnMetadata.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"

diff --git a/pkg/assembler/backends/arangodb/vulnerability.go b/pkg/assembler/backends/arangodb/vulnerability.go
@@ -17,7 +17,6 @@ package arangodb
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 

diff --git a/pkg/assembler/backends/ent/backend/pkgequal_test.go b/pkg/assembler/backends/ent/backend/pkgequal_test.go
@@ -18,15 +18,17 @@
 package backend
 
 import (
-	"encoding/json"
 	"strconv"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/guacsec/guac/internal/testing/ptrfrom"
 	"github.com/guacsec/guac/pkg/assembler/graphql/model"
+	jsoniter "github.com/json-iterator/go"
 	"golang.org/x/exp/slices"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func (s *Suite) TestPkgEqual() {
 	type call struct {
 		P1       *model.PkgInputSpec

diff --git a/pkg/assembler/backends/inmem/isOccurrence_test.go b/pkg/assembler/backends/inmem/isOccurrence_test.go
@@ -17,10 +17,11 @@ package inmem_test
 
 import (
 	"context"
-	"encoding/json"
 	"strings"
 	"testing"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/exp/slices"
 
@@ -29,6 +30,8 @@ import (
 	"github.com/guacsec/guac/pkg/assembler/graphql/model"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 func convNode(n model.Node) hasID {
 	// All nodes have a json "id"
 	// Only getting top-level id however

diff --git a/pkg/assembler/backends/neptune/neptune.go b/pkg/assembler/backends/neptune/neptune.go
@@ -17,19 +17,22 @@ package neptune
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
 	"github.com/guacsec/guac/pkg/assembler/backends"
 	"github.com/guacsec/guac/pkg/assembler/backends/neo4j"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 const neptuneServiceName = "neptune-db"
 
 func init() {

diff --git a/pkg/certifier/certify/certify.go b/pkg/certifier/certify/certify.go
@@ -17,16 +17,19 @@ package certify
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"time"
 
+	jsoniter "github.com/json-iterator/go"
+
 	"github.com/guacsec/guac/pkg/certifier"
 	"github.com/guacsec/guac/pkg/emitter"
 	"github.com/guacsec/guac/pkg/handler/processor"
 	"github.com/guacsec/guac/pkg/logging"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 const (
 	BufferChannelSize int = 1000
 )

diff --git a/pkg/certifier/certify/certify_test.go b/pkg/certifier/certify/certify_test.go
@@ -17,7 +17,6 @@ package certify
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"testing"