open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename GetCounterSum to GetSum (#2702)

This commit is contained in:
Cijo Thomas 2021-11-29 11:47:22 -08:00 committed by GitHub
parent 5f5238dd7b
commit a5ab670e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenTelemetry.Exporter.Console/ConsoleMetricExporter.cs
View File

@ -140,7 +140,7 @@ namespace OpenTelemetry.Exporter
{
if (metricType.IsSum())
{
valueDisplay = metricPoint.GetCounterSumDouble().ToString(CultureInfo.InvariantCulture);
valueDisplay = metricPoint.GetSumDouble().ToString(CultureInfo.InvariantCulture);
}
else
{
@ -151,7 +151,7 @@ namespace OpenTelemetry.Exporter
{
if (metricType.IsSum())
{
valueDisplay = metricPoint.GetCounterSumLong().ToString(CultureInfo.InvariantCulture);
valueDisplay = metricPoint.GetSumLong().ToString(CultureInfo.InvariantCulture);
}
else
{

4
src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/MetricItemExtensions.cs
View File

@ -158,7 +158,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation
AddAttributes(metricPoint.Tags, dataPoint.Attributes);
dataPoint.AsInt = metricPoint.GetCounterSumLong();
dataPoint.AsInt = metricPoint.GetSumLong();
sum.DataPoints.Add(dataPoint);
}
@ -182,7 +182,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation
AddAttributes(metricPoint.Tags, dataPoint.Attributes);
dataPoint.AsDouble = metricPoint.GetCounterSumDouble();
dataPoint.AsDouble = metricPoint.GetSumDouble();
sum.DataPoints.Add(dataPoint);
}

4
src/OpenTelemetry.Exporter.Prometheus/Implementation/PrometheusSerializerExt.cs
View File

@ -75,7 +75,7 @@ namespace OpenTelemetry.Exporter.Prometheus
{
if (metric.MetricType.IsSum())
{
cursor = WriteLong(buffer, cursor, metricPoint.GetCounterSumLong());
cursor = WriteLong(buffer, cursor, metricPoint.GetSumLong());
}
else
{
@ -86,7 +86,7 @@ namespace OpenTelemetry.Exporter.Prometheus
{
if (metric.MetricType.IsSum())
{
cursor = WriteDouble(buffer, cursor, metricPoint.GetCounterSumDouble());
cursor = WriteDouble(buffer, cursor, metricPoint.GetSumDouble());
}
else
{

4
src/OpenTelemetry/.publicApi/net461/PublicAPI.Unshipped.txt
View File

@ -20,8 +20,8 @@ OpenTelemetry.Metrics.HistogramBuckets.Enumerator.Current.get -> OpenTelemetry.M
OpenTelemetry.Metrics.HistogramBuckets.Enumerator.Enumerator() -> void
OpenTelemetry.Metrics.HistogramBuckets.Enumerator.MoveNext() -> bool
OpenTelemetry.Metrics.HistogramBuckets.GetEnumerator() -> OpenTelemetry.Metrics.HistogramBuckets.Enumerator
OpenTelemetry.Metrics.MetricPoint.GetCounterSumDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetCounterSumLong() -> long
OpenTelemetry.Metrics.MetricPoint.GetSumDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetSumLong() -> long
OpenTelemetry.Metrics.MetricPoint.GetEndTime() -> System.DateTimeOffset
OpenTelemetry.Metrics.MetricPoint.GetGaugeLastValueDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetGaugeLastValueLong() -> long

4
src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View File

@ -20,8 +20,8 @@ OpenTelemetry.Metrics.HistogramBuckets.Enumerator.Current.get -> OpenTelemetry.M
OpenTelemetry.Metrics.HistogramBuckets.Enumerator.Enumerator() -> void
OpenTelemetry.Metrics.HistogramBuckets.Enumerator.MoveNext() -> bool
OpenTelemetry.Metrics.HistogramBuckets.GetEnumerator() -> OpenTelemetry.Metrics.HistogramBuckets.Enumerator
OpenTelemetry.Metrics.MetricPoint.GetCounterSumDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetCounterSumLong() -> long
OpenTelemetry.Metrics.MetricPoint.GetSumDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetSumLong() -> long
OpenTelemetry.Metrics.MetricPoint.GetEndTime() -> System.DateTimeOffset
OpenTelemetry.Metrics.MetricPoint.GetGaugeLastValueDouble() -> double
OpenTelemetry.Metrics.MetricPoint.GetGaugeLastValueLong() -> long

4
src/OpenTelemetry/CHANGELOG.md
View File

@ -29,8 +29,8 @@
([#2666](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2666))
* Removed the public properties `LongValue`, `DoubleValue`, `StartTime`, and
`EndTime` in favor of their counterpart public methods `GetCounterSumLong`,
`GetCounterSumDouble`, `GetGaugeLastValueLong`, `GetGaugeLastValueDouble`,
`EndTime` in favor of their counterpart public methods `GetSumLong`,
`GetSumDouble`, `GetGaugeLastValueLong`, `GetGaugeLastValueDouble`,
`GetStartTime`, and `GetEndTime`.
([#2667](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2667))

8
src/OpenTelemetry/Metrics/MetricPoint.cs
View File

@ -76,7 +76,7 @@ namespace OpenTelemetry.Metrics
public DateTimeOffset GetEndTime() => this.EndTime;
public long GetCounterSumLong()
public long GetSumLong()
{
if (this.aggType == AggregationType.LongSumIncomingDelta || this.aggType == AggregationType.LongSumIncomingCumulative)
{
@ -84,11 +84,11 @@ namespace OpenTelemetry.Metrics
}
else
{
throw new NotSupportedException($"{nameof(this.GetCounterSumLong)} is not supported for this metric type.");
throw new NotSupportedException($"{nameof(this.GetSumLong)} is not supported for this metric type.");
}
}
public double GetCounterSumDouble()
public double GetSumDouble()
{
if (this.aggType == AggregationType.DoubleSumIncomingDelta || this.aggType == AggregationType.DoubleSumIncomingCumulative)
{
@ -96,7 +96,7 @@ namespace OpenTelemetry.Metrics
}
else
{
throw new NotSupportedException($"{nameof(this.GetCounterSumDouble)} is not supported for this metric type.");
throw new NotSupportedException($"{nameof(this.GetSumDouble)} is not supported for this metric type.");
}
}

4
test/Benchmarks/Metrics/MetricCollectBenchmarks.cs
View File

@ -71,7 +71,7 @@ namespace Benchmarks.Metrics
// The performant way of iterating.
foreach (ref var metricPoint in metric.GetMetricPoints())
{
sum += metricPoint.GetCounterSumDouble();
sum += metricPoint.GetSumDouble();
}
}
else
@ -80,7 +80,7 @@ namespace Benchmarks.Metrics
// This is still "correct", but less performant.
foreach (var metricPoint in metric.GetMetricPoints())
{
sum += metricPoint.GetCounterSumDouble();
sum += metricPoint.GetSumDouble();
}
}
}

6
test/OpenTelemetry.Tests/Metrics/InMemoryExporterTests.cs
View File

@ -49,7 +49,7 @@ namespace OpenTelemetry.Metrics.Tests
var metricPointsEnumerator = metric.GetMetricPoints().GetEnumerator();
Assert.True(metricPointsEnumerator.MoveNext()); // One MetricPoint is emitted for the Metric
ref var metricPointForFirstExport = ref metricPointsEnumerator.Current;
Assert.Equal(10, metricPointForFirstExport.GetCounterSumLong());
Assert.Equal(10, metricPointForFirstExport.GetSumLong());
// Emit 25 for the MetricPoint with a single key-vaue pair: ("tag1", "value1")
counter.Add(25, new KeyValuePair<string, object>("tag1", "value1"));
@ -60,10 +60,10 @@ namespace OpenTelemetry.Metrics.Tests
metricPointsEnumerator = metric.GetMetricPoints().GetEnumerator();
Assert.True(metricPointsEnumerator.MoveNext()); // One MetricPoint is emitted for the Metric
var metricPointForSecondExport = metricPointsEnumerator.Current;
Assert.Equal(25, metricPointForSecondExport.GetCounterSumLong());
Assert.Equal(25, metricPointForSecondExport.GetSumLong());
// MetricPoint.LongValue for the first exporter metric should still be 10
Assert.Equal(10, metricPointForFirstExport.GetCounterSumLong());
Assert.Equal(10, metricPointForFirstExport.GetSumLong());
}
}
}

4
test/OpenTelemetry.Tests/Metrics/MetricAPITest.cs
View File

@ -700,7 +700,7 @@ namespace OpenTelemetry.Metrics.Tests
{
if (metric.MetricType.IsSum())
{
sum += metricPoint.GetCounterSumLong();
sum += metricPoint.GetSumLong();
}
else
{
@ -721,7 +721,7 @@ namespace OpenTelemetry.Metrics.Tests
{
if (metric.MetricType.IsSum())
{
sum += metricPoint.GetCounterSumDouble();
sum += metricPoint.GetSumDouble();
}
else
{

2
test/OpenTelemetry.Tests/Metrics/MultipleReadersTests.cs
View File

@ -115,7 +115,7 @@ namespace OpenTelemetry.Metrics.Tests
ref var metricPointForFirstExport = ref metricPointsEnumerator.Current;
if (metric.MetricType.IsSum())
{
Assert.Equal(value, metricPointForFirstExport.GetCounterSumLong());
Assert.Equal(value, metricPointForFirstExport.GetSumLong());
}
else
{