Merge pull request #76 from anuraaga/direct-rtt

ftwhttp/client.go

@@ -61,7 +61,6 @@ func (c *Client) NewConnection(d Destination) error {
 			connection:  netConn,
 			protocol:    d.Protocol,
 			readTimeout: c.config.ReadTimeout,
-			duration:    NewRoundTripTime(),
 		}
 	}
 
@@ -86,18 +85,3 @@ func (c *Client) Do(req Request) (*Response, error) {
 
 	return response, err
 }
-
-// GetRoundTripTime returns the time taken from the initial send till receiving the full response
-func (c *Client) GetRoundTripTime() *RoundTripTime {
-	return c.Transport.GetTrackedTime()
-}
-
-// StartTrackingTime sets the timer to start transactions. This will be the starting time in logs.
-func (c *Client) StartTrackingTime() {
-	c.Transport.StartTrackingTime()
-}
-
-// StopTrackingTime stops the timer. When looking at logs, we will read up to this one.
-func (c *Client) StopTrackingTime() {
-	c.Transport.StopTrackingTime()
-}

ftwhttp/client_test.go

@@ -79,25 +79,15 @@ func TestGetTrackedTime(t *testing.T) {
 		t.Logf("This should not error")
 	}
 
-	c.StartTrackingTime()
-
 	resp, err := c.Do(*req)
 
-	c.StopTrackingTime()
-
 	if err != nil {
 		t.Logf("This should not error")
 	}
 
 	if resp.Parsed.StatusCode != 200 {
 		t.Logf("Error in calling website")
 	}
-
-	rtt := c.GetRoundTripTime()
-
-	if rtt.RoundTripDuration() < 0 {
-		t.Logf("Error getting RTT")
-	}
 }
 
 func TestClientMultipartFormDataRequest(t *testing.T) {
@@ -135,12 +125,8 @@ Some-file-test-here
 		t.Logf("This should not error")
 	}
 
-	c.StartTrackingTime()
-
 	resp, err := c.Do(*req)
 
-	c.StopTrackingTime()
-
 	if err != nil {
 		t.Logf("This should not error")
 	}

ftwhttp/connection.go

@@ -33,21 +33,6 @@ func DestinationFromString(urlString string) (*Destination, error) {
 	return d, nil
 }
 
-// StartTrackingTime initializes timer
-func (c *Connection) StartTrackingTime() {
-	c.duration.StartTracking()
-}
-
-// StopTrackingTime stops timer
-func (c *Connection) StopTrackingTime() {
-	c.duration.StopTracking()
-}
-
-// GetTrackedTime will return the time since the request started and the response was parsed
-func (c *Connection) GetTrackedTime() *RoundTripTime {
-	return c.duration
-}
-
 func (c *Connection) send(data []byte) (int, error) {
 	var err error
 	var sent int

ftwhttp/types.go

@@ -26,7 +26,6 @@ type Connection struct {
 	connection  net.Conn
 	protocol    string
 	readTimeout time.Duration
-	duration    *RoundTripTime
 }
 
 // RoundTripTime abstracts the time a transaction takes

runner/run.go

@@ -135,11 +135,11 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 	if err != nil && !expectedOutput.ExpectError {
 		log.Fatal().Caller().Err(err).Msgf("can't connect to destination %+v", dest)
 	}
-	runContext.Client.StartTrackingTime()
 
+	reqStartTime := time.Now()
 	response, responseErr := runContext.Client.Do(*req)
+	roundTripTime := time.Since(reqStartTime)
 
-	runContext.Client.StopTrackingTime()
 	if responseErr != nil && !expectedOutput.ExpectError {
 		log.Fatal().Caller().Err(responseErr).Msgf("failed sending request to destination %+v", dest)
 	}
@@ -159,7 +159,6 @@ func RunStage(runContext *TestRunContext, ftwCheck *check.FTWCheck, testCase tes
 	// now get the test result based on output
 	testResult := checkResult(ftwCheck, response, responseErr)
 
-	roundTripTime := runContext.Client.GetRoundTripTime().RoundTripDuration()
 	stageTime := time.Since(stageStartTime)
 
 	addResultToStats(testResult, testCase.TestTitle, &runContext.Stats)