mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-14 00:37:27 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Roll otel deps back to v1.29.0 / v0.51.0 (#3337)

Browse source
This commit is contained in:
tobi 2024-09-24 12:26:26 +02:00 • committed by GitHub
commit de72855790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 252 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vendor/go.opentelemetry.io/otel/sdk/metric/config.go generated vendored
View file

@ -8,7 +8,6 @@ import (
"fmt"
"sync"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/sdk/resource"
)
@ -104,11 +103,7 @@ func (o optionFunc) apply(conf config) config {
// go.opentelemetry.io/otel/sdk/resource package will be used.
func WithResource(res *resource.Resource) Option {
return optionFunc(func(conf config) config {
var err error
conf.res, err = resource.Merge(resource.Environment(), res)
if err != nil {
otel.Handle(err)
}
conf.res = res
return conf
})
}