chore: conflicts lint fixes

integration_test/tracing/tracing_test.go

@@ -35,7 +35,6 @@ import (
 	"github.com/rudderlabs/rudder-server/gateway/response"
 	"github.com/rudderlabs/rudder-server/jobsdb"
 	"github.com/rudderlabs/rudder-server/jsonrs"
-	"github.com/rudderlabs/rudder-server/processor/transformer"
 	"github.com/rudderlabs/rudder-server/runner"
 	"github.com/rudderlabs/rudder-server/testhelper/backendconfigtest"
 	"github.com/rudderlabs/rudder-server/testhelper/health"

integration_test/transformer_contract/transformer_contract_test.go

@@ -27,8 +27,8 @@ import (
 
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
 	"github.com/rudderlabs/rudder-server/jobsdb"
-	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/jsonrs"
+	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/runner"
 	"github.com/rudderlabs/rudder-server/testhelper/health"
 	"github.com/rudderlabs/rudder-server/testhelper/transformertest"

integration_test/warehouse/warehouse_test.go

@@ -1793,7 +1793,7 @@ func TestDestinationTransformation(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			var transformerEvents []transformer.TransformerEvent
+			var transformerEvents []types.TransformerEvent
 			err = jsonrs.Unmarshal([]byte(b.String()), &transformerEvents)
 			require.NoError(t, err)
 
@@ -1923,7 +1923,7 @@ func TestDestinationTransformation(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			var transformerEvents []transformer.TransformerEvent
+			var transformerEvents []types.TransformerEvent
 			err = jsonrs.Unmarshal([]byte(b.String()), &transformerEvents)
 			require.NoError(t, err)
 
@@ -2047,7 +2047,7 @@ func TestDestinationTransformation(t *testing.T) {
 			})
 			require.NoError(t, err)
 
-			var transformerEvents []transformer.TransformerEvent
+			var transformerEvents []types.TransformerEvent
 			err = jsonrs.Unmarshal([]byte(b.String()), &transformerEvents)
 			require.NoError(t, err)
 

processor/consent.go

@@ -6,8 +6,8 @@ import (
 	"github.com/samber/lo"
 
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
-	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/jsonrs"
+	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/utils/misc"
 )
 

processor/events_response.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/rudderlabs/rudder-server/jobsdb"
 	"github.com/rudderlabs/rudder-server/jsonrs"
+	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/utils/misc"
 )
 

processor/integrations/integrations.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/rudderlabs/rudder-go-kit/stats"
 	backendconfig "github.com/rudderlabs/rudder-server/backend-config"
-	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/jsonrs"
+	"github.com/rudderlabs/rudder-server/processor/types"
 	"github.com/rudderlabs/rudder-server/utils/misc"
 )
 

processor/internal/transformer/destination_transformer/destination_transformer.go

@@ -3,7 +3,6 @@ package destination_transformer
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -12,6 +11,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	obskit "github.com/rudderlabs/rudder-observability-kit/go/labels"
 
 	"github.com/cenkalti/backoff"
@@ -174,7 +175,7 @@ func (d *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 		err     error
 	)
 
-	rawJSON, err = json.Marshal(data)
+	rawJSON, err = jsonrs.Marshal(data)
 	if err != nil {
 		panic(err)
 	}
@@ -207,7 +208,7 @@ func (d *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 	case http.StatusOK:
 		integrations.CollectIntgTransformErrorStats(respData)
 
-		err = json.Unmarshal(respData, &transformerResponses)
+		err = jsonrs.Unmarshal(respData, &transformerResponses)
 		// This is returned by our JS engine so should  be parsable
 		// Panic the processor to avoid replays
 		if err != nil {

processor/internal/transformer/destination_transformer/destination_transformer_test.go

@@ -2,7 +2,6 @@ package destination_transformer_test
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -13,6 +12,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
@@ -40,7 +41,7 @@ type fakeTransformer struct {
 
 func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var reqBody []types.TransformerEvent
-	require.NoError(t.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(t.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	t.requests = append(t.requests, reqBody)
 
@@ -63,7 +64,7 @@ func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(t.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(t.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endlessLoopTransformer struct {
@@ -83,7 +84,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	elt.retryCount++
 
 	var reqBody []types.TransformerEvent
-	require.NoError(elt.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(elt.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -105,7 +106,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		w.Header().Set("apiVersion", strconv.Itoa(elt.apiVersion))
 	}
 
-	require.NoError(elt.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(elt.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endpointTransformer struct {
@@ -122,7 +123,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	}
 
 	var reqBody []types.TransformerEvent
-	require.NoError(et.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(et.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -137,7 +138,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(et.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(et.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 func TestDestinationTransformer(t *testing.T) {

processor/internal/transformer/trackingplan_validation/trackingplan_validation.go

@@ -3,14 +3,15 @@ package trackingplan_validation
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"strconv"
 	"sync"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	obskit "github.com/rudderlabs/rudder-observability-kit/go/labels"
 
 	"github.com/cenkalti/backoff"
@@ -161,7 +162,7 @@ func (t *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 		err     error
 	)
 
-	rawJSON, err = json.Marshal(data)
+	rawJSON, err = jsonrs.Marshal(data)
 	if err != nil {
 		panic(err)
 	}
@@ -227,7 +228,7 @@ func (t *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 	switch statusCode {
 	case http.StatusOK:
 		integrations.CollectIntgTransformErrorStats(respData)
-		err = json.Unmarshal(respData, &transformerResponses)
+		err = jsonrs.Unmarshal(respData, &transformerResponses)
 		// This is returned by our JS engine so should  be parsable
 		// Panic the processor to avoid replays
 		if err != nil {

processor/internal/transformer/trackingplan_validation/trackingplan_validation_test.go

@@ -2,7 +2,6 @@ package trackingplan_validation_test
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -13,6 +12,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
@@ -39,7 +40,7 @@ type fakeTransformer struct {
 
 func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var reqBody []types.TransformerEvent
-	require.NoError(t.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(t.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	t.requests = append(t.requests, reqBody)
 
@@ -62,7 +63,7 @@ func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(t.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(t.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endlessLoopTransformer struct {
@@ -82,7 +83,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	elt.retryCount++
 
 	var reqBody []types.TransformerEvent
-	require.NoError(elt.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(elt.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -104,7 +105,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		w.Header().Set("apiVersion", strconv.Itoa(elt.apiVersion))
 	}
 
-	require.NoError(elt.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(elt.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endpointTransformer struct {
@@ -121,7 +122,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	}
 
 	var reqBody []types.TransformerEvent
-	require.NoError(et.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(et.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -136,7 +137,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(et.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(et.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 func TestTrackingPlanValidator(t *testing.T) {

processor/internal/transformer/user_transformer/user_transformer.go

@@ -12,10 +12,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	obskit "github.com/rudderlabs/rudder-observability-kit/go/labels"
 
 	"github.com/cenkalti/backoff/v4"
-	jsoniter "github.com/json-iterator/go"
 	"github.com/samber/lo"
 
 	"github.com/rudderlabs/rudder-go-kit/config"
@@ -30,8 +31,6 @@ import (
 	reportingtypes "github.com/rudderlabs/rudder-server/utils/types"
 )
 
-var json = jsoniter.ConfigCompatibleWithStandardLibrary
-
 type Opt func(*Client)
 
 func WithClient(client transformerclient.Client) Opt {
@@ -193,7 +192,7 @@ func (u *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 		err     error
 	)
 
-	rawJSON, err = json.Marshal(data)
+	rawJSON, err = jsonrs.Marshal(data)
 	if err != nil {
 		panic(err)
 	}
@@ -259,7 +258,7 @@ func (u *Client) sendBatch(ctx context.Context, url string, labels types.Transfo
 	switch statusCode {
 	case http.StatusOK:
 		integrations.CollectIntgTransformErrorStats(respData)
-		err = json.Unmarshal(respData, &transformerResponses)
+		err = jsonrs.Unmarshal(respData, &transformerResponses)
 		// This is returned by our JS engine so should  be parsable
 		// Panic the processor to avoid replays
 		if err != nil {

processor/internal/transformer/user_transformer/user_transformer_test.go

@@ -2,7 +2,6 @@ package user_transformer_test
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -14,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/rudderlabs/rudder-server/jsonrs"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
@@ -41,7 +42,7 @@ type fakeTransformer struct {
 
 func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var reqBody []types.TransformerEvent
-	require.NoError(t.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(t.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	t.requests = append(t.requests, reqBody)
 
@@ -64,7 +65,7 @@ func (t *fakeTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(t.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(t.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endlessLoopTransformer struct {
@@ -84,7 +85,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	elt.retryCount++
 
 	var reqBody []types.TransformerEvent
-	require.NoError(elt.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(elt.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -106,7 +107,7 @@ func (elt *endlessLoopTransformer) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		w.Header().Set("apiVersion", strconv.Itoa(elt.apiVersion))
 	}
 
-	require.NoError(elt.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(elt.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 type endpointTransformer struct {
@@ -123,7 +124,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	}
 
 	var reqBody []types.TransformerEvent
-	require.NoError(et.t, json.NewDecoder(r.Body).Decode(&reqBody))
+	require.NoError(et.t, jsonrs.NewDecoder(r.Body).Decode(&reqBody))
 
 	responses := make([]types.TransformerResponse, len(reqBody))
 
@@ -138,7 +139,7 @@ func (et *endpointTransformer) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 	w.Header().Set("apiVersion", strconv.Itoa(reportingtypes.SupportedTransformerApiVersion))
 
-	require.NoError(et.t, json.NewEncoder(w).Encode(responses))
+	require.NoError(et.t, jsonrs.NewEncoder(w).Encode(responses))
 }
 
 func TestUserTransformer(t *testing.T) {