diff --git a/debug.go b/debug.go index 7a48089a..77bfcdcc 100644 --- a/debug.go +++ b/debug.go @@ -112,7 +112,7 @@ func debugLogger(c *Client, res *Response) { Status: res.Status(), Proto: res.Proto(), ReceivedAt: res.ReceivedAt(), - Duration: res.Time(), + Duration: res.Duration(), Size: res.Size(), Header: sanitizeHeaders(res.Header().Clone()), Body: res.fmtBodyString(res.Request.DebugBodyLimit), diff --git a/request_test.go b/request_test.go index 92ce7cd9..2057c01f 100644 --- a/request_test.go +++ b/request_test.go @@ -1362,7 +1362,7 @@ func TestOutputFileWithBaseDirAndRelativePath(t *testing.T) { assertError(t, err) assertEqual(t, true, resp.Size() != 0) - assertEqual(t, true, resp.Time() > 0) + assertEqual(t, true, resp.Duration() > 0) f, err1 := os.Open(filepath.Join(baseOutputDir, outputFilePath)) defer closeq(f) @@ -1391,7 +1391,7 @@ func TestOutputPathDirNotExists(t *testing.T) { assertError(t, err) assertEqual(t, true, resp.Size() != 0) - assertEqual(t, true, resp.Time() > 0) + assertEqual(t, true, resp.Duration() > 0) } func TestOutputFileAbsPath(t *testing.T) { @@ -1802,7 +1802,7 @@ func TestTraceInfo(t *testing.T) { assertEqual(t, true, tr.ResponseTime >= 0) assertEqual(t, true, tr.TotalTime >= 0) assertEqual(t, true, tr.TotalTime < time.Hour) - assertEqual(t, true, tr.TotalTime == resp.Time()) + assertEqual(t, true, tr.TotalTime == resp.Duration()) assertEqual(t, tr.RemoteAddr, serverAddr) assertNotNil(t, tr.Clone()) @@ -1824,7 +1824,7 @@ func TestTraceInfo(t *testing.T) { assertEqual(t, true, tr.ServerTime >= 0) assertEqual(t, true, tr.ResponseTime >= 0) assertEqual(t, true, tr.TotalTime >= 0) - assertEqual(t, true, tr.TotalTime == resp.Time()) + assertEqual(t, true, tr.TotalTime == resp.Duration()) assertEqual(t, tr.RemoteAddr, serverAddr) } @@ -1912,7 +1912,7 @@ func TestTraceInfoOnTimeout(t *testing.T) { assertEqual(t, true, tr.ServerTime == 0) assertEqual(t, true, tr.ResponseTime == 0) assertEqual(t, true, tr.TotalTime > 0) - assertEqual(t, true, tr.TotalTime == resp.Time()) + assertEqual(t, true, tr.TotalTime == resp.Duration()) } func TestDebugLoggerRequestBodyTooLarge(t *testing.T) { diff --git a/response.go b/response.go index be7994a1..6b619e05 100644 --- a/response.go +++ b/response.go @@ -117,12 +117,12 @@ func (r *Response) Bytes() []byte { return r.bodyBytes } -// Time method returns the duration of HTTP response time from the request we sent +// Duration method returns the duration of HTTP response time from the request we sent // and received a request. // // See [Response.ReceivedAt] to know when the client received a response and see // `Response.Request.Time` to know when the client sent a request. -func (r *Response) Time() time.Duration { +func (r *Response) Duration() time.Duration { if r.Request.trace != nil { return r.Request.TraceInfo().TotalTime } diff --git a/resty_test.go b/resty_test.go index c17e0230..4a5b63ae 100644 --- a/resty_test.go +++ b/resty_test.go @@ -1010,7 +1010,7 @@ func isNil(v any) bool { func logResponse(t *testing.T, resp *Response) { t.Helper() t.Logf("Response Status: %v", resp.Status()) - t.Logf("Response Time: %v", resp.Time()) + t.Logf("Response Duration: %v", resp.Duration()) t.Logf("Response Headers: %v", resp.Header()) t.Logf("Response Cookies: %v", resp.Cookies()) t.Logf("Response Body: %v", resp) diff --git a/trace.go b/trace.go index 94ee9319..26db2871 100644 --- a/trace.go +++ b/trace.go @@ -81,10 +81,7 @@ func (ti TraceInfo) String() string { // JSON method returns the JSON string of request trace information func (ti TraceInfo) JSON() string { - buf := acquireBuffer() - defer releaseBuffer(buf) - _ = encodeJSON(buf, ti) - return buf.String() + return toJSON(ti) } // Clone method returns the clone copy of [TraceInfo]