enable passing custom logger

logRequests.go

@@ -1,30 +1,41 @@
 package transport
 
 import (
-	"log"
 	"net/http"
-	"time"
-
 	"moul.io/http2curl/v2"
+	"time"
+	"log"
 )
 
-func LogRequests(next http.RoundTripper) http.RoundTripper {
-	return RoundTripFunc(func(req *http.Request) (resp *http.Response, err error) {
-		r := cloneRequest(req)
-
-		curlCommand, _ := http2curl.GetCurlCommand(r)
-		log.Printf("%v", curlCommand)
-		log.Printf("request: %s %s", r.Method, r.URL)
-
-		startTime := time.Now()
-		defer func() {
-			if resp != nil {
-				log.Printf("response (HTTP %v): %v %s", time.Since(startTime), resp.Status, r.URL)
-			} else {
-				log.Printf("response (<nil>): %v %s", time.Since(startTime), r.URL)
-			}
-		}()
-
-		return next.RoundTrip(r)
-	})
+type DefaultLogger struct{}
+
+func (*DefaultLogger) Info(format string, v ...interface{}) {
+	log.Printf(format, v...)
+}
+
+func LogRequests(logger Logger) func(http.RoundTripper) http.RoundTripper {
+	if logger == nil {
+		logger = &DefaultLogger{}
+	}
+
+	return func(next http.RoundTripper) http.RoundTripper {
+		return RoundTripFunc(func(req *http.Request) (resp *http.Response, err error) {
+			r := cloneRequest(req)
+
+			curlCommand, _ := http2curl.GetCurlCommand(r)
+			logger.Info("%v", curlCommand)
+			logger.Info("request: %s %s", r.Method, r.URL)
+
+			startTime := time.Now()
+			defer func() {
+				if resp != nil {
+					logger.Info("response (HTTP %v): %v %s", time.Since(startTime), resp.Status, r.URL)
+				} else {
+					logger.Info("response (<nil>): %v %s", time.Since(startTime), r.URL)
+				}
+			}()
+
+			return next.RoundTrip(r)
+		})
+	}
 }

setHeaderFunc_test.go

@@ -9,7 +9,6 @@ import (
 	"sync"
 	"testing"
 	"time"
-
 	"github.com/go-chi/transport"
 	"golang.org/x/sync/errgroup"
 )
@@ -34,7 +33,7 @@ func TestSetHeaderFunc(t *testing.T) {
 		Transport: transport.Chain(
 			http.DefaultTransport,
 			transport.SetHeaderFunc("Authorization", issueRandomAuthToken),
-			transport.LogRequests,
+			transport.LogRequests(nil),
 		),
 		Timeout: 15 * time.Second,
 	}

setHeader_test.go

@@ -7,7 +7,6 @@ import (
 	"net/http/httptest"
 	"testing"
 	"time"
-
 	"github.com/go-chi/transport"
 )
 
@@ -45,7 +44,7 @@ func TestSetHeader(t *testing.T) {
 			transport.SetHeader("User-Agent", userAgent),
 			transport.SetHeader("Authorization", authHeader),
 			transport.SetHeader("x-extra", "value"),
-			transport.LogRequests,
+			transport.LogRequests(nil),
 		),
 		Timeout: 15 * time.Second,
 	}

transport.go

@@ -1,6 +1,12 @@
 package transport
 
-import "net/http"
+import (
+	"net/http"
+)
+
+type Logger interface {
+	Info(format string, v ...interface{})
+}
 
 // RoundTripFunc, similar to http.HandlerFunc, is an adapter
 // to allow the use of ordinary functions as http.RoundTrippers.

transport_test.go

@@ -1,11 +1,12 @@
-package transport
+package transport_test
 
 import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
+	"github.com/go-chi/transport"
 )
 
 func TestChain(t *testing.T) {
@@ -21,10 +22,10 @@ func TestChain(t *testing.T) {
 
 	client := &http.Client{
 		Timeout: 15 * time.Second,
-		Transport: Chain(
+		Transport: transport.Chain(
 			nil,
-			SetHeader("User-Agent", "transport-chain/v1.0.0"),
-			LogRequests,
+			transport.SetHeader("User-Agent", "transport-chain/v1.0.0"),
+			transport.LogRequests(nil),
 		),
 	}
 
@@ -60,10 +61,10 @@ func TestChainWithRetries(t *testing.T) {
 
 	client := &http.Client{
 		Timeout: 15 * time.Second,
-		Transport: Chain(
+		Transport: transport.Chain(
 			http.DefaultTransport,
-			Retry(http.DefaultTransport, 5),
-			LogRequests,
+			transport.Retry(http.DefaultTransport, 5),
+			transport.LogRequests(nil),
 		),
 	}
 
@@ -100,10 +101,10 @@ func TestChainWithRetryAfter(t *testing.T) {
 
 	client := &http.Client{
 		Timeout: 15 * time.Second,
-		Transport: Chain(
+		Transport: transport.Chain(
 			http.DefaultTransport,
-			Retry(http.DefaultTransport, 5),
-			LogRequests,
+			transport.Retry(http.DefaultTransport, 5),
+			transport.LogRequests(nil),
 		),
 	}