fix(httplog): fetch: updates to fetch interfaces

Signed-off-by: Christian Stewart <[email protected]>

Author: paralin

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/aperturerobotics/entitygraph v0.9.1 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.6.5 // latest
 	github.com/aperturerobotics/starpc v0.33.6 // latest
-	github.com/aperturerobotics/util v1.25.0 // master
+	github.com/aperturerobotics/util v1.25.1 // latest
 )
 
 // aperture: use compatibility forks

go.sum

@@ -28,8 +28,8 @@ github.com/aperturerobotics/quic-go v0.45.1-0.20240701204210-82dc570e7aa0 h1:KH1
 github.com/aperturerobotics/quic-go v0.45.1-0.20240701204210-82dc570e7aa0/go.mod h1:X095EBMI8M7riYQRvUgegHFkEkgM2QKLvyGHyAcOw/Q=
 github.com/aperturerobotics/starpc v0.33.6 h1:noc/MnmIMTek9bdEvd88QiD1p9KzEV8CUOBIoKmGgm0=
 github.com/aperturerobotics/starpc v0.33.6/go.mod h1:4IYcbulEzqhPT5jKaDeL1BJPFd8WVWZ7Ugu0/348/Is=
-github.com/aperturerobotics/util v1.25.0 h1:+dfi8QMsy8xzE8Xu7x3PuWSEKkrbfGZ1UHy1YffoXOw=
-github.com/aperturerobotics/util v1.25.0/go.mod h1:QiSWcOha1HhCI4f48w6rd3gia9jIMGpfoeJiZMU+jLM=
+github.com/aperturerobotics/util v1.25.1 h1:LOIygQIpwBNPwQDWcVT0MPuJxhJsPhPyO/YTJINy83A=
+github.com/aperturerobotics/util v1.25.1/go.mod h1:m/paprtgaTiGfc4X3LkXpeseK9hfQA7QBI3cKsE/h3Y=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=

http/log/fetch/fetch_js.go

@@ -3,8 +3,8 @@
 package httplog_fetch
 
 import (
+	"net/textproto"
 	"slices"
-	"strings"
 	"time"
 
 	fetch "github.com/aperturerobotics/util/js/fetch"
@@ -53,14 +53,14 @@ func Fetch(le *logrus.Entry, url string, opts *fetch.Opts, verbose bool) (*fetch
 	if le != nil {
 		mapSize := 1
 		if resp != nil {
-			mapSize += 1 + min(len(resp.Headers), len(logHeaders))
+			mapSize += 1 + min(len(resp.Header), len(logHeaders))
 		}
 		fields := make(logrus.Fields, mapSize)
 		fields["dur"] = duration.String()
 		if resp != nil {
 			fields["status"] = resp.Status
-			for hdr, hdrVal := range resp.Headers {
-				hdr = strings.ToLower(hdr)
+			for hdr, hdrVal := range resp.Header {
+				hdr = textproto.CanonicalMIMEHeaderKey(hdr)
 				if slices.Contains(logHeaders, hdr) {
 					fields[hdr] = hdrVal
 				}
@@ -69,7 +69,7 @@ func Fetch(le *logrus.Entry, url string, opts *fetch.Opts, verbose bool) (*fetch
 
 		if err != nil {
 			le.WithError(err).Warn("request errored")
-		} else if resp == nil || resp.Status >= 400 {
+		} else if resp == nil || resp.StatusCode >= 400 {
 			le.Warn("request failed")
 		} else if verbose {
 			le.Debug("request succeeded")

http/log/fetch/fetch_test.go

@@ -34,8 +34,8 @@ func TestFetch(t *testing.T) {
 			url:  "https://httpbin.org/post",
 			opts: &fetch.Opts{
 				Method: "POST",
-				Headers: map[string]string{
-					"Content-Type": "application/json",
+				Header: map[string][]string{
+					"Content-Type": []string{"application/json"},
 				},
 				Body: bytes.NewReader([]byte(`{"test": "data"}`)),
 			},
@@ -68,8 +68,8 @@ func TestFetch(t *testing.T) {
 				if resp == nil {
 					t.Fatalf("Expected non-nil response, but got nil")
 				}
-				if resp.Status != http.StatusOK {
-					t.Errorf("Expected status %d, but got %d", http.StatusOK, resp.Status)
+				if resp.StatusCode != http.StatusOK {
+					t.Errorf("Expected status %d, but got %v", http.StatusOK, resp.StatusCode)
 				}
 			}
 		})
@@ -84,7 +84,7 @@ func TestFetchWithNilLogger(t *testing.T) {
 	if resp == nil {
 		t.Fatal("Expected non-nil response, but got nil")
 	}
-	if resp.Status != http.StatusOK {
-		t.Errorf("Expected status %d, but got %d", http.StatusOK, resp.Status)
+	if resp.StatusCode != http.StatusOK {
+		t.Errorf("Expected status %d, but got %d", http.StatusOK, resp.StatusCode)
 	}
 }