diff --git a/go.mod b/go.mod index dd201852f..3ad3dc095 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/prometheus/client_golang v1.16.0 github.com/rs/cors v1.10.0 github.com/sapcc/go-api-declarations v1.8.3 - github.com/sapcc/go-bits v0.0.0-20230907033445-81ca24d024ba + github.com/sapcc/go-bits v0.0.0-20230912142452-3a5bef45cdb0 go.uber.org/automaxprocs v1.5.3 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index bf8af7d20..f02f584c8 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8= github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/sapcc/go-api-declarations v1.8.3 h1:aGBTX3vjk/QX0ptPyz7DqGY97clhYXkpURZf+z9okV4= github.com/sapcc/go-api-declarations v1.8.3/go.mod h1:83R3hTANhuRXt/pXDby37IJetw8l7DG41s33Tp9NXxI= -github.com/sapcc/go-bits v0.0.0-20230907033445-81ca24d024ba h1:qxyEicfYNuYMdyFgTqT2jkU6wbPJo+Ag/w8AhetepJ4= -github.com/sapcc/go-bits v0.0.0-20230907033445-81ca24d024ba/go.mod h1:GT41Se6TIKuC72WifVXoRGW5SLTgGUQXVEdFm+d9AU8= +github.com/sapcc/go-bits v0.0.0-20230912142452-3a5bef45cdb0 h1:LvhS1Df7IuVOZGv0xSlrJ0zFiYSh2OFtxCaetw+wcXI= +github.com/sapcc/go-bits v0.0.0-20230912142452-3a5bef45cdb0/go.mod h1:GT41Se6TIKuC72WifVXoRGW5SLTgGUQXVEdFm+d9AU8= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= diff --git a/vendor/github.com/sapcc/go-bits/jobloop/producer_consumer.go b/vendor/github.com/sapcc/go-bits/jobloop/producer_consumer.go index 955fd0a71..021db48a6 100644 --- a/vendor/github.com/sapcc/go-bits/jobloop/producer_consumer.go +++ b/vendor/github.com/sapcc/go-bits/jobloop/producer_consumer.go @@ -109,9 +109,11 @@ type producerConsumerJobImpl[T any] struct { func (j *ProducerConsumerJob[T]) produceOne(ctx context.Context, cfg jobConfig, annotateErrors bool) (T, prometheus.Labels, error) { labels := j.Metadata.makeLabels(cfg) task, err := j.DiscoverTask(ctx, labels) - if err != nil && !errors.Is(err, sql.ErrNoRows) && annotateErrors { - err = fmt.Errorf("could not select task%s for job %q: %w", - cfg.PrefilledLabelsAsString(), j.Metadata.ReadableName, err) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + if annotateErrors { + err = fmt.Errorf("could not select task%s for job %q: %w", + cfg.PrefilledLabelsAsString(), j.Metadata.ReadableName, err) + } j.Metadata.countTask(labels, err) } return task, labels, err diff --git a/vendor/modules.txt b/vendor/modules.txt index f3c2116e6..814cb78cb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -152,7 +152,7 @@ github.com/sapcc/go-api-declarations/internal/marshal github.com/sapcc/go-api-declarations/limes github.com/sapcc/go-api-declarations/limes/rates github.com/sapcc/go-api-declarations/limes/resources -# github.com/sapcc/go-bits v0.0.0-20230907033445-81ca24d024ba +# github.com/sapcc/go-bits v0.0.0-20230912142452-3a5bef45cdb0 ## explicit; go 1.21 github.com/sapcc/go-bits/assert github.com/sapcc/go-bits/audittools