Skip to content

MetricType modification to allow future additions to histogram #2693

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
cijothomas merged 11 commits into from
Nov 29, 2021
Merged

MetricType modification to allow future additions to histogram #2693

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
500a7e2
MetricType modification to allow future additions to histogram
cijothomas Nov 26, 2021
709f043
public api
cijothomas Nov 26, 2021
7b2ac9d
fix comment
cijothomas Nov 26, 2021
564e858
Merge branch 'main' into cijothomas/metrictypeenum1
cijothomas Nov 26, 2021
4b8214b
reseerve 30 for summar
cijothomas Nov 27, 2021
7d251d6
rewrap
cijothomas Nov 27, 2021
81d4180
typos
cijothomas Nov 27, 2021
5c53e3f
Update src/OpenTelemetry.Exporter.Prometheus/Implementation/Prometheu…
cijothomas Nov 28, 2021
c0ed3df
changelog and pr comment
cijothomas Nov 28, 2021
c8ea27b
Merge branch 'main' into cijothomas/metrictypeenum1
cijothomas Nov 28, 2021
4dfa12c
Merge branch 'main' into cijothomas/metrictypeenum1
cijothomas Nov 28, 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
4 changes: 2 additions & 2 deletions src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusSerializerExt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace OpenTelemetry.Exporter.Prometheus
/// </summary>
internal static partial class PrometheusSerializer
{
private static readonly string[] MetricTypes = new string[] { "untyped", "counter", "gauge", "histogram", "summary" };
private static readonly string[] MetricTypes = new string[] { "untyped", "counter", "gauge", "untyped", "histogram", "histogram", "histogram", "histogram", "summary" };
Comment thread
cijothomas marked this conversation as resolved.
Outdated

public static int WriteMetric(byte[] buffer, int cursor, Metric metric)
{
Expand All @@ -35,7 +35,7 @@ public static int WriteMetric(byte[] buffer, int cursor, Metric metric)
int metricType = (int)metric.MetricType >> 4;
cursor = WriteTypeInfo(buffer, cursor, metric.Name, metric.Unit, MetricTypes[metricType]);

if (metric.MetricType != MetricType.Histogram)
if (!metric.MetricType.IsHistogram())
{
foreach (ref var metricPoint in metric.GetMetricPoints())
{
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry/.publicApi/net461/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ OpenTelemetry.Metrics.MetricStreamConfiguration.TagKeys.set -> void
OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.DoubleGauge = 45 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.DoubleSum = 29 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.Histogram = 48 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.Histogram = 64 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.LongGauge = 42 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.LongSum = 26 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricTypeExtensions
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ OpenTelemetry.Metrics.MetricStreamConfiguration.TagKeys.set -> void
OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.DoubleGauge = 45 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.DoubleSum = 29 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.Histogram = 48 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.Histogram = 64 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.LongGauge = 42 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricType.LongSum = 26 -> OpenTelemetry.Metrics.MetricType
OpenTelemetry.Metrics.MetricTypeExtensions
Expand Down
9 changes: 6 additions & 3 deletions src/OpenTelemetry/Metrics/MetricType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ public enum MetricType : byte
Type:
0x10: Sum
0x20: Gauge
0x30: Histogram
0x40: Summary (reserved)
0x40: Histogram
0x50: HistogramWithMinMax (reserved)
0x60: ExponentialHistogram (reserved)
0x70: ExponentialHistogramWithMinMax (reserved)
0x80: Summary (reserved)
Comment thread
cijothomas marked this conversation as resolved.
Outdated

Point kind:
0x04: I1 (signed 1-byte integer)
Expand Down Expand Up @@ -64,6 +67,6 @@ public enum MetricType : byte
/// <summary>
/// Histogram.
/// </summary>
Histogram = 0x30,
Histogram = 0x40,
}
}
6 changes: 3 additions & 3 deletions src/OpenTelemetry/Metrics/MetricTypeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public static class MetricTypeExtensions

internal const MetricType METRIC_TYPE_SUM = (MetricType)0x10;
internal const MetricType METRIC_TYPE_GAUGE = (MetricType)0x20;
internal const MetricType METRIC_TYPE_HISTOGRAM = (MetricType)0x30;
/* internal const byte METRIC_TYPE_SUMMARY = 0x40; // not used */
internal const MetricType METRIC_TYPE_HISTOGRAM = (MetricType)0x40;
/* internal const byte METRIC_TYPE_SUMMARY = 0x80; // not used */

internal const MetricType POINT_KIND_MASK = (MetricType)0x0f;

Expand Down Expand Up @@ -59,7 +59,7 @@ public static bool IsGauge(this MetricType self)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool IsHistogram(this MetricType self)
{
return (self & METRIC_TYPE_MASK) == METRIC_TYPE_HISTOGRAM;
return self.HasFlag(METRIC_TYPE_HISTOGRAM);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down