diff --git a/go.mod b/go.mod index bc5a71e7..3f0a7ce2 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/jackc/pgx/v5 v5.10.0 github.com/johannesboyne/gofakes3 v1.2.0 github.com/lestrrat-go/jwx/v4 v4.1.0 - github.com/magiconair/properties v1.8.10 + github.com/magiconair/properties v1.18.11 github.com/moby/moby/api v1.55.0 github.com/peterbourgon/ff/v3 v3.4.0 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c @@ -56,6 +56,7 @@ require ( go.opentelemetry.io/otel v1.44.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.44.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 + go.opentelemetry.io/otel/metric v1.44.0 go.opentelemetry.io/otel/sdk v1.44.0 go.opentelemetry.io/otel/sdk/metric v1.44.0 go.opentelemetry.io/otel/trace v1.44.0 @@ -193,7 +194,6 @@ require ( go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect - go.opentelemetry.io/otel/metric v1.44.0 // indirect go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.shabbyrobe.org/gocovmerge v0.0.0-20230507111327-fa4f82cfbf4d // indirect go.uber.org/goleak v1.3.0 // indirect diff --git a/go.sum b/go.sum index 95e82b3c..a64c8e83 100644 --- a/go.sum +++ b/go.sum @@ -262,6 +262,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/magiconair/properties v1.18.11 h1:j5ozYZl0zCjG7ahMDH0GWIobOvvUzT0BdAguG0ViKy0= +github.com/magiconair/properties v1.18.11/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= diff --git a/vendor/github.com/magiconair/properties/load.go b/vendor/github.com/magiconair/properties/load.go index 6567e0c7..3d5573f3 100644 --- a/vendor/github.com/magiconair/properties/load.go +++ b/vendor/github.com/magiconair/properties/load.go @@ -5,6 +5,7 @@ package properties import ( + "bytes" "fmt" "io" "net/http" @@ -156,6 +157,10 @@ func (l *Loader) LoadURL(url string) (*Properties, error) { } func (l *Loader) loadBytes(buf []byte, enc Encoding) (*Properties, error) { + // Strip a leading UTF-8 BOM so Windows-edited property files load cleanly. + if enc == UTF8 || enc == utf8Default { + buf = bytes.TrimPrefix(buf, []byte{0xEF, 0xBB, 0xBF}) + } p, err := parse(convert(buf, enc)) if err != nil { return nil, err diff --git a/vendor/modules.txt b/vendor/modules.txt index a992bf5d..7354da3a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -598,7 +598,7 @@ github.com/lmittmann/tint # github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 ## explicit; go 1.16 github.com/lufia/plan9stats -# github.com/magiconair/properties v1.8.10 +# github.com/magiconair/properties v1.18.11 ## explicit; go 1.19 github.com/magiconair/properties # github.com/mattn/go-colorable v0.1.14