diff --git a/build/Common.props b/build/Common.props index 47484919ec..3672da0751 100644 --- a/build/Common.props +++ b/build/Common.props @@ -33,7 +33,7 @@ [3.3.3] [1.1.1,2.0) [1.3.1,2.0) - [1.4.0-beta.2] + [1.4.0-beta.3] [2.1.58,3.0) [1.2.0-beta.435,2.0) diff --git a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md index 6196a7b3df..2176d34d85 100644 --- a/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md +++ b/src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Update OpenTelemetry to 1.4.0-beta.3 ([#774](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/774)) + ## 1.4.0-beta.4 Released 2022-Oct-28 diff --git a/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs b/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs index c02b5f6080..e056efa218 100644 --- a/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs +++ b/src/OpenTelemetry.Exporter.Geneva/Metrics/GenevaMetricExporter.cs @@ -203,10 +203,10 @@ public override ExportResult Export(in Batch batch) var count = Convert.ToUInt32(metricPoint.GetHistogramCount()); MetricData min = ulongZero; MetricData max = ulongZero; - if (metricPoint.HasMinMax()) + if (metricPoint.TryGetHistogramMinMaxValues(out var minValue, out var maxValue)) { - min = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMin()) }; - max = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMax()) }; + min = new MetricData { UInt64Value = Convert.ToUInt64(minValue) }; + max = new MetricData { UInt64Value = Convert.ToUInt64(maxValue) }; } var bodyLength = this.SerializeHistogramMetric( diff --git a/src/OpenTelemetry.Extensions/CHANGELOG.md b/src/OpenTelemetry.Extensions/CHANGELOG.md index 6ef75c6144..33a35b6a0b 100644 --- a/src/OpenTelemetry.Extensions/CHANGELOG.md +++ b/src/OpenTelemetry.Extensions/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Update OpenTelemetry to 1.4.0-beta.3 ([#774](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/774)) + ## 1.0.0-beta.3 Released 2022-Nov-09 diff --git a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md index 2d0a3bd796..7e09b9b5bd 100644 --- a/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +* Update OpenTelemetry API to 1.4.0-beta.3 ([#774](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/774)) + ## 1.0.0-alpha.1 Released 2022-Nov-14 diff --git a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md index beecf3ca90..2f80020074 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Runtime/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -* Update OTel API version to `1.4.0-beta.2`. +* Update OpenTelemetry API to 1.4.0-beta.3 ([#774](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/774)) * Change ObservableGauge to ObservableUpDownCounter for the below metrics (which better fit UpDownCounter semantics as they are additive.) diff --git a/test/OpenTelemetry.Exporter.Geneva.Benchmark/Exporter/MetricExporterBenchmarks.cs b/test/OpenTelemetry.Exporter.Geneva.Benchmark/Exporter/MetricExporterBenchmarks.cs index 037bca4755..ecadc44be7 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Benchmark/Exporter/MetricExporterBenchmarks.cs +++ b/test/OpenTelemetry.Exporter.Geneva.Benchmark/Exporter/MetricExporterBenchmarks.cs @@ -329,10 +329,10 @@ private MetricPoint GenerateHistogramMetricItemWith3Dimensions(out MetricData su min = new MetricData { UInt64Value = 0 }; max = new MetricData { UInt64Value = 0 }; - if (metricPoint.HasMinMax()) + if (metricPoint.TryGetHistogramMinMaxValues(out var minValue, out var maxValue)) { - min = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMin()) }; - max = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMax()) }; + min = new MetricData { UInt64Value = Convert.ToUInt64(minValue) }; + max = new MetricData { UInt64Value = Convert.ToUInt64(maxValue) }; } return metricPoint; @@ -379,10 +379,10 @@ private MetricPoint GenerateHistogramMetricItemWith4Dimensions(out MetricData su min = new MetricData { UInt64Value = 0 }; max = new MetricData { UInt64Value = 0 }; - if (metricPoint.HasMinMax()) + if (metricPoint.TryGetHistogramMinMaxValues(out var minValue, out var maxValue)) { - min = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMin()) }; - max = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramMax()) }; + min = new MetricData { UInt64Value = Convert.ToUInt64(minValue) }; + max = new MetricData { UInt64Value = Convert.ToUInt64(maxValue) }; } return metricPoint; diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs index 4e5f841e6d..5448566160 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs +++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs @@ -730,18 +730,13 @@ private void CheckSerializationForSingleMetricPoint(Metric metric, GenevaMetricE var sum = new MetricData { UInt64Value = Convert.ToUInt64(metricPoint.GetHistogramSum()) }; var count = Convert.ToUInt32(metricPoint.GetHistogramCount()); - ulong minValue = 0; - ulong maxValue = 0; var min = new MetricData { UInt64Value = 0 }; var max = new MetricData { UInt64Value = 0 }; - if (metricPoint.HasMinMax()) + if (metricPoint.TryGetHistogramMinMaxValues(out var minValue, out var maxValue)) { - minValue = Convert.ToUInt64(metricPoint.GetHistogramMin()); - maxValue = Convert.ToUInt64(metricPoint.GetHistogramMax()); - - min = new MetricData { UInt64Value = minValue }; - max = new MetricData { UInt64Value = maxValue }; + min = new MetricData { UInt64Value = Convert.ToUInt64(minValue) }; + max = new MetricData { UInt64Value = Convert.ToUInt64(maxValue) }; } var bodyLength = exporter.SerializeHistogramMetric(