Skip to content

Commit

Permalink
resource sdk: Update Resource::Merge function docs (#1615)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricekot
ricekot authored Sep 15, 2022
1 parent c7dfc0d commit 82a8115
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/resource/resource.h
View file
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

1 comment on commit 82a8115

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp sdk Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 82a8115 Previous: c7dfc0d Ratio
BM_BaselineBuffer/4 12954158.782958984 ns/iter 4579798.205868228 ns/iter 2.83

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.