adjust client request debug 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

@@ -94,11 +94,14 @@ func newRequest(ctx context.Context, method, reqUrl string, headers http.Header,
 		}
 		req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace))
 
-		var hasBody = DeepDebugInfo
+		var (
+			hasBody     = DeepDebugInfo
+			contentType = req.Header.Get("Content-Type")
+		)
 		switch {
 		case
-			req.Method == "POST" && req.Header.Get("Content-Type") != "application/json",
-			req.Header.Get("Content-Type") == "application/octet-stream":
+			contentType == "" || contentType == "application/octet-stream",
+			(req.Method == "POST" || req.Method == "PUT" || req.Method == "PATCH") && contentType != "application/json":
 			hasBody = false
 		}
 

internal/clientv2/interceptor_debug.go

@@ -121,11 +121,14 @@ func (interceptor *debugInterceptor) printRequest(label string, req *http.Reques
 
 	info := label + " request:\n"
 
-	var hasBody = IsPrintRequestBody()
+	var (
+		hasBody     = IsPrintRequestBody()
+		contentType = req.Header.Get("Content-Type")
+	)
 	switch {
 	case
-		req.Method == "POST" && req.Header.Get("Content-Type") != "application/json",
-		req.Header.Get("Content-Type") == "application/octet-stream":
+		contentType == "" || contentType == "application/octet-stream",
+		(req.Method == "POST" || req.Method == "PUT" || req.Method == "PATCH") && contentType != "application/json":
 		hasBody = false
 	}