From a0598b75d29e4e53194b8c9a18944e667d9ae8b5 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Nov 2024 16:33:28 -0800 Subject: [PATCH 1/2] update proto 1.4.0 --- .../src/proto/opentelemetry-proto | 2 +- .../tonic/opentelemetry.proto.metrics.v1.rs | 27 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/opentelemetry-proto/src/proto/opentelemetry-proto b/opentelemetry-proto/src/proto/opentelemetry-proto index 40b3c1b746..0adf6aac00 160000 --- a/opentelemetry-proto/src/proto/opentelemetry-proto +++ b/opentelemetry-proto/src/proto/opentelemetry-proto @@ -1 +1 @@ -Subproject commit 40b3c1b746767cbc13c2e39da3eaf1a23e54ffdd +Subproject commit 0adf6aac004578b28267394514b2e55ee9cc012f diff --git a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs index 0c2200ae41..66e316689d 100644 --- a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs +++ b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs @@ -3,6 +3,24 @@ /// storage, OR can be embedded by other protocols that transfer OTLP metrics /// data but do not implement the OTLP protocol. /// +/// MetricsData +/// └─── ResourceMetrics +/// ├── Resource +/// ├── SchemaURL +/// └── ScopeMetrics +/// ├── Scope +/// ├── SchemaURL +/// └── Metric +/// ├── Name +/// ├── Description +/// ├── Unit +/// └── data +/// ├── Gauge +/// ├── Sum +/// ├── Histogram +/// ├── ExponentialHistogram +/// └── Summary +/// /// The main difference between this message and collector protocol is that /// in this message there will not be any "control" or "metadata" specific to /// OTLP protocol. @@ -71,7 +89,6 @@ pub struct ScopeMetrics { /// /// /// -/// /// The data model and relation between entities is shown in the /// diagram below. Here, "DataPoint" is the term used to refer to any /// one of the specific data point value types, and "points" is the term used @@ -83,7 +100,7 @@ pub struct ScopeMetrics { /// - DataPoint contains timestamps, attributes, and one of the possible value type /// fields. /// -/// Metric +/// Metric /// +------------+ /// |name | /// |description | @@ -277,6 +294,9 @@ pub struct ExponentialHistogram { /// data type. These data points cannot always be merged in a meaningful way. /// While they can be useful in some applications, histogram data points are /// recommended for new applications. +/// Summary metrics do not have an aggregation temporality field. This is +/// because the count and sum fields of a SummaryDataPoint are assumed to be +/// cumulative values. #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))] #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))] @@ -587,7 +607,8 @@ pub mod exponential_histogram_data_point { } } /// SummaryDataPoint is a single data point in a timeseries that describes the -/// time-varying values of a Summary metric. +/// time-varying values of a Summary metric. The count and sum fields represent +/// cumulative values. #[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))] #[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))] From 7d76679c239945b8626f9a5e713f466b1c6093a4 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 20 Nov 2024 16:39:46 -0800 Subject: [PATCH 2/2] add changelog --- opentelemetry-proto/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md index bc5fdb454f..e4734a7479 100644 --- a/opentelemetry-proto/CHANGELOG.md +++ b/opentelemetry-proto/CHANGELOG.md @@ -2,6 +2,9 @@ ## vNext +- Update proto definitions to v1.4.0 [#2315](https://github.com/open-telemetry/opentelemetry-rust/pull/2315) + + ## 0.27.0 Released 2024-Nov-11