Skip to content

Check isSampled parameter in UpdateWithExemplar method #5004

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 3 commits into from
Oct 31, 2023
Merged

Check isSampled parameter in UpdateWithExemplar method #5004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eccfe68
Check isSampled parameter in UpdateWithExemplar method and call Exemp…
ImoutoChan Oct 28, 2023
4b6e609
Add changelog entry
ImoutoChan Oct 28, 2023
a4bd3dd
Fix line length
ImoutoChan Oct 28, 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
4 changes: 4 additions & 0 deletions src/OpenTelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
`autoGenerateServiceInstanceId` is `true`.
([#4988](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4988))

* Fixed a bug where isSampled parameter wasn't properly checked in certain cases
within the `UpdateWithExemplar` method of `MetricPoint`.
([#4851](https://github.com/open-telemetry/opentelemetry-dotnet/pull/5004))

## 1.7.0-alpha.1

Released 2023-Oct-16
Expand Down
44 changes: 28 additions & 16 deletions src/OpenTelemetry/Metrics/MetricPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,14 @@ internal void UpdateWithExemplar(long number, ReadOnlySpan<KeyValuePair<string,

this.runningValue.AsLong = number;

Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");
if (isSampled)
{
Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");

// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
}

ReleaseLock(ref this.mpComponents!.IsCriticalSectionOccupied);

Expand All @@ -516,11 +519,14 @@ internal void UpdateWithExemplar(long number, ReadOnlySpan<KeyValuePair<string,

this.runningValue.AsLong = number;

Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");
if (isSampled)
{
Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");

// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
}

ReleaseLock(ref this.mpComponents!.IsCriticalSectionOccupied);

Expand Down Expand Up @@ -717,11 +723,14 @@ internal void UpdateWithExemplar(double number, ReadOnlySpan<KeyValuePair<string
this.runningValue.AsDouble = number;
}

Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");
if (isSampled)
{
Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");

// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
}

ReleaseLock(ref this.mpComponents!.IsCriticalSectionOccupied);

Expand All @@ -737,11 +746,14 @@ internal void UpdateWithExemplar(double number, ReadOnlySpan<KeyValuePair<string
this.runningValue.AsDouble = number;
}

Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");
if (isSampled)
{
Debug.Assert(this.mpComponents.ExemplarReservoir != null, "ExemplarReservoir was null");

// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
// TODO: Need to ensure that the lock is always released.
// A custom implementation of `ExemplarReservoir.Offer` might throw an exception.
this.mpComponents.ExemplarReservoir!.Offer(number, tags);
}

ReleaseLock(ref this.mpComponents!.IsCriticalSectionOccupied);

Expand Down