From 62cd933da58e67a565d1a11043223906fd2cfdd5 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 27 Apr 2021 16:52:48 +0000 Subject: [PATCH] Handle Resource env error when non-nil (#1851) * Handle Resource env error when non-nil * Add changes to changelog * Update PR number --- CHANGELOG.md | 2 ++ sdk/resource/resource.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7938fd0d6..33083d050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixed +- Only report errors from the `"go.opentelemetry.io/otel/sdk/resource".Environment` function when they are not `nil`. (#1850, #1851) + ### Security ## [0.20.0] - 2021-04-23 diff --git a/sdk/resource/resource.go b/sdk/resource/resource.go index 2e5d10151..3d056b56b 100644 --- a/sdk/resource/resource.go +++ b/sdk/resource/resource.go @@ -149,7 +149,7 @@ func Default() *Resource { func Environment() *Resource { detector := &FromEnv{} resource, err := detector.Detect(context.Background()) - if err == nil { + if err != nil { otel.Handle(err) } return resource