fixup! chore: close http responses in a way to allow the Transport to…

… re-use the TCP connection
rudderlabs · Nov 23, 2022 · f116d49 · f116d49
1 parent 70b8b9b
commit f116d49
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 36 deletions.
diff --git a/cmd/devtool/commands/event.go b/cmd/devtool/commands/event.go
@@ -65,41 +65,43 @@ func EventSend(c *cli.Context) error {
 	}
 
 	for i := 0; i < c.Int("count"); i++ {
-		anonymousId := uuid.New().String()
-
-		buf := bytes.NewBuffer(nil)
-		err = t.Execute(buf, map[string]string{
-			"AnonymousId": anonymousId,
-			"Timestamp":   time.Now().Format(time.RFC3339),
-		})
-		if err != nil {
-			return err
-		}
-
-		req, err := http.NewRequestWithContext(c.Context, "POST", url, buf)
-		if err != nil {
+		if err := func() error {
+			anonymousId := uuid.New().String()
+			buf := bytes.NewBuffer(nil)
+			err = t.Execute(buf, map[string]string{
+				"AnonymousId": anonymousId,
+				"Timestamp":   time.Now().Format(time.RFC3339),
+			})
+			if err != nil {
+				return err
+			}
+
+			req, err := http.NewRequestWithContext(c.Context, "POST", url, buf)
+			if err != nil {
+				return err
+			}
+
+			req.SetBasicAuth(c.String("write-key"), "")
+			req.Header.Set("Content-Type", "application/json")
+			req.Header.Set("AnonymousId", anonymousId)
+
+			resp, err := client.Do(req)
+			if err != nil {
+				return err
+			}
+			defer func() { httputil.CloseResponse(resp) }()
+			b, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return err
+			}
+			if resp.StatusCode != http.StatusOK {
+				fmt.Printf("%s\n%s\n", resp.Status, b)
+				return fmt.Errorf("status code: %d", resp.StatusCode)
+			}
+			return nil
+		}(); err != nil {
 			return err
 		}
-
-		req.SetBasicAuth(c.String("write-key"), "")
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("AnonymousId", anonymousId)
-
-		resp, err := client.Do(req)
-		if err != nil {
-			return err
-		}
-		defer func() { httputil.CloseResponse(resp) }()
-		b, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return err
-		}
-
-		if resp.StatusCode != http.StatusOK {
-			fmt.Printf("%s\n%s\n", resp.Status, b)
-
-			return fmt.Errorf("status code: %d", resp.StatusCode)
-		}
 	}
 
 	return nil

diff --git a/testhelper/health/checker.go b/testhelper/health/checker.go
@@ -28,7 +28,7 @@ func WaitUntilReady(
 			if err != nil {
 				continue
 			}
-			defer func() { httputil.CloseResponse(resp) }()
+			func() { httputil.CloseResponse(resp) }()
 			if resp.StatusCode == http.StatusOK {
 				t.Log("Application ready")
 				return

diff --git a/warehouse/utils/utils.go b/warehouse/utils/utils.go
@@ -1026,7 +1026,7 @@ func GetRequestWithTimeout(ctx context.Context, url string, timeout time.Duratio
 	var respBody []byte
 	if resp != nil && resp.Body != nil {
 		respBody, _ = io.ReadAll(resp.Body)
-		defer func() { httputil.CloseResponse(resp) }()
+		func() { httputil.CloseResponse(resp) }()
 	}
 
 	return respBody, nil
@@ -1050,7 +1050,7 @@ func PostRequestWithTimeout(ctx context.Context, url string, payload []byte, tim
 	var respBody []byte
 	if resp != nil && resp.Body != nil {
 		respBody, _ = io.ReadAll(resp.Body)
-		defer func() { httputil.CloseResponse(resp) }()
+		func() { httputil.CloseResponse(resp) }()
 	}
 
 	return respBody, nil