sdk::resource::Resource::Merge should be const (#1905)

open-telemetry · Jan 7, 2023 · 201b347 · 201b347
1 parent d557191
commit 201b347
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sdk/include/opentelemetry/sdk/resource/resource.h b/sdk/include/opentelemetry/sdk/resource/resource.h
@@ -40,7 +40,7 @@ class Resource
    * @returns the newly merged Resource.
    */
 
-  Resource Merge(const Resource &other) noexcept;
+  Resource Merge(const Resource &other) const noexcept;
 
   /**
    * Returns a newly created Resource with the specified attributes.

diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc
@@ -17,7 +17,7 @@ Resource::Resource(const ResourceAttributes &attributes, const std::string &sche
     : attributes_(attributes), schema_url_(schema_url)
 {}
 
-Resource Resource::Merge(const Resource &other) noexcept
+Resource Resource::Merge(const Resource &other) const noexcept
 {
   ResourceAttributes merged_resource_attributes(other.attributes_);
   merged_resource_attributes.insert(attributes_.begin(), attributes_.end());