diff options
author | 2023-05-12 14:55:18 +0200 | |
---|---|---|
committer | 2023-05-12 14:55:18 +0200 | |
commit | b47661f0330f9f6902e19a3bf6fb664dcfa85907 (patch) | |
tree | 831e75f76943094bcb2852ac29bc02ba511c70a0 /vendor/go.opentelemetry.io/otel/sdk/internal | |
parent | [chore] Update a bunch of database dependencies (#1772) (diff) | |
download | gotosocial-b47661f0330f9f6902e19a3bf6fb664dcfa85907.tar.xz |
[bugfix] Downstep otel to fix freebsd compile issue (#1773)
https://github.com/open-telemetry/opentelemetry-go/issues/4076
Diffstat (limited to 'vendor/go.opentelemetry.io/otel/sdk/internal')
-rw-r--r-- | vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go | 10 | ||||
-rw-r--r-- | vendor/go.opentelemetry.io/otel/sdk/internal/internal.go | 11 |
2 files changed, 15 insertions, 6 deletions
diff --git a/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go b/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go index 59dcfab25..5e94b8ae5 100644 --- a/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go +++ b/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go @@ -70,8 +70,8 @@ const ( // returned. func firstInt(defaultValue int, keys ...string) int { for _, key := range keys { - value := os.Getenv(key) - if value == "" { + value, ok := os.LookupEnv(key) + if !ok { continue } @@ -88,10 +88,10 @@ func firstInt(defaultValue int, keys ...string) int { } // IntEnvOr returns the int value of the environment variable with name key if -// it exists, it is not empty, and the value is an int. Otherwise, defaultValue is returned. +// it exists and the value is an int. Otherwise, defaultValue is returned. func IntEnvOr(key string, defaultValue int) int { - value := os.Getenv(key) - if value == "" { + value, ok := os.LookupEnv(key) + if !ok { return defaultValue } diff --git a/vendor/go.opentelemetry.io/otel/sdk/internal/internal.go b/vendor/go.opentelemetry.io/otel/sdk/internal/internal.go index dfeaaa8ca..84a02306e 100644 --- a/vendor/go.opentelemetry.io/otel/sdk/internal/internal.go +++ b/vendor/go.opentelemetry.io/otel/sdk/internal/internal.go @@ -14,7 +14,16 @@ package internal // import "go.opentelemetry.io/otel/sdk/internal" -import "time" +import ( + "fmt" + "time" + + "go.opentelemetry.io/otel" +) + +// UserAgent is the user agent to be added to the outgoing +// requests from the exporters. +var UserAgent = fmt.Sprintf("opentelemetry-go/%s", otel.Version()) // MonotonicEndTime returns the end time at present // but offset from start, monotonically. |