diff --git a/gateway/handle.go b/gateway/handle.go index 208bb42489..88dd96a72a 100644 --- a/gateway/handle.go +++ b/gateway/handle.go @@ -597,11 +597,10 @@ func (gw *Handle) getPayloadFromRequest(r *http.Request) ([]byte, error) { payload, err := io.ReadAll(r.Body) _ = r.Body.Close() if err != nil { - gw.logger.Errorf( - "Error reading request body, 'Content-Length': %s, partial payload:\n\t%s\n:%v", - r.Header.Get("Content-Length"), - string(payload), - err, + gw.logger.Errorn( + "Error reading request body", + logger.NewStringField("Content-Length", r.Header.Get("Content-Length")), + logger.NewErrorField(err), ) return payload, errors.New(response.RequestBodyReadFailed) } @@ -723,7 +722,6 @@ func (gw *Handle) internalBatchHandlerFunc() http.HandlerFunc { logger.NewStringField("path", r.URL.Path), logger.NewIntField("status", int64(status)), logger.NewStringField("body", responseBody), - logger.NewStringField("request", string(body)), ) http.Error(w, responseBody, status) } @@ -1016,7 +1014,6 @@ func (gw *Handle) storeJobs(ctx context.Context, jobs []*jobsdb.JobT) error { gw.logger.Errorn( "Store into gateway db failed with error", obskit.Error(err), - logger.NewField("jobs", jobs), ) return err } diff --git a/router/transformer/transformer.go b/router/transformer/transformer.go index 131d72ad15..ec32e34179 100644 --- a/router/transformer/transformer.go +++ b/router/transformer/transformer.go @@ -164,7 +164,7 @@ func (trans *handle) Transform(transformType string, transformMessage *types.Tra // Call remote transformation rawJSON, err := jsonrs.Marshal(&transformMessageCopy) if err != nil { - trans.logger.Errorf("problematic input for marshalling: %#v", transformMessage) + trans.logger.Errorw("problematic input for marshalling", "error", err) panic(err) } @@ -290,8 +290,6 @@ func (trans *handle) Transform(transformType string, transformMessage *types.Tra panic(fmt.Errorf("Incompatible transformer version: Expected: %d Received: %d, URL: %v", utilTypes.SupportedTransformerApiVersion, transformerAPIVersion, url)) } - trans.logger.Debugf("[Router Transfomrer] :: output payload : %s", string(respData)) - if transformType == BATCH { integrations.CollectIntgTransformErrorStats(respData) err = jsonrs.Unmarshal(respData, &destinationJobs) @@ -341,8 +339,6 @@ func (trans *handle) Transform(transformType string, transformMessage *types.Tra } if invalidResponseReason != "" { - - trans.logger.Error(invalidResponseError) stats.Default.NewTaggedStat(`router.transformer.invalid.response`, stats.CountType, stats.Tags{ "destType": transformMessage.DestType, "reason": invalidResponseReason, @@ -501,7 +497,6 @@ func (trans *handle) ProxyRequest(ctx context.Context, proxyReqParams *ProxyRequ } } **/ - trans.logger.Debugf("ProxyResponseData: %s\n", string(respData)) respData = []byte(gjson.GetBytes(respData, "output").Raw) integrations.CollectDestErrorStats(respData) @@ -615,7 +610,6 @@ type httpProxyResponse struct { func (trans *handle) doProxyRequest(ctx context.Context, proxyUrl string, proxyReqParams *ProxyRequestParams, payload []byte) httpProxyResponse { var respData []byte destName := proxyReqParams.DestName - trans.logger.Debugf(`[TransformerProxy] (Dest-%[1]v) Proxy Request payload - %[2]s`, destName, string(payload)) req, err := http.NewRequestWithContext(ctx, http.MethodPost, proxyUrl, bytes.NewReader(payload)) if err != nil { trans.logger.Errorf(`[TransformerProxy] (Dest-%[1]v) NewRequestWithContext Failed for %[1]v, with %[3]v`, destName, err.Error()) @@ -678,7 +672,7 @@ func (trans *handle) doProxyRequest(ctx context.Context, proxyUrl string, proxyR // error handling if body is missing if resp.Body == nil { errStr := "empty response body" - trans.logger.Errorf(`[TransformerProxy] (Dest-%[1]v) Failed with statusCode: %[2]v, message: %[3]v`, destName, http.StatusInternalServerError, string(respData)) + trans.logger.Errorn(`[TransformerProxy] empty response body`, logger.NewIntField("statusCode", http.StatusInternalServerError)) return httpProxyResponse{ respData: []byte{}, statusCode: http.StatusInternalServerError, @@ -691,7 +685,7 @@ func (trans *handle) doProxyRequest(ctx context.Context, proxyUrl string, proxyR // error handling while reading from resp.Body if err != nil { respData = []byte(fmt.Sprintf(`failed to read response body, Error:: %+v`, err)) - trans.logger.Errorf(`[TransformerProxy] (Dest-%[1]v) Failed with statusCode: %[2]v, message: %[3]v`, destName, http.StatusBadRequest, string(respData)) + trans.logger.Errorn(`[TransformerProxy] Failure`, logger.NewIntField("statusCode", http.StatusBadRequest), logger.NewErrorField(err)) return httpProxyResponse{ respData: []byte{}, // sending this as it is not getting sent at all statusCode: http.StatusInternalServerError, @@ -699,8 +693,6 @@ func (trans *handle) doProxyRequest(ctx context.Context, proxyUrl string, proxyR } } - trans.logger.Debugf(`[TransformerProxy] (Dest-%[1]v) Proxy Request response - %[2]s`, destName, string(respData)) - return httpProxyResponse{ respData: respData, statusCode: resp.StatusCode,