chore: use new httplog module

Author: kangasta

go.mod

@@ -1,8 +1,9 @@
 module github.com/UpCloudLtd/upcloud-go-api/v8
 
-go 1.24.13
+go 1.25
 
 require (
+	github.com/UpCloudLtd/httplog v0.0.0-20260624214043-23b0cab8e085
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dnaeon/go-vcr v1.2.0
 	github.com/stretchr/testify v1.11.1

go.sum

@@ -1,3 +1,5 @@
+github.com/UpCloudLtd/httplog v0.0.0-20260624214043-23b0cab8e085 h1:WKK9DZI0ZQikQjhHk+/X2HWKxFrENOvseaDysZE8nPs=
+github.com/UpCloudLtd/httplog v0.0.0-20260624214043-23b0cab8e085/go.mod h1:79ZjkJrYkl540hQ5Fy7XkRfR7109HGMTzHdVEkynTqw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

upcloud/client/client.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/client/logging"
+	"github.com/UpCloudLtd/httplog"
 )
 
 const (
@@ -35,7 +35,7 @@ type config struct {
 	token      string
 	baseURL    string
 	httpClient *http.Client
-	logger     *logging.Logger
+	logger     *httplog.Logger
 }
 
 // Client represents an API client
@@ -309,9 +309,9 @@ func WithTimeout(timeout time.Duration) ConfigFn {
 }
 
 // WithLogger configures logging function that logs requests and responses
-func WithLogger(logger logging.LogFn) ConfigFn {
+func WithLogger(logger httplog.LogFn) ConfigFn {
 	return func(c *config) {
-		c.logger = logging.NewLogger(logger)
+		c.logger = httplog.NewLogger(logger)
 	}
 }
 

upcloud/client/client_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/client/logging"
+	"github.com/UpCloudLtd/httplog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -220,7 +220,7 @@ func TestClientGetContextDeadline(t *testing.T) {
 	require.True(t, errors.Is(err, context.DeadlineExceeded))
 }
 
-func getTestLogFn(w io.Writer) logging.LogFn {
+func getTestLogFn(w io.Writer) httplog.LogFn {
 	return slog.New(slog.NewJSONHandler(w, &slog.HandlerOptions{
 		Level: slog.LevelDebug,
 		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
@@ -263,8 +263,8 @@ func TestClientRequestLogging(t *testing.T) {
 			configFns: func(w io.Writer) []ConfigFn {
 				return []ConfigFn{
 					WithHTTPClient(&http.Client{
-						Transport: &logging.LoggingTransport{
-							Logger: logging.NewLogger(getTestLogFn(w)),
+						Transport: &httplog.LoggingTransport{
+							Logger: httplog.NewLogger(getTestLogFn(w)),
 						},
 					}),
 				}
@@ -283,10 +283,10 @@ func TestClientRequestLogging(t *testing.T) {
 			_, err = c.Post(context.TODO(), "/test", []byte(`{"name": "test"}`))
 			require.NoError(t, err)
 
-			expected := fmt.Sprintf(`{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Sending request to UpCloud API","url":"http://server/1.3/test","method":"GET","headers":{"Accept":["application/json"],"Authorization":["Basic [REDACTED]"],"Content-Type":["application/json"],"User-Agent":["upcloud-go-api/%s"]},"body":""}
-{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Received response from UpCloud API","url":"http://server/1.3/test","status":"200 OK","headers":{"Content-Length":["38"],"Content-Type":["text/plain; charset=utf-8"],"Date":["Fri, 11 Oct 2024 23:58:00 GMT"]},"body":"{\n  \"method\": \"GET\",\n  \"path\": \"/1.3/test\"\n}"}
-{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Sending request to UpCloud API","url":"http://server/1.3/test","method":"POST","headers":{"Accept":["application/json"],"Authorization":["Basic [REDACTED]"],"Content-Type":["application/json"],"User-Agent":["upcloud-go-api/8.38.0"]},"body":"{\n  \"name\": \"test\"\n}"}
-{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Received response from UpCloud API","url":"http://server/1.3/test","status":"200 OK","headers":{"Content-Length":["39"],"Content-Type":["text/plain; charset=utf-8"],"Date":["Fri, 11 Oct 2024 23:58:00 GMT"]},"body":"{\n  \"method\": \"POST\",\n  \"path\": \"/1.3/test\"\n}"}
+			expected := fmt.Sprintf(`{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Sending request to 127.0.0.1","url":"http://server/1.3/test","method":"GET","headers":{"Accept":["application/json"],"Authorization":["Basic [REDACTED]"],"Content-Type":["application/json"],"User-Agent":["upcloud-go-api/%s"]},"body":""}
+{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Received response from 127.0.0.1","url":"http://server/1.3/test","status":"200 OK","headers":{"Content-Length":["38"],"Content-Type":["text/plain; charset=utf-8"],"Date":["Fri, 11 Oct 2024 23:58:00 GMT"]},"body":"{\n  \"method\": \"GET\",\n  \"path\": \"/1.3/test\"\n}"}
+{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Sending request to 127.0.0.1","url":"http://server/1.3/test","method":"POST","headers":{"Accept":["application/json"],"Authorization":["Basic [REDACTED]"],"Content-Type":["application/json"],"User-Agent":["upcloud-go-api/8.38.0"]},"body":"{\n  \"name\": \"test\"\n}"}
+{"time":"2 Minutes to Midnight","level":"DEBUG","msg":"Received response from 127.0.0.1","url":"http://server/1.3/test","status":"200 OK","headers":{"Content-Length":["39"],"Content-Type":["text/plain; charset=utf-8"],"Date":["Fri, 11 Oct 2024 23:58:00 GMT"]},"body":"{\n  \"method\": \"POST\",\n  \"path\": \"/1.3/test\"\n}"}
 `, Version)
 			assert.Equal(t, expected, output.String())
 		})