Skip to content

Commit

Permalink
resource sdk: Update Resource::Merge function docs
Browse files Browse the repository at this point in the history
The documented behaviour of Resource::Merge is the opposite of what it
actually does.

As per https://cplusplus.com/reference/unordered_map/unordered_map/insert/,
when calling `insert` on an unordered_map, each element is inserted only
if its key is not equivalent to the key of any other element already in
the container.

Signed-off-by: ricekot <github@ricekot.com>
  • Loading branch information
ricekot committed Sep 14, 2022
1 parent c7dfc0d commit 6d89fca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/resource/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Resource

/**
* Returns a new, merged {@link Resource} by merging the current Resource
* with the other Resource. In case of a collision, current Resource takes
* with the other Resource. In case of a collision, the other Resource takes
* precedence.
*
* @param other the Resource that will be merged with this.
Expand Down

0 comments on commit 6d89fca

Please sign in to comment.