From 9f55256de3c62bd6542e7f5ea2fb8433189b1877 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Thu, 1 Feb 2024 07:47:01 -0800 Subject: [PATCH] Add the schema URLs to the returned error --- sdk/resource/resource.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/resource/resource.go b/sdk/resource/resource.go index e1ce4161b59..cb1ee0a9ceb 100644 --- a/sdk/resource/resource.go +++ b/sdk/resource/resource.go @@ -17,6 +17,7 @@ package resource // import "go.opentelemetry.io/otel/sdk/resource" import ( "context" "errors" + "fmt" "sync" "go.opentelemetry.io/otel" @@ -209,7 +210,12 @@ func Merge(a, b *Resource) (*Resource, error) { } // Return the merged resource with an appropriate error. It is up to // the user to decide if the returned resource can be used or not. - return NewSchemaless(combine...), ErrSchemaURLConflict + return NewSchemaless(combine...), fmt.Errorf( + "%w: %s and %s", + ErrSchemaURLConflict, + a.schemaURL, + b.schemaURL, + ) } // Empty returns an instance of Resource with no attributes. It is