File tree Expand file tree Collapse file tree 10 files changed +20
-1
lines changed
Expand file tree Collapse file tree 10 files changed +20
-1
lines changed Original file line number Diff line number Diff line change 1+ - Load configs from absolute paths, if relative path fails
Original file line number Diff line number Diff line change @@ -199,6 +199,7 @@ require (
199199 go.opentelemetry.io/otel/trace v1.35.0 // indirect
200200 go.opentelemetry.io/proto/otlp v1.3.1 // indirect
201201 go.uber.org/mock v0.5.0 // indirect
202+ go.uber.org/multierr v1.11.0 // indirect
202203 golang.org/x/crypto v0.37.0 // indirect
203204 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
204205 golang.org/x/net v0.38.0 // indirect
Original file line number Diff line number Diff line change @@ -677,6 +677,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
677677go.uber.org/goleak v1.3.0 /go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE =
678678go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU =
679679go.uber.org/mock v0.5.0 /go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM =
680+ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0 =
681+ go.uber.org/multierr v1.11.0 /go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y =
680682golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 /go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4 =
681683golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 /go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w =
682684golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c /go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w =
Original file line number Diff line number Diff line change @@ -99,6 +99,7 @@ require (
9999 go.opentelemetry.io/otel/sdk v1.37.0 // indirect
100100 go.opentelemetry.io/otel/trace v1.37.0 // indirect
101101 go.opentelemetry.io/proto/otlp v1.7.0 // indirect
102+ go.uber.org/multierr v1.11.0 // indirect
102103 golang.org/x/arch v0.11.0 // indirect
103104 golang.org/x/crypto v0.38.0 // indirect
104105 golang.org/x/net v0.40.0 // indirect
Original file line number Diff line number Diff line change @@ -226,6 +226,8 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
226226go.opentelemetry.io/otel/trace v1.37.0 /go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0 =
227227go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os =
228228go.opentelemetry.io/proto/otlp v1.7.0 /go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo =
229+ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0 =
230+ go.uber.org/multierr v1.11.0 /go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y =
229231golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4 =
230232golang.org/x/arch v0.11.0 /go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys =
231233golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 /go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w =
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ import (
2121 "github.com/pelletier/go-toml/v2"
2222 "github.com/rs/zerolog"
2323 "github.com/stretchr/testify/require"
24+ "go.uber.org/multierr"
2425)
2526
2627const (
@@ -74,7 +75,12 @@ func mergeInputs[T any]() (*T, error) {
7475 L .Info ().Str ("Path" , path ).Msg ("Overrides file not found or empty" )
7576 continue
7677 }
77- return nil , fmt .Errorf ("error reading config file %s: %w" , path , err )
78+ var absError error
79+ data , absError = os .ReadFile (path )
80+ if absError != nil {
81+ multiErr := multierr .Append (err , absError )
82+ return nil , fmt .Errorf ("error reading config file %s: %w" , path , multiErr )
83+ }
7884 }
7985 if L .GetLevel () == zerolog .TraceLevel {
8086 fmt .Println (string (data ))
Original file line number Diff line number Diff line change @@ -123,6 +123,7 @@ require (
123123 go.opentelemetry.io/otel v1.37.0 // indirect
124124 go.opentelemetry.io/otel/metric v1.37.0 // indirect
125125 go.opentelemetry.io/otel/trace v1.37.0 // indirect
126+ go.uber.org/multierr v1.11.0 // indirect
126127 golang.org/x/arch v0.11.0 // indirect
127128 golang.org/x/crypto v0.38.0 // indirect
128129 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
Original file line number Diff line number Diff line change @@ -366,6 +366,8 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
366366go.opentelemetry.io/otel/trace v1.37.0 /go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0 =
367367go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os =
368368go.opentelemetry.io/proto/otlp v1.7.0 /go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo =
369+ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0 =
370+ go.uber.org/multierr v1.11.0 /go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y =
369371golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4 =
370372golang.org/x/arch v0.11.0 /go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys =
371373golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 /go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w =
Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ require (
3232 go.opentelemetry.io/otel v1.35.0
3333 go.opentelemetry.io/otel/sdk v1.34.0
3434 go.opentelemetry.io/otel/trace v1.35.0
35+ go.uber.org/multierr v1.11.0
3536 golang.org/x/sync v0.13.0
3637 gopkg.in/guregu/null.v4 v4.0.0
3738)
Original file line number Diff line number Diff line change @@ -361,6 +361,8 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt
361361go.opentelemetry.io/otel/trace v1.35.0 /go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc =
362362go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0 =
363363go.opentelemetry.io/proto/otlp v1.3.1 /go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8 =
364+ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0 =
365+ go.uber.org/multierr v1.11.0 /go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y =
364366golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 /go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w =
365367golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 /go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI =
366368golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 /go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto =
You can’t perform that action at this time.
0 commit comments