Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zipkin Span tags will no longer be populated with Resource Attributes #1663

Merged
merged 7 commits into from
Jan 27, 2021
Merged

Zipkin Span tags will no longer be populated with Resource Attributes #1663

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
56c5099
Remove Resource tag population
Austin-Tan Dec 17, 2020
b4003f7
Changelog updated
Austin-Tan Dec 17, 2020
d658f7a
Removing test case involving Resource
Austin-Tan Dec 22, 2020
a689896
removing local dictionary of tags, unused
Austin-Tan Jan 5, 2021
bd78a6c
Making @CodeBlanch 's test changes thank you!
Austin-Tan Jan 5, 2021
f462632
Merge branch 'master' into ZipkinRemoveResourceTags
cijothomas Jan 6, 2021
a8a5fb8
Merge branch 'master' into ZipkinRemoveResourceTags
cijothomas Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Exporter.Zipkin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
`True`/`False`.
([#1609](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1609))

* Span tags will no longer be populated with Resource Attributes.
([#1663](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1663))

## 1.0.0-rc1.1

Released 2020-Nov-17
Expand Down
9 changes: 1 addition & 8 deletions src/OpenTelemetry.Exporter.Zipkin/ZipkinExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ internal void SetLocalEndpointFromResource(Resource resource)
}

string serviceName = null;
Dictionary<string, object> tags = null;
Dictionary<string, object> tags = new Dictionary<string, object>();
Austin-Tan marked this conversation as resolved.
Show resolved Hide resolved
foreach (var label in resource.Attributes)
{
string key = label.Key;
Expand All @@ -119,13 +119,6 @@ internal void SetLocalEndpointFromResource(Resource resource)
serviceName = label.Value as string;
continue;
}

if (tags == null)
{
tags = new Dictionary<string, object>();
}

tags[key] = label.Value;
}

if (string.IsNullOrEmpty(serviceName))
Expand Down
1 change: 0 additions & 1 deletion test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ public void SuppresssesInstrumentation()
[Theory]
[InlineData(true, false, false)]
[InlineData(false, false, false)]
[InlineData(false, true, false)]
Austin-Tan marked this conversation as resolved.
Show resolved Hide resolved
[InlineData(false, false, true)]
[InlineData(false, false, false, StatusCode.Ok)]
[InlineData(false, false, false, StatusCode.Ok, null, true)]
Expand Down