Skip to content

Add support for instrumentation scope attributes (Meter tags) #5089

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

Merged
utpilla merged 21 commits into from
Nov 29, 2023
Merged

Add support for instrumentation scope attributes (Meter tags) #5089

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3660c3a
Add support for instrumentation scope attributes (Meter tags)
cijothomas Nov 28, 2023
4887638
fix conflict
cijothomas Nov 28, 2023
4448413
changelog order
cijothomas Nov 28, 2023
2997c6c
move to new style
cijothomas Nov 28, 2023
d48e1bf
revert line ending
cijothomas Nov 28, 2023
5392119
line ending is diff in this machine
cijothomas Nov 28, 2023
2ecc2fe
fmt
cijothomas Nov 28, 2023
054637b
tmp revert
cijothomas Nov 28, 2023
3ef487f
lf
cijothomas Nov 28, 2023
81b9bd5
add tags back
cijothomas Nov 28, 2023
2859325
console fix
cijothomas Nov 28, 2023
d847336
fix test class
cijothomas Nov 28, 2023
f00c651
feedbacks addressed
cijothomas Nov 28, 2023
7baed5d
add unit test to confirm the nonidentity of meter tags
cijothomas Nov 28, 2023
3ac1cf5
console cl
cijothomas Nov 28, 2023
f2b7bac
changelog gix
cijothomas Nov 29, 2023
d3ba4d4
better test asserts
cijothomas Nov 29, 2023
c635811
Merge branch 'main' into cijothomas/metertags
utpilla Nov 29, 2023
505bb7d
fix test logic
cijothomas Nov 29, 2023
c366a48
Merge branch 'cijothomas/metertags' of https://github.com/cijothomas/…
cijothomas Nov 29, 2023
c9e0eec
Merge branch 'main' into cijothomas/metertags
cijothomas Nov 29, 2023
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
Prev Previous commit
Next Next commit
fix test logic
  • Loading branch information
@cijothomas
cijothomas committed Nov 29, 2023
commit 505bb7d35e4cf9f73b22d491856364b02dc1dcbe
6 changes: 3 additions & 3 deletions test/OpenTelemetry.Tests/Metrics/MetricApiTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void MetricInstrumentationScopeIsExportedCorrectly()
Assert.Equal(meterName, metric.MeterName);
Assert.Equal(meterVersion, metric.MeterVersion);

Assert.Single(metric.MeterTags.Attributes.Where(kvp => kvp.Key == meterTags[0].Key && kvp.Value == meterTags[0].Value));
Assert.Single(metric.MeterTags.Where(kvp => kvp.Key == meterTags[0].Key && kvp.Value == meterTags[0].Value));
}

[Fact]
Expand Down Expand Up @@ -248,8 +248,8 @@ public void MetricInstrumentationScopeAttributesAreNotTreatedAsIdentifyingProper
Assert.Equal(meterName, metric.MeterName);
Assert.Equal(meterVersion, metric.MeterVersion);

Assert.Single(metric.MeterTags.Attributes.Where(kvp => kvp.Key == meterTags1[0].Key && kvp.Value == meterTags1[0].Value));
Assert.DoesNotContain(metric.MeterTags.Attributes.Where(kvp => kvp.Key == meterTags2[0].Key && kvp.Value == meterTags2[0].Value));
Assert.Single(metric.MeterTags.Where(kvp => kvp.Key == meterTags1[0].Key && kvp.Value == meterTags1[0].Value));
Assert.Empty(metric.MeterTags.Where(kvp => kvp.Key == meterTags2[0].Key && kvp.Value == meterTags2[0].Value));

List<MetricPoint> metricPoints = new List<MetricPoint>();
foreach (ref readonly var mp in metric.GetMetricPoints())
Expand Down