-
Notifications
You must be signed in to change notification settings - Fork 773
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.
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
Update MetricPoint HistogramMeasurements #2664
Merged
cijothomas
merged 5 commits into
open-telemetry:main
from
utpilla:utpilla/Update-MetricPoint-HistogramMeasurements
Nov 23, 2021
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7f82ce0
Update HistogramMeasurement
utpilla 4b8d421
Update CHANGELOG.md
utpilla 22b0d85
Merge branch 'main' into utpilla/Update-MetricPoint-HistogramMeasurem…
cijothomas 9ba6bb7
Address PR comments
utpilla e41e84e
Add public method GetHistogramBuckets
utpilla File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // <copyright file="HistogramBucket.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| namespace OpenTelemetry.Metrics | ||
| { | ||
| public readonly struct HistogramBucket | ||
| { | ||
| internal HistogramBucket(double explicitBound, long bucketCount) | ||
| { | ||
| this.ExplicitBound = explicitBound; | ||
| this.BucketCount = bucketCount; | ||
| } | ||
|
|
||
| public double ExplicitBound { get; } | ||
|
|
||
| public long BucketCount { get; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // <copyright file="HistogramBuckets.cs" company="OpenTelemetry Authors"> | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // </copyright> | ||
|
|
||
| namespace OpenTelemetry.Metrics | ||
| { | ||
| public class HistogramBuckets | ||
| { | ||
| internal readonly long[] BucketCounts; | ||
|
|
||
| internal readonly long[] AggregatedBucketCounts; | ||
|
|
||
| internal readonly double[] ExplicitBounds; | ||
|
|
||
| internal readonly object LockObject; | ||
|
|
||
| internal long CountVal; | ||
|
|
||
| internal long Count; | ||
|
|
||
| internal double SumVal; | ||
|
|
||
| internal double Sum; | ||
|
|
||
| internal HistogramBuckets(double[] histogramBounds) | ||
| { | ||
| this.ExplicitBounds = histogramBounds; | ||
| this.BucketCounts = histogramBounds != null ? new long[histogramBounds.Length + 1] : null; | ||
| this.AggregatedBucketCounts = histogramBounds != null ? new long[histogramBounds.Length + 1] : null; | ||
| this.LockObject = new object(); | ||
| } | ||
|
|
||
| public Enumerator GetEnumerator() => new(this); | ||
|
|
||
| public struct Enumerator | ||
| { | ||
| private readonly int numberOfBuckets; | ||
| private readonly int numberofExplicitBounds; | ||
| private readonly HistogramBuckets histogramMeasurements; | ||
| private int index; | ||
|
|
||
| internal Enumerator(HistogramBuckets histogramMeasurements) | ||
| { | ||
| this.histogramMeasurements = histogramMeasurements; | ||
| this.index = 0; | ||
| this.Current = default; | ||
| this.numberOfBuckets = histogramMeasurements.ExplicitBounds == null ? 0 : histogramMeasurements.BucketCounts.Length; | ||
| this.numberofExplicitBounds = histogramMeasurements.ExplicitBounds == null ? 0 : histogramMeasurements.ExplicitBounds.Length; | ||
| } | ||
|
|
||
| public HistogramBucket Current { get; private set; } | ||
|
|
||
| public bool MoveNext() | ||
| { | ||
| if (this.index < this.numberOfBuckets) | ||
| { | ||
| double explicitBound = this.index < this.numberofExplicitBounds | ||
| ? this.histogramMeasurements.ExplicitBounds[this.index] | ||
| : double.PositiveInfinity; | ||
| long bucketCount = this.histogramMeasurements.AggregatedBucketCounts[this.index]; | ||
| this.Current = new HistogramBucket(explicitBound, bucketCount); | ||
| this.index++; | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since this class holds more than buckets (sum,count) , this name is probably not correct as well.
Lets iterate on it a bit more, after @CodeBlanch does custom struct layout as well.
Also from the datamodel, (
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/datamodel.md#histogram), the term bucket seem to indicate a "triplet" with lower bound, upper bound, and the count. So might need another name.
Not blocking this PR, but needs addressing before stable.