Merge pull request #157 from miclle/ut

Adjust client debug request/response print

Author: miclle

.gitignore

@@ -33,3 +33,6 @@ coverage.txt
 
 # Go workspace file
 go.work
+
+# Log files
+*.log

Makefile

@@ -1,5 +1,5 @@
 test:
-	go test -tags='unit integration' -failfast -count=1 -v -timeout 350m -coverprofile=coverage.txt `go list ./... | egrep -v 'examples|sms'`
+	go test -tags='unit integration' -failfast -count=1 -v -timeout 350m -coverprofile=coverage.txt `go list ./... | egrep -v 'examples|sms'` | tee -a test.log
 
 unittest:
 	go test -tags=unit -failfast -count=1 -v -coverprofile=coverage.txt `go list ./... | egrep -v 'examples|sms'`

client/client.go

@@ -93,7 +93,16 @@ func newRequest(ctx context.Context, method, reqUrl string, headers http.Header,
 			},
 		}
 		req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace))
-		bs, bErr := httputil.DumpRequest(req, DeepDebugInfo)
+
+		var (
+			hasBody     = DeepDebugInfo
+			contentType = req.Header.Get("Content-Type")
+		)
+		if contentType != conf.CONTENT_TYPE_JSON && contentType != conf.CONTENT_TYPE_FORM {
+			hasBody = false
+		}
+
+		bs, bErr := httputil.DumpRequest(req, hasBody)
 		if bErr != nil {
 			err = bErr
 			return
@@ -293,7 +302,16 @@ func CallRet(ctx context.Context, ret interface{}, resp *http.Response) (err err
 	}()
 
 	if DebugMode {
-		bs, dErr := httputil.DumpResponse(resp, DeepDebugInfo)
+
+		var hasBody = DeepDebugInfo
+		switch {
+		case
+			resp.Header.Get("Content-Type") == "application/octet-stream",
+			resp.ContentLength <= 0 || resp.ContentLength > 1024*1024:
+			hasBody = false
+		}
+
+		bs, dErr := httputil.DumpResponse(resp, hasBody)
 		if dErr != nil {
 			err = dErr
 			return

internal/clientv2/interceptor_debug.go

@@ -8,6 +8,7 @@ import (
 	"net/http/httputil"
 
 	clientV1 "github.com/qiniu/go-sdk/v7/client"
+	"github.com/qiniu/go-sdk/v7/conf"
 	"github.com/qiniu/go-sdk/v7/internal/log"
 )
 
@@ -120,7 +121,16 @@ func (interceptor *debugInterceptor) printRequest(label string, req *http.Reques
 	}
 
 	info := label + " request:\n"
-	d, dErr := httputil.DumpRequest(req, IsPrintRequestBody())
+
+	var (
+		hasBody     = IsPrintRequestBody()
+		contentType = req.Header.Get("Content-Type")
+	)
+	if contentType != conf.CONTENT_TYPE_JSON && contentType != conf.CONTENT_TYPE_FORM {
+		hasBody = false
+	}
+
+	d, dErr := httputil.DumpRequest(req, hasBody)
 	if dErr != nil {
 		return dErr
 	}
@@ -199,7 +209,16 @@ func (interceptor *debugInterceptor) printResponse(label string, resp *http.Resp
 	}
 
 	info := label + " response:\n"
-	d, dErr := httputil.DumpResponse(resp, IsPrintResponseBody())
+
+	var hasBody = IsPrintResponseBody()
+	switch {
+	case
+		resp.Header.Get("Content-Type") == "application/octet-stream",
+		resp.ContentLength <= 0 || resp.ContentLength > 1024*1024:
+		hasBody = false
+	}
+
+	d, dErr := httputil.DumpResponse(resp, hasBody)
 	if dErr != nil {
 		return dErr
 	}