From 8d2464c04fd55192af97e6631cd51e644e6ae998 Mon Sep 17 00:00:00 2001 From: Oblivion Date: Sat, 7 Jan 2023 12:29:49 +0000 Subject: [PATCH] sdk::resource::Resource::Merge should be const --- sdk/include/opentelemetry/sdk/resource/resource.h | 2 +- sdk/src/resource/resource.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/resource/resource.h b/sdk/include/opentelemetry/sdk/resource/resource.h index eee339e237..c69b971b04 100644 --- 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 index 410e7318b1..a07f4d3a3c 100644 --- 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());