Skip to content

Commit 27b9a85

Browse files
authoredJan 31, 2025··
chore(refactor): align method on response and use json method (#967)
1 parent 5aa6eda commit 27b9a85

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed
 

‎debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func debugLogger(c *Client, res *Response) {
112112
Status: res.Status(),
113113
Proto: res.Proto(),
114114
ReceivedAt: res.ReceivedAt(),
115-
Duration: res.Time(),
115+
Duration: res.Duration(),
116116
Size: res.Size(),
117117
Header: sanitizeHeaders(res.Header().Clone()),
118118
Body: res.fmtBodyString(res.Request.DebugBodyLimit),

‎request_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ func TestOutputFileWithBaseDirAndRelativePath(t *testing.T) {
13621362

13631363
assertError(t, err)
13641364
assertEqual(t, true, resp.Size() != 0)
1365-
assertEqual(t, true, resp.Time() > 0)
1365+
assertEqual(t, true, resp.Duration() > 0)
13661366

13671367
f, err1 := os.Open(filepath.Join(baseOutputDir, outputFilePath))
13681368
defer closeq(f)
@@ -1391,7 +1391,7 @@ func TestOutputPathDirNotExists(t *testing.T) {
13911391

13921392
assertError(t, err)
13931393
assertEqual(t, true, resp.Size() != 0)
1394-
assertEqual(t, true, resp.Time() > 0)
1394+
assertEqual(t, true, resp.Duration() > 0)
13951395
}
13961396

13971397
func TestOutputFileAbsPath(t *testing.T) {
@@ -1802,7 +1802,7 @@ func TestTraceInfo(t *testing.T) {
18021802
assertEqual(t, true, tr.ResponseTime >= 0)
18031803
assertEqual(t, true, tr.TotalTime >= 0)
18041804
assertEqual(t, true, tr.TotalTime < time.Hour)
1805-
assertEqual(t, true, tr.TotalTime == resp.Time())
1805+
assertEqual(t, true, tr.TotalTime == resp.Duration())
18061806
assertEqual(t, tr.RemoteAddr, serverAddr)
18071807

18081808
assertNotNil(t, tr.Clone())
@@ -1824,7 +1824,7 @@ func TestTraceInfo(t *testing.T) {
18241824
assertEqual(t, true, tr.ServerTime >= 0)
18251825
assertEqual(t, true, tr.ResponseTime >= 0)
18261826
assertEqual(t, true, tr.TotalTime >= 0)
1827-
assertEqual(t, true, tr.TotalTime == resp.Time())
1827+
assertEqual(t, true, tr.TotalTime == resp.Duration())
18281828
assertEqual(t, tr.RemoteAddr, serverAddr)
18291829
}
18301830

@@ -1912,7 +1912,7 @@ func TestTraceInfoOnTimeout(t *testing.T) {
19121912
assertEqual(t, true, tr.ServerTime == 0)
19131913
assertEqual(t, true, tr.ResponseTime == 0)
19141914
assertEqual(t, true, tr.TotalTime > 0)
1915-
assertEqual(t, true, tr.TotalTime == resp.Time())
1915+
assertEqual(t, true, tr.TotalTime == resp.Duration())
19161916
}
19171917

19181918
func TestDebugLoggerRequestBodyTooLarge(t *testing.T) {

‎response.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ func (r *Response) Bytes() []byte {
117117
return r.bodyBytes
118118
}
119119

120-
// Time method returns the duration of HTTP response time from the request we sent
120+
// Duration method returns the duration of HTTP response time from the request we sent
121121
// and received a request.
122122
//
123123
// See [Response.ReceivedAt] to know when the client received a response and see
124124
// `Response.Request.Time` to know when the client sent a request.
125-
func (r *Response) Time() time.Duration {
125+
func (r *Response) Duration() time.Duration {
126126
if r.Request.trace != nil {
127127
return r.Request.TraceInfo().TotalTime
128128
}

‎resty_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ func isNil(v any) bool {
10101010
func logResponse(t *testing.T, resp *Response) {
10111011
t.Helper()
10121012
t.Logf("Response Status: %v", resp.Status())
1013-
t.Logf("Response Time: %v", resp.Time())
1013+
t.Logf("Response Duration: %v", resp.Duration())
10141014
t.Logf("Response Headers: %v", resp.Header())
10151015
t.Logf("Response Cookies: %v", resp.Cookies())
10161016
t.Logf("Response Body: %v", resp)

‎trace.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ func (ti TraceInfo) String() string {
8181

8282
// JSON method returns the JSON string of request trace information
8383
func (ti TraceInfo) JSON() string {
84-
buf := acquireBuffer()
85-
defer releaseBuffer(buf)
86-
_ = encodeJSON(buf, ti)
87-
return buf.String()
84+
return toJSON(ti)
8885
}
8986

9087
// Clone method returns the clone copy of [TraceInfo]

0 commit comments

Comments
 (0)
Please sign in to comment.