open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resource merge precedence (#1728) 

* Reversing this versus other in merge priority

* revised test for new behavior

* Changelog updated

* Changelog updated

* remove extra period

* Fixing more period issues/line breaks

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>
This commit is contained in:
Austin Tan 2021-01-27 16:00:51 -08:00 committed by GitHub
parent 9196e567cf
commit 92948e60f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenTelemetry/CHANGELOG.md
View File

@ -26,6 +26,10 @@
them to supported data types (long for int/short, double for float). For
invalid attributes we now throw an exception instead of logging an error.
([#1720](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1720))
* Merging "this" resource with an "other" resource now prioritizes the "other"
resource's attributes in a conflict. We've rectified to follow a recent
change to the spec. We previously prioritized "this" resource's tags.
([#1728](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1728))
## 1.0.0-rc1.1

24
src/OpenTelemetry/Resources/Resource.cs
View File

@ -57,34 +57,34 @@ namespace OpenTelemetry.Resources
public IEnumerable<KeyValuePair<string, object>> Attributes { get; }
/// <summary>
/// Returns a new, merged <see cref="Resource"/> by merging the current <see cref="Resource"/> with the.
/// <code>other</code> <see cref="Resource"/>. In case of a collision the current <see cref="Resource"/> takes precedence.
/// Returns a new, merged <see cref="Resource"/> by merging the old <see cref="Resource"/> with the
/// <c>other</c> <see cref="Resource"/>. In case of a collision the other <see cref="Resource"/> takes precedence.
/// </summary>
/// <param name="other">The <see cref="Resource"/> that will be merged with. <code>this</code>.</param>
/// <param name="other">The <see cref="Resource"/> that will be merged with <c>this</c>.</param>
/// <returns><see cref="Resource"/>.</returns>
public Resource Merge(Resource other)
{
var newAttributes = new Dictionary<string, object>();
foreach (var attribute in this.Attributes)
{
if (!newAttributes.TryGetValue(attribute.Key, out var value) || (value is string strValue && string.IsNullOrEmpty(strValue)))
{
newAttributes[attribute.Key] = attribute.Value;
}
}
if (other != null)
{
foreach (var attribute in other.Attributes)
{
if (!newAttributes.TryGetValue(attribute.Key, out var value) || (value is string strValue && string.IsNullOrEmpty(strValue)))
if (!newAttributes.TryGetValue(attribute.Key, out var value))
{
newAttributes[attribute.Key] = attribute.Value;
}
}
}
foreach (var attribute in this.Attributes)
{
if (!newAttributes.TryGetValue(attribute.Key, out var value))
{
newAttributes[attribute.Key] = attribute.Value;
}
}
return new Resource(newAttributes);
}

14
test/OpenTelemetry.Tests/Resources/ResourceTest.cs
View File

@ -315,19 +315,19 @@ namespace OpenTelemetry.Resources.Tests
}
[Fact]
public void MergeResource_SecondaryCanOverridePrimaryEmptyAttributeValue()
public void MergeResource_UpdatingResourceOverridesCurrentResource()
{
// Arrange
var primaryAttributes = new Dictionary<string, object> { { "value", string.Empty } };
var secondaryAttributes = new Dictionary<string, object> { { "value", "not empty" } };
var primaryResource = new Resource(primaryAttributes);
var secondaryResource = new Resource(secondaryAttributes);
var currentAttributes = new Dictionary<string, object> { { "value", "currentValue" } };
var updatingAttributes = new Dictionary<string, object> { { "value", "updatedValue" } };
var currentResource = new Resource(currentAttributes);
var updatingResource = new Resource(updatingAttributes);
var newResource = primaryResource.Merge(secondaryResource);
var newResource = currentResource.Merge(updatingResource);
// Assert
Assert.Single(newResource.Attributes);
Assert.Contains(new KeyValuePair<string, object>("value", "not empty"), newResource.Attributes);
Assert.Contains(new KeyValuePair<string, object>("value", "updatedValue"), newResource.Attributes);
}
[Fact]