chore(deps): github.com/clambin/go-common/http renamed to github.com/…

…clambin/go-common/httputils

go.mod

@@ -5,24 +5,23 @@ go 1.23
 require (
 	github.com/clambin/breaker v0.4.0
 	github.com/clambin/go-common/charmer v0.2.0
-	github.com/clambin/go-common/http v0.6.0
+	github.com/clambin/go-common/httputils v0.1.0
 	github.com/clambin/go-common/set v0.4.3
-	github.com/clambin/go-common/testutils v0.2.0
+	github.com/clambin/go-common/testutils v0.3.0
 	github.com/clambin/mediaclients v0.7.0
 	github.com/hekmon/transmissionrpc/v3 v3.0.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.9.0
-	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
-	golang.org/x/sync v0.9.0
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/sync v0.10.0
 )
 
 require (
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/clambin/go-common/cache v0.7.0 // indirect
+	github.com/clambin/go-common/cache v0.7.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/google/uuid v1.5.0 // indirect
@@ -51,6 +50,7 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect

go.sum

@@ -8,16 +8,16 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/clambin/breaker v0.4.0 h1:5F4GH2gr00JYMRm6TAnllB7raikg2dWnADbpDB82v6I=
 github.com/clambin/breaker v0.4.0/go.mod h1:dyjZu07yIVgEhCoMBnCS6N00gvcE3H10b7Fx/CMojJk=
-github.com/clambin/go-common/cache v0.7.0 h1:UFBZkDzdLI/QGOg5S+8DzDTtN0dguU+epo21JxDFFkA=
-github.com/clambin/go-common/cache v0.7.0/go.mod h1:HqYoCaIq9ckS3xiAQ5y8n3m4GmKSCku2+p/Cli614Sk=
+github.com/clambin/go-common/cache v0.7.1 h1:mCZN+cSt70YvF92LM9VfxQQEiOqFrTglMFoZqSLeOVQ=
+github.com/clambin/go-common/cache v0.7.1/go.mod h1:HqYoCaIq9ckS3xiAQ5y8n3m4GmKSCku2+p/Cli614Sk=
 github.com/clambin/go-common/charmer v0.2.0 h1:RLqdH1pRVQUBSKRPpKgDVlad6St3FyFDOikzbc//6Nk=
 github.com/clambin/go-common/charmer v0.2.0/go.mod h1:8Y/XKmTspOZ9xc0fgV8mvYS0mkXBuAidO3MCJLCMfrg=
-github.com/clambin/go-common/http v0.6.0 h1:3t0PgQ8s+icCxCmWcivzqHjooVV+U9gNyX5/8NJLjsc=
-github.com/clambin/go-common/http v0.6.0/go.mod h1:hjkBNKFB2ctnqXj+jaHb1pGogE75k0SC7/CrbSgjpXw=
+github.com/clambin/go-common/httputils v0.1.0 h1:Hi6GqLzEWgDlYX3l6/ZKnQDgVxgGSC5k6lPnXhD+jqg=
+github.com/clambin/go-common/httputils v0.1.0/go.mod h1:VwWEW9c1yjaXLTHJksstFFi8DLC+wTV2GGIr1d3cEbY=
 github.com/clambin/go-common/set v0.4.3 h1:Sm9lkAJsh82j40RDpfQIziHyHjwr07+KsQF6vgCVXm4=
 github.com/clambin/go-common/set v0.4.3/go.mod h1:Q5GpBoM7B7abNV2Wzys+wQMInBHMoHyh/h0Cn2OmY4A=
-github.com/clambin/go-common/testutils v0.2.0 h1:0gVsKwyHQ9Tfmtt4sVf7lnhgNs3dttIvMTH3XuV6u0w=
-github.com/clambin/go-common/testutils v0.2.0/go.mod h1:bV0j8D4zhNkleCeluFKLBeLQ0L/dqkxbaR/joLn8kzg=
+github.com/clambin/go-common/testutils v0.3.0 h1:zWd00A6c1oIGRp1/OGS3jQQ56eJNtvvcLoXg6tI46YY=
+github.com/clambin/go-common/testutils v0.3.0/go.mod h1:bV0j8D4zhNkleCeluFKLBeLQ0L/dqkxbaR/joLn8kzg=
 github.com/clambin/mediaclients v0.7.0 h1:ugss4InA5fTNRIwZRWQWrR0PCvM0vDYoml1mYNbYjac=
 github.com/clambin/mediaclients v0.7.0/go.mod h1:cjXgC4IzN1aJWeteXgrflv2G/8QhiuAn9dl79+uTChk=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -102,8 +102,9 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
@@ -112,8 +113,8 @@ go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=

internal/collectors/connectivity/connectivity.go

@@ -1,8 +1,8 @@
 package connectivity
 
 import (
-	"github.com/clambin/go-common/http/metrics"
-	"github.com/clambin/go-common/http/roundtripper"
+	"github.com/clambin/go-common/httputils/metrics"
+	"github.com/clambin/go-common/httputils/roundtripper"
 	"github.com/clambin/mediamon/v2/iplocator"
 	"github.com/prometheus/client_golang/prometheus"
 	"log/slog"

internal/collectors/plex/plex.go

@@ -1,8 +1,8 @@
 package plex
 
 import (
-	"github.com/clambin/go-common/http/metrics"
-	"github.com/clambin/go-common/http/roundtripper"
+	"github.com/clambin/go-common/httputils/metrics"
+	"github.com/clambin/go-common/httputils/roundtripper"
 	"github.com/clambin/mediaclients/plex"
 	collectorbreaker "github.com/clambin/mediamon/v2/collector-breaker"
 	"github.com/clambin/mediamon/v2/iplocator"

internal/collectors/prowlarr/prowlarr.go

@@ -3,8 +3,8 @@ package prowlarr
 import (
 	"context"
 	"fmt"
-	"github.com/clambin/go-common/http/metrics"
-	"github.com/clambin/go-common/http/roundtripper"
+	"github.com/clambin/go-common/httputils/metrics"
+	"github.com/clambin/go-common/httputils/roundtripper"
 	"github.com/clambin/mediaclients/prowlarr"
 	collectorbreaker "github.com/clambin/mediamon/v2/collector-breaker"
 	"github.com/clambin/mediamon/v2/internal/collectors/xxxarr/clients"

internal/collectors/transmission/transmission.go

@@ -3,8 +3,8 @@ package transmission
 import (
 	"context"
 	"fmt"
-	"github.com/clambin/go-common/http/metrics"
-	"github.com/clambin/go-common/http/roundtripper"
+	"github.com/clambin/go-common/httputils/metrics"
+	"github.com/clambin/go-common/httputils/roundtripper"
 	collectorBreaker "github.com/clambin/mediamon/v2/collector-breaker"
 	"github.com/hekmon/transmissionrpc/v3"
 	"github.com/prometheus/client_golang/prometheus"

internal/collectors/xxxarr/clients/sonarr_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/clambin/mediamon/v2/internal/collectors/xxxarr/clients/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"golang.org/x/exp/maps"
+	"maps"
 	"net/http"
 	"slices"
 	"testing"
@@ -83,7 +83,7 @@ func TestSonarrGetCalendar(t *testing.T) {
 			Series:        &sonarr.SeriesResource{Title: constP("series 2")},
 		},
 	}
-	allEpisodes := maps.Values(episodes)
+	allEpisodes := slices.Collect(maps.Values(episodes))
 	s.EXPECT().
 		GetApiV3CalendarWithResponse(ctx, mock.AnythingOfType("*sonarr.GetApiV3CalendarParams")).
 		Return(&sonarr.GetApiV3CalendarResponse{JSON200: &allEpisodes}, nil).

internal/collectors/xxxarr/xxxarr.go

@@ -3,8 +3,8 @@ package xxxarr
 import (
 	"context"
 	"fmt"
-	"github.com/clambin/go-common/http/metrics"
-	"github.com/clambin/go-common/http/roundtripper"
+	"github.com/clambin/go-common/httputils/metrics"
+	"github.com/clambin/go-common/httputils/roundtripper"
 	collectorbreaker "github.com/clambin/mediamon/v2/collector-breaker"
 	"github.com/clambin/mediamon/v2/internal/collectors/xxxarr/clients"
 	"github.com/prometheus/client_golang/prometheus"