diff --git a/opentelemetry-otlp/src/proto/grpcio/common.rs b/opentelemetry-otlp/src/proto/grpcio/common.rs index 8359c4a928..0dde05ad18 100644 --- a/opentelemetry-otlp/src/proto/grpcio/common.rs +++ b/opentelemetry-otlp/src/proto/grpcio/common.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] @@ -1488,12 +1488,12 @@ static file_descriptor_proto_data: &'static [u8] = b"\ lues\x18\x01\x20\x03(\x0b2'.opentelemetry.proto.common.v1.KeyValueR\x06v\ alues\"[\n\x08KeyValue\x12\x10\n\x03key\x18\x01\x20\x01(\tR\x03key\x12=\ \n\x05value\x18\x02\x20\x01(\x0b2'.opentelemetry.proto.common.v1.AnyValu\ - eR\x05value\"8\n\x0eStringKeyValue\x12\x10\n\x03key\x18\x01\x20\x01(\tR\ - \x03key\x12\x14\n\x05value\x18\x02\x20\x01(\tR\x05value\"F\n\x16Instrume\ - ntationLibrary\x12\x12\n\x04name\x18\x01\x20\x01(\tR\x04name\x12\x18\n\ - \x07version\x18\x02\x20\x01(\tR\x07versionBq\n\x20io.opentelemetry.proto\ - .common.v1B\x0bCommonProtoP\x01Z>github.com/open-telemetry/opentelemetry\ - -proto/gen/go/common/v1b\x06proto3\ + eR\x05value\"<\n\x0eStringKeyValue\x12\x10\n\x03key\x18\x01\x20\x01(\tR\ + \x03key\x12\x14\n\x05value\x18\x02\x20\x01(\tR\x05value:\x02\x18\x01\"F\ + \n\x16InstrumentationLibrary\x12\x12\n\x04name\x18\x01\x20\x01(\tR\x04na\ + me\x12\x18\n\x07version\x18\x02\x20\x01(\tR\x07versionBq\n\x20io.opentel\ + emetry.proto.common.v1B\x0bCommonProtoP\x01Z>github.com/open-telemetry/o\ + pentelemetry-proto/gen/go/common/v1b\x06proto3\ "; static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT; diff --git a/opentelemetry-otlp/src/proto/grpcio/metrics.rs b/opentelemetry-otlp/src/proto/grpcio/metrics.rs index c668654f17..1e93bd17fd 100644 --- a/opentelemetry-otlp/src/proto/grpcio/metrics.rs +++ b/opentelemetry-otlp/src/proto/grpcio/metrics.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] @@ -501,12 +501,12 @@ impl<'a> ::std::default::Default for &'a Metric { #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] pub enum Metric_oneof_data { int_gauge(IntGauge), - double_gauge(DoubleGauge), + gauge(Gauge), int_sum(IntSum), - double_sum(DoubleSum), + sum(Sum), int_histogram(IntHistogram), - double_histogram(DoubleHistogram), - double_summary(DoubleSummary), + histogram(Histogram), + summary(Summary), } impl Metric { @@ -641,52 +641,52 @@ impl Metric { } } - // .opentelemetry.proto.metrics.v1.DoubleGauge double_gauge = 5; + // .opentelemetry.proto.metrics.v1.Gauge gauge = 5; - pub fn get_double_gauge(&self) -> &DoubleGauge { + pub fn get_gauge(&self) -> &Gauge { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_gauge(ref v)) => v, - _ => ::default_instance(), + ::std::option::Option::Some(Metric_oneof_data::gauge(ref v)) => v, + _ => ::default_instance(), } } - pub fn clear_double_gauge(&mut self) { + pub fn clear_gauge(&mut self) { self.data = ::std::option::Option::None; } - pub fn has_double_gauge(&self) -> bool { + pub fn has_gauge(&self) -> bool { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_gauge(..)) => true, + ::std::option::Option::Some(Metric_oneof_data::gauge(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_double_gauge(&mut self, v: DoubleGauge) { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_gauge(v)) + pub fn set_gauge(&mut self, v: Gauge) { + self.data = ::std::option::Option::Some(Metric_oneof_data::gauge(v)) } // Mutable pointer to the field. - pub fn mut_double_gauge(&mut self) -> &mut DoubleGauge { - if let ::std::option::Option::Some(Metric_oneof_data::double_gauge(_)) = self.data { + pub fn mut_gauge(&mut self) -> &mut Gauge { + if let ::std::option::Option::Some(Metric_oneof_data::gauge(_)) = self.data { } else { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_gauge(DoubleGauge::new())); + self.data = ::std::option::Option::Some(Metric_oneof_data::gauge(Gauge::new())); } match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_gauge(ref mut v)) => v, + ::std::option::Option::Some(Metric_oneof_data::gauge(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_double_gauge(&mut self) -> DoubleGauge { - if self.has_double_gauge() { + pub fn take_gauge(&mut self) -> Gauge { + if self.has_gauge() { match self.data.take() { - ::std::option::Option::Some(Metric_oneof_data::double_gauge(v)) => v, + ::std::option::Option::Some(Metric_oneof_data::gauge(v)) => v, _ => panic!(), } } else { - DoubleGauge::new() + Gauge::new() } } @@ -739,52 +739,52 @@ impl Metric { } } - // .opentelemetry.proto.metrics.v1.DoubleSum double_sum = 7; + // .opentelemetry.proto.metrics.v1.Sum sum = 7; - pub fn get_double_sum(&self) -> &DoubleSum { + pub fn get_sum(&self) -> &Sum { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_sum(ref v)) => v, - _ => ::default_instance(), + ::std::option::Option::Some(Metric_oneof_data::sum(ref v)) => v, + _ => ::default_instance(), } } - pub fn clear_double_sum(&mut self) { + pub fn clear_sum(&mut self) { self.data = ::std::option::Option::None; } - pub fn has_double_sum(&self) -> bool { + pub fn has_sum(&self) -> bool { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_sum(..)) => true, + ::std::option::Option::Some(Metric_oneof_data::sum(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_double_sum(&mut self, v: DoubleSum) { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_sum(v)) + pub fn set_sum(&mut self, v: Sum) { + self.data = ::std::option::Option::Some(Metric_oneof_data::sum(v)) } // Mutable pointer to the field. - pub fn mut_double_sum(&mut self) -> &mut DoubleSum { - if let ::std::option::Option::Some(Metric_oneof_data::double_sum(_)) = self.data { + pub fn mut_sum(&mut self) -> &mut Sum { + if let ::std::option::Option::Some(Metric_oneof_data::sum(_)) = self.data { } else { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_sum(DoubleSum::new())); + self.data = ::std::option::Option::Some(Metric_oneof_data::sum(Sum::new())); } match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_sum(ref mut v)) => v, + ::std::option::Option::Some(Metric_oneof_data::sum(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_double_sum(&mut self) -> DoubleSum { - if self.has_double_sum() { + pub fn take_sum(&mut self) -> Sum { + if self.has_sum() { match self.data.take() { - ::std::option::Option::Some(Metric_oneof_data::double_sum(v)) => v, + ::std::option::Option::Some(Metric_oneof_data::sum(v)) => v, _ => panic!(), } } else { - DoubleSum::new() + Sum::new() } } @@ -837,101 +837,101 @@ impl Metric { } } - // .opentelemetry.proto.metrics.v1.DoubleHistogram double_histogram = 9; + // .opentelemetry.proto.metrics.v1.Histogram histogram = 9; - pub fn get_double_histogram(&self) -> &DoubleHistogram { + pub fn get_histogram(&self) -> &Histogram { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_histogram(ref v)) => v, - _ => ::default_instance(), + ::std::option::Option::Some(Metric_oneof_data::histogram(ref v)) => v, + _ => ::default_instance(), } } - pub fn clear_double_histogram(&mut self) { + pub fn clear_histogram(&mut self) { self.data = ::std::option::Option::None; } - pub fn has_double_histogram(&self) -> bool { + pub fn has_histogram(&self) -> bool { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_histogram(..)) => true, + ::std::option::Option::Some(Metric_oneof_data::histogram(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_double_histogram(&mut self, v: DoubleHistogram) { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_histogram(v)) + pub fn set_histogram(&mut self, v: Histogram) { + self.data = ::std::option::Option::Some(Metric_oneof_data::histogram(v)) } // Mutable pointer to the field. - pub fn mut_double_histogram(&mut self) -> &mut DoubleHistogram { - if let ::std::option::Option::Some(Metric_oneof_data::double_histogram(_)) = self.data { + pub fn mut_histogram(&mut self) -> &mut Histogram { + if let ::std::option::Option::Some(Metric_oneof_data::histogram(_)) = self.data { } else { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_histogram(DoubleHistogram::new())); + self.data = ::std::option::Option::Some(Metric_oneof_data::histogram(Histogram::new())); } match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_histogram(ref mut v)) => v, + ::std::option::Option::Some(Metric_oneof_data::histogram(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_double_histogram(&mut self) -> DoubleHistogram { - if self.has_double_histogram() { + pub fn take_histogram(&mut self) -> Histogram { + if self.has_histogram() { match self.data.take() { - ::std::option::Option::Some(Metric_oneof_data::double_histogram(v)) => v, + ::std::option::Option::Some(Metric_oneof_data::histogram(v)) => v, _ => panic!(), } } else { - DoubleHistogram::new() + Histogram::new() } } - // .opentelemetry.proto.metrics.v1.DoubleSummary double_summary = 11; + // .opentelemetry.proto.metrics.v1.Summary summary = 11; - pub fn get_double_summary(&self) -> &DoubleSummary { + pub fn get_summary(&self) -> &Summary { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_summary(ref v)) => v, - _ => ::default_instance(), + ::std::option::Option::Some(Metric_oneof_data::summary(ref v)) => v, + _ => ::default_instance(), } } - pub fn clear_double_summary(&mut self) { + pub fn clear_summary(&mut self) { self.data = ::std::option::Option::None; } - pub fn has_double_summary(&self) -> bool { + pub fn has_summary(&self) -> bool { match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_summary(..)) => true, + ::std::option::Option::Some(Metric_oneof_data::summary(..)) => true, _ => false, } } // Param is passed by value, moved - pub fn set_double_summary(&mut self, v: DoubleSummary) { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_summary(v)) + pub fn set_summary(&mut self, v: Summary) { + self.data = ::std::option::Option::Some(Metric_oneof_data::summary(v)) } // Mutable pointer to the field. - pub fn mut_double_summary(&mut self) -> &mut DoubleSummary { - if let ::std::option::Option::Some(Metric_oneof_data::double_summary(_)) = self.data { + pub fn mut_summary(&mut self) -> &mut Summary { + if let ::std::option::Option::Some(Metric_oneof_data::summary(_)) = self.data { } else { - self.data = ::std::option::Option::Some(Metric_oneof_data::double_summary(DoubleSummary::new())); + self.data = ::std::option::Option::Some(Metric_oneof_data::summary(Summary::new())); } match self.data { - ::std::option::Option::Some(Metric_oneof_data::double_summary(ref mut v)) => v, + ::std::option::Option::Some(Metric_oneof_data::summary(ref mut v)) => v, _ => panic!(), } } // Take field - pub fn take_double_summary(&mut self) -> DoubleSummary { - if self.has_double_summary() { + pub fn take_summary(&mut self) -> Summary { + if self.has_summary() { match self.data.take() { - ::std::option::Option::Some(Metric_oneof_data::double_summary(v)) => v, + ::std::option::Option::Some(Metric_oneof_data::summary(v)) => v, _ => panic!(), } } else { - DoubleSummary::new() + Summary::new() } } } @@ -943,7 +943,7 @@ impl ::protobuf::Message for Metric { return false; } } - if let Some(Metric_oneof_data::double_gauge(ref v)) = self.data { + if let Some(Metric_oneof_data::gauge(ref v)) = self.data { if !v.is_initialized() { return false; } @@ -953,7 +953,7 @@ impl ::protobuf::Message for Metric { return false; } } - if let Some(Metric_oneof_data::double_sum(ref v)) = self.data { + if let Some(Metric_oneof_data::sum(ref v)) = self.data { if !v.is_initialized() { return false; } @@ -963,12 +963,12 @@ impl ::protobuf::Message for Metric { return false; } } - if let Some(Metric_oneof_data::double_histogram(ref v)) = self.data { + if let Some(Metric_oneof_data::histogram(ref v)) = self.data { if !v.is_initialized() { return false; } } - if let Some(Metric_oneof_data::double_summary(ref v)) = self.data { + if let Some(Metric_oneof_data::summary(ref v)) = self.data { if !v.is_initialized() { return false; } @@ -999,7 +999,7 @@ impl ::protobuf::Message for Metric { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.data = ::std::option::Option::Some(Metric_oneof_data::double_gauge(is.read_message()?)); + self.data = ::std::option::Option::Some(Metric_oneof_data::gauge(is.read_message()?)); }, 6 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { @@ -1011,7 +1011,7 @@ impl ::protobuf::Message for Metric { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.data = ::std::option::Option::Some(Metric_oneof_data::double_sum(is.read_message()?)); + self.data = ::std::option::Option::Some(Metric_oneof_data::sum(is.read_message()?)); }, 8 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { @@ -1023,13 +1023,13 @@ impl ::protobuf::Message for Metric { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.data = ::std::option::Option::Some(Metric_oneof_data::double_histogram(is.read_message()?)); + self.data = ::std::option::Option::Some(Metric_oneof_data::histogram(is.read_message()?)); }, 11 => { if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - self.data = ::std::option::Option::Some(Metric_oneof_data::double_summary(is.read_message()?)); + self.data = ::std::option::Option::Some(Metric_oneof_data::summary(is.read_message()?)); }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -1058,7 +1058,7 @@ impl ::protobuf::Message for Metric { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &Metric_oneof_data::double_gauge(ref v) => { + &Metric_oneof_data::gauge(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, @@ -1066,7 +1066,7 @@ impl ::protobuf::Message for Metric { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &Metric_oneof_data::double_sum(ref v) => { + &Metric_oneof_data::sum(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, @@ -1074,11 +1074,11 @@ impl ::protobuf::Message for Metric { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &Metric_oneof_data::double_histogram(ref v) => { + &Metric_oneof_data::histogram(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, - &Metric_oneof_data::double_summary(ref v) => { + &Metric_oneof_data::summary(ref v) => { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }, @@ -1106,7 +1106,7 @@ impl ::protobuf::Message for Metric { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &Metric_oneof_data::double_gauge(ref v) => { + &Metric_oneof_data::gauge(ref v) => { os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -1116,7 +1116,7 @@ impl ::protobuf::Message for Metric { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &Metric_oneof_data::double_sum(ref v) => { + &Metric_oneof_data::sum(ref v) => { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -1126,12 +1126,12 @@ impl ::protobuf::Message for Metric { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &Metric_oneof_data::double_histogram(ref v) => { + &Metric_oneof_data::histogram(ref v) => { os.write_tag(9, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }, - &Metric_oneof_data::double_summary(ref v) => { + &Metric_oneof_data::summary(ref v) => { os.write_tag(11, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -1196,35 +1196,35 @@ impl ::protobuf::Message for Metric { Metric::has_int_gauge, Metric::get_int_gauge, )); - fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, DoubleGauge>( - "double_gauge", - Metric::has_double_gauge, - Metric::get_double_gauge, + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, Gauge>( + "gauge", + Metric::has_gauge, + Metric::get_gauge, )); fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, IntSum>( "int_sum", Metric::has_int_sum, Metric::get_int_sum, )); - fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, DoubleSum>( - "double_sum", - Metric::has_double_sum, - Metric::get_double_sum, + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, Sum>( + "sum", + Metric::has_sum, + Metric::get_sum, )); fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, IntHistogram>( "int_histogram", Metric::has_int_histogram, Metric::get_int_histogram, )); - fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, DoubleHistogram>( - "double_histogram", - Metric::has_double_histogram, - Metric::get_double_histogram, + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, Histogram>( + "histogram", + Metric::has_histogram, + Metric::get_histogram, )); - fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, DoubleSummary>( - "double_summary", - Metric::has_double_summary, - Metric::get_double_summary, + fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, Summary>( + "summary", + Metric::has_summary, + Metric::get_summary, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Metric", @@ -1439,9 +1439,9 @@ impl ::protobuf::reflect::ProtobufValue for IntGauge { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleGauge { +pub struct Gauge { // message fields - pub data_points: ::protobuf::RepeatedField, + pub data_points: ::protobuf::RepeatedField, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -1449,21 +1449,21 @@ pub struct DoubleGauge { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleGauge { - fn default() -> &'a DoubleGauge { - ::default_instance() +impl<'a> ::std::default::Default for &'a Gauge { + fn default() -> &'a Gauge { + ::default_instance() } } -impl DoubleGauge { - pub fn new() -> DoubleGauge { +impl Gauge { + pub fn new() -> Gauge { ::std::default::Default::default() } - // repeated .opentelemetry.proto.metrics.v1.DoubleDataPoint data_points = 1; + // repeated .opentelemetry.proto.metrics.v1.NumberDataPoint data_points = 1; - pub fn get_data_points(&self) -> &[DoubleDataPoint] { + pub fn get_data_points(&self) -> &[NumberDataPoint] { &self.data_points } pub fn clear_data_points(&mut self) { @@ -1471,22 +1471,22 @@ impl DoubleGauge { } // Param is passed by value, moved - pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { self.data_points = v; } // Mutable pointer to the field. - pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.data_points } // Take field - pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { + pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.data_points, ::protobuf::RepeatedField::new()) } } -impl ::protobuf::Message for DoubleGauge { +impl ::protobuf::Message for Gauge { fn is_initialized(&self) -> bool { for v in &self.data_points { if !v.is_initialized() { @@ -1560,47 +1560,47 @@ impl ::protobuf::Message for DoubleGauge { Self::descriptor_static() } - fn new() -> DoubleGauge { - DoubleGauge::new() + fn new() -> Gauge { + Gauge::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "data_points", - |m: &DoubleGauge| { &m.data_points }, - |m: &mut DoubleGauge| { &mut m.data_points }, + |m: &Gauge| { &m.data_points }, + |m: &mut Gauge| { &mut m.data_points }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleGauge", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "Gauge", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleGauge { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleGauge::new) + fn default_instance() -> &'static Gauge { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(Gauge::new) } } -impl ::protobuf::Clear for DoubleGauge { +impl ::protobuf::Clear for Gauge { fn clear(&mut self) { self.data_points.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for DoubleGauge { +impl ::std::fmt::Debug for Gauge { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleGauge { +impl ::protobuf::reflect::ProtobufValue for Gauge { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -1843,9 +1843,9 @@ impl ::protobuf::reflect::ProtobufValue for IntSum { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleSum { +pub struct Sum { // message fields - pub data_points: ::protobuf::RepeatedField, + pub data_points: ::protobuf::RepeatedField, pub aggregation_temporality: AggregationTemporality, pub is_monotonic: bool, // special fields @@ -1855,21 +1855,21 @@ pub struct DoubleSum { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleSum { - fn default() -> &'a DoubleSum { - ::default_instance() +impl<'a> ::std::default::Default for &'a Sum { + fn default() -> &'a Sum { + ::default_instance() } } -impl DoubleSum { - pub fn new() -> DoubleSum { +impl Sum { + pub fn new() -> Sum { ::std::default::Default::default() } - // repeated .opentelemetry.proto.metrics.v1.DoubleDataPoint data_points = 1; + // repeated .opentelemetry.proto.metrics.v1.NumberDataPoint data_points = 1; - pub fn get_data_points(&self) -> &[DoubleDataPoint] { + pub fn get_data_points(&self) -> &[NumberDataPoint] { &self.data_points } pub fn clear_data_points(&mut self) { @@ -1877,17 +1877,17 @@ impl DoubleSum { } // Param is passed by value, moved - pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { self.data_points = v; } // Mutable pointer to the field. - pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.data_points } // Take field - pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { + pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.data_points, ::protobuf::RepeatedField::new()) } @@ -1922,7 +1922,7 @@ impl DoubleSum { } } -impl ::protobuf::Message for DoubleSum { +impl ::protobuf::Message for Sum { fn is_initialized(&self) -> bool { for v in &self.data_points { if !v.is_initialized() { @@ -2018,44 +2018,44 @@ impl ::protobuf::Message for DoubleSum { Self::descriptor_static() } - fn new() -> DoubleSum { - DoubleSum::new() + fn new() -> Sum { + Sum::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "data_points", - |m: &DoubleSum| { &m.data_points }, - |m: &mut DoubleSum| { &mut m.data_points }, + |m: &Sum| { &m.data_points }, + |m: &mut Sum| { &mut m.data_points }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( "aggregation_temporality", - |m: &DoubleSum| { &m.aggregation_temporality }, - |m: &mut DoubleSum| { &mut m.aggregation_temporality }, + |m: &Sum| { &m.aggregation_temporality }, + |m: &mut Sum| { &mut m.aggregation_temporality }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBool>( "is_monotonic", - |m: &DoubleSum| { &m.is_monotonic }, - |m: &mut DoubleSum| { &mut m.is_monotonic }, + |m: &Sum| { &m.is_monotonic }, + |m: &mut Sum| { &mut m.is_monotonic }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleSum", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "Sum", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleSum { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleSum::new) + fn default_instance() -> &'static Sum { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(Sum::new) } } -impl ::protobuf::Clear for DoubleSum { +impl ::protobuf::Clear for Sum { fn clear(&mut self) { self.data_points.clear(); self.aggregation_temporality = AggregationTemporality::AGGREGATION_TEMPORALITY_UNSPECIFIED; @@ -2064,13 +2064,13 @@ impl ::protobuf::Clear for DoubleSum { } } -impl ::std::fmt::Debug for DoubleSum { +impl ::std::fmt::Debug for Sum { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleSum { +impl ::protobuf::reflect::ProtobufValue for Sum { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -2278,9 +2278,9 @@ impl ::protobuf::reflect::ProtobufValue for IntHistogram { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleHistogram { +pub struct Histogram { // message fields - pub data_points: ::protobuf::RepeatedField, + pub data_points: ::protobuf::RepeatedField, pub aggregation_temporality: AggregationTemporality, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] @@ -2289,21 +2289,21 @@ pub struct DoubleHistogram { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleHistogram { - fn default() -> &'a DoubleHistogram { - ::default_instance() +impl<'a> ::std::default::Default for &'a Histogram { + fn default() -> &'a Histogram { + ::default_instance() } } -impl DoubleHistogram { - pub fn new() -> DoubleHistogram { +impl Histogram { + pub fn new() -> Histogram { ::std::default::Default::default() } - // repeated .opentelemetry.proto.metrics.v1.DoubleHistogramDataPoint data_points = 1; + // repeated .opentelemetry.proto.metrics.v1.HistogramDataPoint data_points = 1; - pub fn get_data_points(&self) -> &[DoubleHistogramDataPoint] { + pub fn get_data_points(&self) -> &[HistogramDataPoint] { &self.data_points } pub fn clear_data_points(&mut self) { @@ -2311,17 +2311,17 @@ impl DoubleHistogram { } // Param is passed by value, moved - pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { self.data_points = v; } // Mutable pointer to the field. - pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.data_points } // Take field - pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { + pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.data_points, ::protobuf::RepeatedField::new()) } @@ -2341,7 +2341,7 @@ impl DoubleHistogram { } } -impl ::protobuf::Message for DoubleHistogram { +impl ::protobuf::Message for Histogram { fn is_initialized(&self) -> bool { for v in &self.data_points { if !v.is_initialized() { @@ -2424,39 +2424,39 @@ impl ::protobuf::Message for DoubleHistogram { Self::descriptor_static() } - fn new() -> DoubleHistogram { - DoubleHistogram::new() + fn new() -> Histogram { + Histogram::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "data_points", - |m: &DoubleHistogram| { &m.data_points }, - |m: &mut DoubleHistogram| { &mut m.data_points }, + |m: &Histogram| { &m.data_points }, + |m: &mut Histogram| { &mut m.data_points }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( "aggregation_temporality", - |m: &DoubleHistogram| { &m.aggregation_temporality }, - |m: &mut DoubleHistogram| { &mut m.aggregation_temporality }, + |m: &Histogram| { &m.aggregation_temporality }, + |m: &mut Histogram| { &mut m.aggregation_temporality }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleHistogram", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "Histogram", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleHistogram { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleHistogram::new) + fn default_instance() -> &'static Histogram { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(Histogram::new) } } -impl ::protobuf::Clear for DoubleHistogram { +impl ::protobuf::Clear for Histogram { fn clear(&mut self) { self.data_points.clear(); self.aggregation_temporality = AggregationTemporality::AGGREGATION_TEMPORALITY_UNSPECIFIED; @@ -2464,13 +2464,13 @@ impl ::protobuf::Clear for DoubleHistogram { } } -impl ::std::fmt::Debug for DoubleHistogram { +impl ::std::fmt::Debug for Histogram { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleHistogram { +impl ::protobuf::reflect::ProtobufValue for Histogram { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -2478,9 +2478,9 @@ impl ::protobuf::reflect::ProtobufValue for DoubleHistogram { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleSummary { +pub struct Summary { // message fields - pub data_points: ::protobuf::RepeatedField, + pub data_points: ::protobuf::RepeatedField, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -2488,21 +2488,21 @@ pub struct DoubleSummary { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleSummary { - fn default() -> &'a DoubleSummary { - ::default_instance() +impl<'a> ::std::default::Default for &'a Summary { + fn default() -> &'a Summary { + ::default_instance() } } -impl DoubleSummary { - pub fn new() -> DoubleSummary { +impl Summary { + pub fn new() -> Summary { ::std::default::Default::default() } - // repeated .opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint data_points = 1; + // repeated .opentelemetry.proto.metrics.v1.SummaryDataPoint data_points = 1; - pub fn get_data_points(&self) -> &[DoubleSummaryDataPoint] { + pub fn get_data_points(&self) -> &[SummaryDataPoint] { &self.data_points } pub fn clear_data_points(&mut self) { @@ -2510,22 +2510,22 @@ impl DoubleSummary { } // Param is passed by value, moved - pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_data_points(&mut self, v: ::protobuf::RepeatedField) { self.data_points = v; } // Mutable pointer to the field. - pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_data_points(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.data_points } // Take field - pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { + pub fn take_data_points(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.data_points, ::protobuf::RepeatedField::new()) } } -impl ::protobuf::Message for DoubleSummary { +impl ::protobuf::Message for Summary { fn is_initialized(&self) -> bool { for v in &self.data_points { if !v.is_initialized() { @@ -2599,47 +2599,47 @@ impl ::protobuf::Message for DoubleSummary { Self::descriptor_static() } - fn new() -> DoubleSummary { - DoubleSummary::new() + fn new() -> Summary { + Summary::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "data_points", - |m: &DoubleSummary| { &m.data_points }, - |m: &mut DoubleSummary| { &mut m.data_points }, + |m: &Summary| { &m.data_points }, + |m: &mut Summary| { &mut m.data_points }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleSummary", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "Summary", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleSummary { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleSummary::new) + fn default_instance() -> &'static Summary { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(Summary::new) } } -impl ::protobuf::Clear for DoubleSummary { +impl ::protobuf::Clear for Summary { fn clear(&mut self) { self.data_points.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for DoubleSummary { +impl ::std::fmt::Debug for Summary { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleSummary { +impl ::protobuf::reflect::ProtobufValue for Summary { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -2970,13 +2970,15 @@ impl ::protobuf::reflect::ProtobufValue for IntDataPoint { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleDataPoint { +pub struct NumberDataPoint { // message fields + pub attributes: ::protobuf::RepeatedField, pub labels: ::protobuf::RepeatedField, pub start_time_unix_nano: u64, pub time_unix_nano: u64, - pub value: f64, - pub exemplars: ::protobuf::RepeatedField, + pub exemplars: ::protobuf::RepeatedField, + // message oneof groups + pub value: ::std::option::Option, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -2984,17 +2986,49 @@ pub struct DoubleDataPoint { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleDataPoint { - fn default() -> &'a DoubleDataPoint { - ::default_instance() +impl<'a> ::std::default::Default for &'a NumberDataPoint { + fn default() -> &'a NumberDataPoint { + ::default_instance() } } -impl DoubleDataPoint { - pub fn new() -> DoubleDataPoint { +#[derive(Clone,PartialEq,Debug)] +#[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] +pub enum NumberDataPoint_oneof_value { + as_double(f64), + as_int(i64), +} + +impl NumberDataPoint { + pub fn new() -> NumberDataPoint { ::std::default::Default::default() } + // repeated .opentelemetry.proto.common.v1.KeyValue attributes = 7; + + + pub fn get_attributes(&self) -> &[super::common::KeyValue] { + &self.attributes + } + pub fn clear_attributes(&mut self) { + self.attributes.clear(); + } + + // Param is passed by value, moved + pub fn set_attributes(&mut self, v: ::protobuf::RepeatedField) { + self.attributes = v; + } + + // Mutable pointer to the field. + pub fn mut_attributes(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.attributes + } + + // Take field + pub fn take_attributes(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.attributes, ::protobuf::RepeatedField::new()) + } + // repeated .opentelemetry.proto.common.v1.StringKeyValue labels = 1; @@ -3050,25 +3084,60 @@ impl DoubleDataPoint { self.time_unix_nano = v; } - // double value = 4; + // double as_double = 4; - pub fn get_value(&self) -> f64 { - self.value + pub fn get_as_double(&self) -> f64 { + match self.value { + ::std::option::Option::Some(NumberDataPoint_oneof_value::as_double(v)) => v, + _ => 0., + } } - pub fn clear_value(&mut self) { - self.value = 0.; + pub fn clear_as_double(&mut self) { + self.value = ::std::option::Option::None; + } + + pub fn has_as_double(&self) -> bool { + match self.value { + ::std::option::Option::Some(NumberDataPoint_oneof_value::as_double(..)) => true, + _ => false, + } } // Param is passed by value, moved - pub fn set_value(&mut self, v: f64) { - self.value = v; + pub fn set_as_double(&mut self, v: f64) { + self.value = ::std::option::Option::Some(NumberDataPoint_oneof_value::as_double(v)) + } + + // sfixed64 as_int = 6; + + + pub fn get_as_int(&self) -> i64 { + match self.value { + ::std::option::Option::Some(NumberDataPoint_oneof_value::as_int(v)) => v, + _ => 0, + } + } + pub fn clear_as_int(&mut self) { + self.value = ::std::option::Option::None; + } + + pub fn has_as_int(&self) -> bool { + match self.value { + ::std::option::Option::Some(NumberDataPoint_oneof_value::as_int(..)) => true, + _ => false, + } + } + + // Param is passed by value, moved + pub fn set_as_int(&mut self, v: i64) { + self.value = ::std::option::Option::Some(NumberDataPoint_oneof_value::as_int(v)) } - // repeated .opentelemetry.proto.metrics.v1.DoubleExemplar exemplars = 5; + // repeated .opentelemetry.proto.metrics.v1.Exemplar exemplars = 5; - pub fn get_exemplars(&self) -> &[DoubleExemplar] { + pub fn get_exemplars(&self) -> &[Exemplar] { &self.exemplars } pub fn clear_exemplars(&mut self) { @@ -3076,23 +3145,28 @@ impl DoubleDataPoint { } // Param is passed by value, moved - pub fn set_exemplars(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_exemplars(&mut self, v: ::protobuf::RepeatedField) { self.exemplars = v; } // Mutable pointer to the field. - pub fn mut_exemplars(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_exemplars(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.exemplars } // Take field - pub fn take_exemplars(&mut self) -> ::protobuf::RepeatedField { + pub fn take_exemplars(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.exemplars, ::protobuf::RepeatedField::new()) } } -impl ::protobuf::Message for DoubleDataPoint { +impl ::protobuf::Message for NumberDataPoint { fn is_initialized(&self) -> bool { + for v in &self.attributes { + if !v.is_initialized() { + return false; + } + }; for v in &self.labels { if !v.is_initialized() { return false; @@ -3110,6 +3184,9 @@ impl ::protobuf::Message for DoubleDataPoint { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { + 7 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.attributes)?; + }, 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.labels)?; }, @@ -3131,8 +3208,13 @@ impl ::protobuf::Message for DoubleDataPoint { if wire_type != ::protobuf::wire_format::WireTypeFixed64 { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - let tmp = is.read_double()?; - self.value = tmp; + self.value = ::std::option::Option::Some(NumberDataPoint_oneof_value::as_double(is.read_double()?)); + }, + 6 => { + if wire_type != ::protobuf::wire_format::WireTypeFixed64 { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + self.value = ::std::option::Option::Some(NumberDataPoint_oneof_value::as_int(is.read_sfixed64()?)); }, 5 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.exemplars)?; @@ -3149,6 +3231,10 @@ impl ::protobuf::Message for DoubleDataPoint { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; + for value in &self.attributes { + let len = value.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }; for value in &self.labels { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -3159,19 +3245,31 @@ impl ::protobuf::Message for DoubleDataPoint { if self.time_unix_nano != 0 { my_size += 9; } - if self.value != 0. { - my_size += 9; - } for value in &self.exemplars { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; + if let ::std::option::Option::Some(ref v) = self.value { + match v { + &NumberDataPoint_oneof_value::as_double(v) => { + my_size += 9; + }, + &NumberDataPoint_oneof_value::as_int(v) => { + my_size += 9; + }, + }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + for v in &self.attributes { + os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }; for v in &self.labels { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -3183,14 +3281,21 @@ impl ::protobuf::Message for DoubleDataPoint { if self.time_unix_nano != 0 { os.write_fixed64(3, self.time_unix_nano)?; } - if self.value != 0. { - os.write_double(4, self.value)?; - } for v in &self.exemplars { os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; }; + if let ::std::option::Option::Some(ref v) = self.value { + match v { + &NumberDataPoint_oneof_value::as_double(v) => { + os.write_double(4, v)?; + }, + &NumberDataPoint_oneof_value::as_int(v) => { + os.write_sfixed64(6, v)?; + }, + }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3221,71 +3326,83 @@ impl ::protobuf::Message for DoubleDataPoint { Self::descriptor_static() } - fn new() -> DoubleDataPoint { - DoubleDataPoint::new() + fn new() -> NumberDataPoint { + NumberDataPoint::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "attributes", + |m: &NumberDataPoint| { &m.attributes }, + |m: &mut NumberDataPoint| { &mut m.attributes }, + )); fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "labels", - |m: &DoubleDataPoint| { &m.labels }, - |m: &mut DoubleDataPoint| { &mut m.labels }, + |m: &NumberDataPoint| { &m.labels }, + |m: &mut NumberDataPoint| { &mut m.labels }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "start_time_unix_nano", - |m: &DoubleDataPoint| { &m.start_time_unix_nano }, - |m: &mut DoubleDataPoint| { &mut m.start_time_unix_nano }, + |m: &NumberDataPoint| { &m.start_time_unix_nano }, + |m: &mut NumberDataPoint| { &mut m.start_time_unix_nano }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "time_unix_nano", - |m: &DoubleDataPoint| { &m.time_unix_nano }, - |m: &mut DoubleDataPoint| { &mut m.time_unix_nano }, + |m: &NumberDataPoint| { &m.time_unix_nano }, + |m: &mut NumberDataPoint| { &mut m.time_unix_nano }, )); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( - "value", - |m: &DoubleDataPoint| { &m.value }, - |m: &mut DoubleDataPoint| { &mut m.value }, + fields.push(::protobuf::reflect::accessor::make_singular_f64_accessor::<_>( + "as_double", + NumberDataPoint::has_as_double, + NumberDataPoint::get_as_double, + )); + fields.push(::protobuf::reflect::accessor::make_singular_i64_accessor::<_>( + "as_int", + NumberDataPoint::has_as_int, + NumberDataPoint::get_as_int, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "exemplars", - |m: &DoubleDataPoint| { &m.exemplars }, - |m: &mut DoubleDataPoint| { &mut m.exemplars }, + |m: &NumberDataPoint| { &m.exemplars }, + |m: &mut NumberDataPoint| { &mut m.exemplars }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleDataPoint", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "NumberDataPoint", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleDataPoint { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleDataPoint::new) + fn default_instance() -> &'static NumberDataPoint { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(NumberDataPoint::new) } } -impl ::protobuf::Clear for DoubleDataPoint { +impl ::protobuf::Clear for NumberDataPoint { fn clear(&mut self) { + self.attributes.clear(); self.labels.clear(); self.start_time_unix_nano = 0; self.time_unix_nano = 0; - self.value = 0.; + self.value = ::std::option::Option::None; + self.value = ::std::option::Option::None; self.exemplars.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for DoubleDataPoint { +impl ::std::fmt::Debug for NumberDataPoint { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleDataPoint { +impl ::protobuf::reflect::ProtobufValue for NumberDataPoint { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -3729,8 +3846,9 @@ impl ::protobuf::reflect::ProtobufValue for IntHistogramDataPoint { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleHistogramDataPoint { +pub struct HistogramDataPoint { // message fields + pub attributes: ::protobuf::RepeatedField, pub labels: ::protobuf::RepeatedField, pub start_time_unix_nano: u64, pub time_unix_nano: u64, @@ -3738,7 +3856,7 @@ pub struct DoubleHistogramDataPoint { pub sum: f64, pub bucket_counts: ::std::vec::Vec, pub explicit_bounds: ::std::vec::Vec, - pub exemplars: ::protobuf::RepeatedField, + pub exemplars: ::protobuf::RepeatedField, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -3746,17 +3864,42 @@ pub struct DoubleHistogramDataPoint { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleHistogramDataPoint { - fn default() -> &'a DoubleHistogramDataPoint { - ::default_instance() +impl<'a> ::std::default::Default for &'a HistogramDataPoint { + fn default() -> &'a HistogramDataPoint { + ::default_instance() } } -impl DoubleHistogramDataPoint { - pub fn new() -> DoubleHistogramDataPoint { +impl HistogramDataPoint { + pub fn new() -> HistogramDataPoint { ::std::default::Default::default() } + // repeated .opentelemetry.proto.common.v1.KeyValue attributes = 9; + + + pub fn get_attributes(&self) -> &[super::common::KeyValue] { + &self.attributes + } + pub fn clear_attributes(&mut self) { + self.attributes.clear(); + } + + // Param is passed by value, moved + pub fn set_attributes(&mut self, v: ::protobuf::RepeatedField) { + self.attributes = v; + } + + // Mutable pointer to the field. + pub fn mut_attributes(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.attributes + } + + // Take field + pub fn take_attributes(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.attributes, ::protobuf::RepeatedField::new()) + } + // repeated .opentelemetry.proto.common.v1.StringKeyValue labels = 1; @@ -3892,10 +4035,10 @@ impl DoubleHistogramDataPoint { ::std::mem::replace(&mut self.explicit_bounds, ::std::vec::Vec::new()) } - // repeated .opentelemetry.proto.metrics.v1.DoubleExemplar exemplars = 8; + // repeated .opentelemetry.proto.metrics.v1.Exemplar exemplars = 8; - pub fn get_exemplars(&self) -> &[DoubleExemplar] { + pub fn get_exemplars(&self) -> &[Exemplar] { &self.exemplars } pub fn clear_exemplars(&mut self) { @@ -3903,23 +4046,28 @@ impl DoubleHistogramDataPoint { } // Param is passed by value, moved - pub fn set_exemplars(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_exemplars(&mut self, v: ::protobuf::RepeatedField) { self.exemplars = v; } // Mutable pointer to the field. - pub fn mut_exemplars(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_exemplars(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.exemplars } // Take field - pub fn take_exemplars(&mut self) -> ::protobuf::RepeatedField { + pub fn take_exemplars(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.exemplars, ::protobuf::RepeatedField::new()) } } -impl ::protobuf::Message for DoubleHistogramDataPoint { +impl ::protobuf::Message for HistogramDataPoint { fn is_initialized(&self) -> bool { + for v in &self.attributes { + if !v.is_initialized() { + return false; + } + }; for v in &self.labels { if !v.is_initialized() { return false; @@ -3937,6 +4085,9 @@ impl ::protobuf::Message for DoubleHistogramDataPoint { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { + 9 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.attributes)?; + }, 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.labels)?; }, @@ -3989,6 +4140,10 @@ impl ::protobuf::Message for DoubleHistogramDataPoint { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; + for value in &self.attributes { + let len = value.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }; for value in &self.labels { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -4017,6 +4172,11 @@ impl ::protobuf::Message for DoubleHistogramDataPoint { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + for v in &self.attributes { + os.write_tag(9, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }; for v in &self.labels { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -4075,70 +4235,76 @@ impl ::protobuf::Message for DoubleHistogramDataPoint { Self::descriptor_static() } - fn new() -> DoubleHistogramDataPoint { - DoubleHistogramDataPoint::new() + fn new() -> HistogramDataPoint { + HistogramDataPoint::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "attributes", + |m: &HistogramDataPoint| { &m.attributes }, + |m: &mut HistogramDataPoint| { &mut m.attributes }, + )); fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "labels", - |m: &DoubleHistogramDataPoint| { &m.labels }, - |m: &mut DoubleHistogramDataPoint| { &mut m.labels }, + |m: &HistogramDataPoint| { &m.labels }, + |m: &mut HistogramDataPoint| { &mut m.labels }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "start_time_unix_nano", - |m: &DoubleHistogramDataPoint| { &m.start_time_unix_nano }, - |m: &mut DoubleHistogramDataPoint| { &mut m.start_time_unix_nano }, + |m: &HistogramDataPoint| { &m.start_time_unix_nano }, + |m: &mut HistogramDataPoint| { &mut m.start_time_unix_nano }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "time_unix_nano", - |m: &DoubleHistogramDataPoint| { &m.time_unix_nano }, - |m: &mut DoubleHistogramDataPoint| { &mut m.time_unix_nano }, + |m: &HistogramDataPoint| { &m.time_unix_nano }, + |m: &mut HistogramDataPoint| { &mut m.time_unix_nano }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "count", - |m: &DoubleHistogramDataPoint| { &m.count }, - |m: &mut DoubleHistogramDataPoint| { &mut m.count }, + |m: &HistogramDataPoint| { &m.count }, + |m: &mut HistogramDataPoint| { &mut m.count }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( "sum", - |m: &DoubleHistogramDataPoint| { &m.sum }, - |m: &mut DoubleHistogramDataPoint| { &mut m.sum }, + |m: &HistogramDataPoint| { &m.sum }, + |m: &mut HistogramDataPoint| { &mut m.sum }, )); fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "bucket_counts", - |m: &DoubleHistogramDataPoint| { &m.bucket_counts }, - |m: &mut DoubleHistogramDataPoint| { &mut m.bucket_counts }, + |m: &HistogramDataPoint| { &m.bucket_counts }, + |m: &mut HistogramDataPoint| { &mut m.bucket_counts }, )); fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( "explicit_bounds", - |m: &DoubleHistogramDataPoint| { &m.explicit_bounds }, - |m: &mut DoubleHistogramDataPoint| { &mut m.explicit_bounds }, + |m: &HistogramDataPoint| { &m.explicit_bounds }, + |m: &mut HistogramDataPoint| { &mut m.explicit_bounds }, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "exemplars", - |m: &DoubleHistogramDataPoint| { &m.exemplars }, - |m: &mut DoubleHistogramDataPoint| { &mut m.exemplars }, + |m: &HistogramDataPoint| { &m.exemplars }, + |m: &mut HistogramDataPoint| { &mut m.exemplars }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleHistogramDataPoint", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "HistogramDataPoint", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleHistogramDataPoint { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleHistogramDataPoint::new) + fn default_instance() -> &'static HistogramDataPoint { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(HistogramDataPoint::new) } } -impl ::protobuf::Clear for DoubleHistogramDataPoint { +impl ::protobuf::Clear for HistogramDataPoint { fn clear(&mut self) { + self.attributes.clear(); self.labels.clear(); self.start_time_unix_nano = 0; self.time_unix_nano = 0; @@ -4151,13 +4317,13 @@ impl ::protobuf::Clear for DoubleHistogramDataPoint { } } -impl ::std::fmt::Debug for DoubleHistogramDataPoint { +impl ::std::fmt::Debug for HistogramDataPoint { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleHistogramDataPoint { +impl ::protobuf::reflect::ProtobufValue for HistogramDataPoint { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -4165,14 +4331,15 @@ impl ::protobuf::reflect::ProtobufValue for DoubleHistogramDataPoint { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleSummaryDataPoint { +pub struct SummaryDataPoint { // message fields + pub attributes: ::protobuf::RepeatedField, pub labels: ::protobuf::RepeatedField, pub start_time_unix_nano: u64, pub time_unix_nano: u64, pub count: u64, pub sum: f64, - pub quantile_values: ::protobuf::RepeatedField, + pub quantile_values: ::protobuf::RepeatedField, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -4180,17 +4347,42 @@ pub struct DoubleSummaryDataPoint { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleSummaryDataPoint { - fn default() -> &'a DoubleSummaryDataPoint { - ::default_instance() +impl<'a> ::std::default::Default for &'a SummaryDataPoint { + fn default() -> &'a SummaryDataPoint { + ::default_instance() } } -impl DoubleSummaryDataPoint { - pub fn new() -> DoubleSummaryDataPoint { +impl SummaryDataPoint { + pub fn new() -> SummaryDataPoint { ::std::default::Default::default() } + // repeated .opentelemetry.proto.common.v1.KeyValue attributes = 7; + + + pub fn get_attributes(&self) -> &[super::common::KeyValue] { + &self.attributes + } + pub fn clear_attributes(&mut self) { + self.attributes.clear(); + } + + // Param is passed by value, moved + pub fn set_attributes(&mut self, v: ::protobuf::RepeatedField) { + self.attributes = v; + } + + // Mutable pointer to the field. + pub fn mut_attributes(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.attributes + } + + // Take field + pub fn take_attributes(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.attributes, ::protobuf::RepeatedField::new()) + } + // repeated .opentelemetry.proto.common.v1.StringKeyValue labels = 1; @@ -4276,10 +4468,10 @@ impl DoubleSummaryDataPoint { self.sum = v; } - // repeated .opentelemetry.proto.metrics.v1.DoubleSummaryDataPoint.ValueAtQuantile quantile_values = 6; + // repeated .opentelemetry.proto.metrics.v1.SummaryDataPoint.ValueAtQuantile quantile_values = 6; - pub fn get_quantile_values(&self) -> &[DoubleSummaryDataPoint_ValueAtQuantile] { + pub fn get_quantile_values(&self) -> &[SummaryDataPoint_ValueAtQuantile] { &self.quantile_values } pub fn clear_quantile_values(&mut self) { @@ -4287,23 +4479,28 @@ impl DoubleSummaryDataPoint { } // Param is passed by value, moved - pub fn set_quantile_values(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_quantile_values(&mut self, v: ::protobuf::RepeatedField) { self.quantile_values = v; } // Mutable pointer to the field. - pub fn mut_quantile_values(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_quantile_values(&mut self) -> &mut ::protobuf::RepeatedField { &mut self.quantile_values } // Take field - pub fn take_quantile_values(&mut self) -> ::protobuf::RepeatedField { + pub fn take_quantile_values(&mut self) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.quantile_values, ::protobuf::RepeatedField::new()) } } -impl ::protobuf::Message for DoubleSummaryDataPoint { +impl ::protobuf::Message for SummaryDataPoint { fn is_initialized(&self) -> bool { + for v in &self.attributes { + if !v.is_initialized() { + return false; + } + }; for v in &self.labels { if !v.is_initialized() { return false; @@ -4321,6 +4518,9 @@ impl ::protobuf::Message for DoubleSummaryDataPoint { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { + 7 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.attributes)?; + }, 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.labels)?; }, @@ -4367,6 +4567,10 @@ impl ::protobuf::Message for DoubleSummaryDataPoint { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; + for value in &self.attributes { + let len = value.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }; for value in &self.labels { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -4393,6 +4597,11 @@ impl ::protobuf::Message for DoubleSummaryDataPoint { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + for v in &self.attributes { + os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }; for v in &self.labels { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -4445,60 +4654,66 @@ impl ::protobuf::Message for DoubleSummaryDataPoint { Self::descriptor_static() } - fn new() -> DoubleSummaryDataPoint { - DoubleSummaryDataPoint::new() + fn new() -> SummaryDataPoint { + SummaryDataPoint::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "attributes", + |m: &SummaryDataPoint| { &m.attributes }, + |m: &mut SummaryDataPoint| { &mut m.attributes }, + )); fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "labels", - |m: &DoubleSummaryDataPoint| { &m.labels }, - |m: &mut DoubleSummaryDataPoint| { &mut m.labels }, + |m: &SummaryDataPoint| { &m.labels }, + |m: &mut SummaryDataPoint| { &mut m.labels }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "start_time_unix_nano", - |m: &DoubleSummaryDataPoint| { &m.start_time_unix_nano }, - |m: &mut DoubleSummaryDataPoint| { &mut m.start_time_unix_nano }, + |m: &SummaryDataPoint| { &m.start_time_unix_nano }, + |m: &mut SummaryDataPoint| { &mut m.start_time_unix_nano }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "time_unix_nano", - |m: &DoubleSummaryDataPoint| { &m.time_unix_nano }, - |m: &mut DoubleSummaryDataPoint| { &mut m.time_unix_nano }, + |m: &SummaryDataPoint| { &m.time_unix_nano }, + |m: &mut SummaryDataPoint| { &mut m.time_unix_nano }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "count", - |m: &DoubleSummaryDataPoint| { &m.count }, - |m: &mut DoubleSummaryDataPoint| { &mut m.count }, + |m: &SummaryDataPoint| { &m.count }, + |m: &mut SummaryDataPoint| { &mut m.count }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( "sum", - |m: &DoubleSummaryDataPoint| { &m.sum }, - |m: &mut DoubleSummaryDataPoint| { &mut m.sum }, + |m: &SummaryDataPoint| { &m.sum }, + |m: &mut SummaryDataPoint| { &mut m.sum }, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "quantile_values", - |m: &DoubleSummaryDataPoint| { &m.quantile_values }, - |m: &mut DoubleSummaryDataPoint| { &mut m.quantile_values }, + |m: &SummaryDataPoint| { &m.quantile_values }, + |m: &mut SummaryDataPoint| { &mut m.quantile_values }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleSummaryDataPoint", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "SummaryDataPoint", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleSummaryDataPoint { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleSummaryDataPoint::new) + fn default_instance() -> &'static SummaryDataPoint { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(SummaryDataPoint::new) } } -impl ::protobuf::Clear for DoubleSummaryDataPoint { +impl ::protobuf::Clear for SummaryDataPoint { fn clear(&mut self) { + self.attributes.clear(); self.labels.clear(); self.start_time_unix_nano = 0; self.time_unix_nano = 0; @@ -4509,13 +4724,13 @@ impl ::protobuf::Clear for DoubleSummaryDataPoint { } } -impl ::std::fmt::Debug for DoubleSummaryDataPoint { +impl ::std::fmt::Debug for SummaryDataPoint { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleSummaryDataPoint { +impl ::protobuf::reflect::ProtobufValue for SummaryDataPoint { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -4523,7 +4738,7 @@ impl ::protobuf::reflect::ProtobufValue for DoubleSummaryDataPoint { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleSummaryDataPoint_ValueAtQuantile { +pub struct SummaryDataPoint_ValueAtQuantile { // message fields pub quantile: f64, pub value: f64, @@ -4534,14 +4749,14 @@ pub struct DoubleSummaryDataPoint_ValueAtQuantile { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleSummaryDataPoint_ValueAtQuantile { - fn default() -> &'a DoubleSummaryDataPoint_ValueAtQuantile { - ::default_instance() +impl<'a> ::std::default::Default for &'a SummaryDataPoint_ValueAtQuantile { + fn default() -> &'a SummaryDataPoint_ValueAtQuantile { + ::default_instance() } } -impl DoubleSummaryDataPoint_ValueAtQuantile { - pub fn new() -> DoubleSummaryDataPoint_ValueAtQuantile { +impl SummaryDataPoint_ValueAtQuantile { + pub fn new() -> SummaryDataPoint_ValueAtQuantile { ::std::default::Default::default() } @@ -4576,7 +4791,7 @@ impl DoubleSummaryDataPoint_ValueAtQuantile { } } -impl ::protobuf::Message for DoubleSummaryDataPoint_ValueAtQuantile { +impl ::protobuf::Message for SummaryDataPoint_ValueAtQuantile { fn is_initialized(&self) -> bool { true } @@ -4659,8 +4874,8 @@ impl ::protobuf::Message for DoubleSummaryDataPoint_ValueAtQuantile { Self::descriptor_static() } - fn new() -> DoubleSummaryDataPoint_ValueAtQuantile { - DoubleSummaryDataPoint_ValueAtQuantile::new() + fn new() -> SummaryDataPoint_ValueAtQuantile { + SummaryDataPoint_ValueAtQuantile::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { @@ -4669,29 +4884,29 @@ impl ::protobuf::Message for DoubleSummaryDataPoint_ValueAtQuantile { let mut fields = ::std::vec::Vec::new(); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( "quantile", - |m: &DoubleSummaryDataPoint_ValueAtQuantile| { &m.quantile }, - |m: &mut DoubleSummaryDataPoint_ValueAtQuantile| { &mut m.quantile }, + |m: &SummaryDataPoint_ValueAtQuantile| { &m.quantile }, + |m: &mut SummaryDataPoint_ValueAtQuantile| { &mut m.quantile }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( "value", - |m: &DoubleSummaryDataPoint_ValueAtQuantile| { &m.value }, - |m: &mut DoubleSummaryDataPoint_ValueAtQuantile| { &mut m.value }, + |m: &SummaryDataPoint_ValueAtQuantile| { &m.value }, + |m: &mut SummaryDataPoint_ValueAtQuantile| { &mut m.value }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleSummaryDataPoint.ValueAtQuantile", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "SummaryDataPoint.ValueAtQuantile", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleSummaryDataPoint_ValueAtQuantile { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleSummaryDataPoint_ValueAtQuantile::new) + fn default_instance() -> &'static SummaryDataPoint_ValueAtQuantile { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(SummaryDataPoint_ValueAtQuantile::new) } } -impl ::protobuf::Clear for DoubleSummaryDataPoint_ValueAtQuantile { +impl ::protobuf::Clear for SummaryDataPoint_ValueAtQuantile { fn clear(&mut self) { self.quantile = 0.; self.value = 0.; @@ -4699,13 +4914,13 @@ impl ::protobuf::Clear for DoubleSummaryDataPoint_ValueAtQuantile { } } -impl ::std::fmt::Debug for DoubleSummaryDataPoint_ValueAtQuantile { +impl ::std::fmt::Debug for SummaryDataPoint_ValueAtQuantile { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleSummaryDataPoint_ValueAtQuantile { +impl ::protobuf::reflect::ProtobufValue for SummaryDataPoint_ValueAtQuantile { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -5036,13 +5251,15 @@ impl ::protobuf::reflect::ProtobufValue for IntExemplar { #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] -pub struct DoubleExemplar { +pub struct Exemplar { // message fields + pub filtered_attributes: ::protobuf::RepeatedField, pub filtered_labels: ::protobuf::RepeatedField, pub time_unix_nano: u64, - pub value: f64, pub span_id: ::std::vec::Vec, pub trace_id: ::std::vec::Vec, + // message oneof groups + pub value: ::std::option::Option, // special fields #[cfg_attr(feature = "with-serde", serde(skip))] pub unknown_fields: ::protobuf::UnknownFields, @@ -5050,17 +5267,49 @@ pub struct DoubleExemplar { pub cached_size: ::protobuf::CachedSize, } -impl<'a> ::std::default::Default for &'a DoubleExemplar { - fn default() -> &'a DoubleExemplar { - ::default_instance() +impl<'a> ::std::default::Default for &'a Exemplar { + fn default() -> &'a Exemplar { + ::default_instance() } } -impl DoubleExemplar { - pub fn new() -> DoubleExemplar { +#[derive(Clone,PartialEq,Debug)] +#[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] +pub enum Exemplar_oneof_value { + as_double(f64), + as_int(i64), +} + +impl Exemplar { + pub fn new() -> Exemplar { ::std::default::Default::default() } + // repeated .opentelemetry.proto.common.v1.KeyValue filtered_attributes = 7; + + + pub fn get_filtered_attributes(&self) -> &[super::common::KeyValue] { + &self.filtered_attributes + } + pub fn clear_filtered_attributes(&mut self) { + self.filtered_attributes.clear(); + } + + // Param is passed by value, moved + pub fn set_filtered_attributes(&mut self, v: ::protobuf::RepeatedField) { + self.filtered_attributes = v; + } + + // Mutable pointer to the field. + pub fn mut_filtered_attributes(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.filtered_attributes + } + + // Take field + pub fn take_filtered_attributes(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.filtered_attributes, ::protobuf::RepeatedField::new()) + } + // repeated .opentelemetry.proto.common.v1.StringKeyValue filtered_labels = 1; @@ -5101,19 +5350,54 @@ impl DoubleExemplar { self.time_unix_nano = v; } - // double value = 3; + // double as_double = 3; - pub fn get_value(&self) -> f64 { - self.value + pub fn get_as_double(&self) -> f64 { + match self.value { + ::std::option::Option::Some(Exemplar_oneof_value::as_double(v)) => v, + _ => 0., + } } - pub fn clear_value(&mut self) { - self.value = 0.; + pub fn clear_as_double(&mut self) { + self.value = ::std::option::Option::None; + } + + pub fn has_as_double(&self) -> bool { + match self.value { + ::std::option::Option::Some(Exemplar_oneof_value::as_double(..)) => true, + _ => false, + } } // Param is passed by value, moved - pub fn set_value(&mut self, v: f64) { - self.value = v; + pub fn set_as_double(&mut self, v: f64) { + self.value = ::std::option::Option::Some(Exemplar_oneof_value::as_double(v)) + } + + // sfixed64 as_int = 6; + + + pub fn get_as_int(&self) -> i64 { + match self.value { + ::std::option::Option::Some(Exemplar_oneof_value::as_int(v)) => v, + _ => 0, + } + } + pub fn clear_as_int(&mut self) { + self.value = ::std::option::Option::None; + } + + pub fn has_as_int(&self) -> bool { + match self.value { + ::std::option::Option::Some(Exemplar_oneof_value::as_int(..)) => true, + _ => false, + } + } + + // Param is passed by value, moved + pub fn set_as_int(&mut self, v: i64) { + self.value = ::std::option::Option::Some(Exemplar_oneof_value::as_int(v)) } // bytes span_id = 4; @@ -5169,8 +5453,13 @@ impl DoubleExemplar { } } -impl ::protobuf::Message for DoubleExemplar { +impl ::protobuf::Message for Exemplar { fn is_initialized(&self) -> bool { + for v in &self.filtered_attributes { + if !v.is_initialized() { + return false; + } + }; for v in &self.filtered_labels { if !v.is_initialized() { return false; @@ -5183,6 +5472,9 @@ impl ::protobuf::Message for DoubleExemplar { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { + 7 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.filtered_attributes)?; + }, 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.filtered_labels)?; }, @@ -5197,8 +5489,13 @@ impl ::protobuf::Message for DoubleExemplar { if wire_type != ::protobuf::wire_format::WireTypeFixed64 { return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); } - let tmp = is.read_double()?; - self.value = tmp; + self.value = ::std::option::Option::Some(Exemplar_oneof_value::as_double(is.read_double()?)); + }, + 6 => { + if wire_type != ::protobuf::wire_format::WireTypeFixed64 { + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + } + self.value = ::std::option::Option::Some(Exemplar_oneof_value::as_int(is.read_sfixed64()?)); }, 4 => { ::protobuf::rt::read_singular_proto3_bytes_into(wire_type, is, &mut self.span_id)?; @@ -5218,6 +5515,10 @@ impl ::protobuf::Message for DoubleExemplar { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; + for value in &self.filtered_attributes { + let len = value.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }; for value in &self.filtered_labels { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -5225,21 +5526,33 @@ impl ::protobuf::Message for DoubleExemplar { if self.time_unix_nano != 0 { my_size += 9; } - if self.value != 0. { - my_size += 9; - } if !self.span_id.is_empty() { my_size += ::protobuf::rt::bytes_size(4, &self.span_id); } if !self.trace_id.is_empty() { my_size += ::protobuf::rt::bytes_size(5, &self.trace_id); } + if let ::std::option::Option::Some(ref v) = self.value { + match v { + &Exemplar_oneof_value::as_double(v) => { + my_size += 9; + }, + &Exemplar_oneof_value::as_int(v) => { + my_size += 9; + }, + }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + for v in &self.filtered_attributes { + os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }; for v in &self.filtered_labels { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5248,15 +5561,22 @@ impl ::protobuf::Message for DoubleExemplar { if self.time_unix_nano != 0 { os.write_fixed64(2, self.time_unix_nano)?; } - if self.value != 0. { - os.write_double(3, self.value)?; - } if !self.span_id.is_empty() { os.write_bytes(4, &self.span_id)?; } if !self.trace_id.is_empty() { os.write_bytes(5, &self.trace_id)?; } + if let ::std::option::Option::Some(ref v) = self.value { + match v { + &Exemplar_oneof_value::as_double(v) => { + os.write_double(3, v)?; + }, + &Exemplar_oneof_value::as_int(v) => { + os.write_sfixed64(6, v)?; + }, + }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -5287,71 +5607,83 @@ impl ::protobuf::Message for DoubleExemplar { Self::descriptor_static() } - fn new() -> DoubleExemplar { - DoubleExemplar::new() + fn new() -> Exemplar { + Exemplar::new() } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { static descriptor: ::protobuf::rt::LazyV2<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::LazyV2::INIT; descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "filtered_attributes", + |m: &Exemplar| { &m.filtered_attributes }, + |m: &mut Exemplar| { &mut m.filtered_attributes }, + )); fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( "filtered_labels", - |m: &DoubleExemplar| { &m.filtered_labels }, - |m: &mut DoubleExemplar| { &mut m.filtered_labels }, + |m: &Exemplar| { &m.filtered_labels }, + |m: &mut Exemplar| { &mut m.filtered_labels }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeFixed64>( "time_unix_nano", - |m: &DoubleExemplar| { &m.time_unix_nano }, - |m: &mut DoubleExemplar| { &mut m.time_unix_nano }, + |m: &Exemplar| { &m.time_unix_nano }, + |m: &mut Exemplar| { &mut m.time_unix_nano }, )); - fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeDouble>( - "value", - |m: &DoubleExemplar| { &m.value }, - |m: &mut DoubleExemplar| { &mut m.value }, + fields.push(::protobuf::reflect::accessor::make_singular_f64_accessor::<_>( + "as_double", + Exemplar::has_as_double, + Exemplar::get_as_double, + )); + fields.push(::protobuf::reflect::accessor::make_singular_i64_accessor::<_>( + "as_int", + Exemplar::has_as_int, + Exemplar::get_as_int, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "span_id", - |m: &DoubleExemplar| { &m.span_id }, - |m: &mut DoubleExemplar| { &mut m.span_id }, + |m: &Exemplar| { &m.span_id }, + |m: &mut Exemplar| { &mut m.span_id }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( "trace_id", - |m: &DoubleExemplar| { &m.trace_id }, - |m: &mut DoubleExemplar| { &mut m.trace_id }, + |m: &Exemplar| { &m.trace_id }, + |m: &mut Exemplar| { &mut m.trace_id }, )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( - "DoubleExemplar", + ::protobuf::reflect::MessageDescriptor::new_pb_name::( + "Exemplar", fields, file_descriptor_proto() ) }) } - fn default_instance() -> &'static DoubleExemplar { - static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; - instance.get(DoubleExemplar::new) + fn default_instance() -> &'static Exemplar { + static instance: ::protobuf::rt::LazyV2 = ::protobuf::rt::LazyV2::INIT; + instance.get(Exemplar::new) } } -impl ::protobuf::Clear for DoubleExemplar { +impl ::protobuf::Clear for Exemplar { fn clear(&mut self) { + self.filtered_attributes.clear(); self.filtered_labels.clear(); self.time_unix_nano = 0; - self.value = 0.; + self.value = ::std::option::Option::None; + self.value = ::std::option::Option::None; self.span_id.clear(); self.trace_id.clear(); self.unknown_fields.clear(); } } -impl ::std::fmt::Debug for DoubleExemplar { +impl ::std::fmt::Debug for Exemplar { fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } -impl ::protobuf::reflect::ProtobufValue for DoubleExemplar { +impl ::protobuf::reflect::ProtobufValue for Exemplar { fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { ::protobuf::reflect::ReflectValueRef::Message(self) } @@ -5422,94 +5754,102 @@ static file_descriptor_proto_data: &'static [u8] = b"\ tationLibraryMetrics\x12n\n\x17instrumentation_library\x18\x01\x20\x01(\ \x0b25.opentelemetry.proto.common.v1.InstrumentationLibraryR\x16instrume\ ntationLibrary\x12@\n\x07metrics\x18\x02\x20\x03(\x0b2&.opentelemetry.pr\ - oto.metrics.v1.MetricR\x07metrics\"\x8f\x05\n\x06Metric\x12\x12\n\x04nam\ + oto.metrics.v1.MetricR\x07metrics\"\xcf\x04\n\x06Metric\x12\x12\n\x04nam\ e\x18\x01\x20\x01(\tR\x04name\x12\x20\n\x0bdescription\x18\x02\x20\x01(\ - \tR\x0bdescription\x12\x12\n\x04unit\x18\x03\x20\x01(\tR\x04unit\x12G\n\ + \tR\x0bdescription\x12\x12\n\x04unit\x18\x03\x20\x01(\tR\x04unit\x12K\n\ \tint_gauge\x18\x04\x20\x01(\x0b2(.opentelemetry.proto.metrics.v1.IntGau\ - geH\0R\x08intGauge\x12P\n\x0cdouble_gauge\x18\x05\x20\x01(\x0b2+.opentel\ - emetry.proto.metrics.v1.DoubleGaugeH\0R\x0bdoubleGauge\x12A\n\x07int_sum\ - \x18\x06\x20\x01(\x0b2&.opentelemetry.proto.metrics.v1.IntSumH\0R\x06int\ - Sum\x12J\n\ndouble_sum\x18\x07\x20\x01(\x0b2).opentelemetry.proto.metric\ - s.v1.DoubleSumH\0R\tdoubleSum\x12S\n\rint_histogram\x18\x08\x20\x01(\x0b\ - 2,.opentelemetry.proto.metrics.v1.IntHistogramH\0R\x0cintHistogram\x12\\\ - \n\x10double_histogram\x18\t\x20\x01(\x0b2/.opentelemetry.proto.metrics.\ - v1.DoubleHistogramH\0R\x0fdoubleHistogram\x12V\n\x0edouble_summary\x18\ - \x0b\x20\x01(\x0b2-.opentelemetry.proto.metrics.v1.DoubleSummaryH\0R\rdo\ - ubleSummaryB\x06\n\x04data\"Y\n\x08IntGauge\x12M\n\x0bdata_points\x18\ - \x01\x20\x03(\x0b2,.opentelemetry.proto.metrics.v1.IntDataPointR\ndataPo\ - ints\"_\n\x0bDoubleGauge\x12P\n\x0bdata_points\x18\x01\x20\x03(\x0b2/.op\ - entelemetry.proto.metrics.v1.DoubleDataPointR\ndataPoints\"\xeb\x01\n\ - \x06IntSum\x12M\n\x0bdata_points\x18\x01\x20\x03(\x0b2,.opentelemetry.pr\ - oto.metrics.v1.IntDataPointR\ndataPoints\x12o\n\x17aggregation_temporali\ - ty\x18\x02\x20\x01(\x0e26.opentelemetry.proto.metrics.v1.AggregationTemp\ - oralityR\x16aggregationTemporality\x12!\n\x0cis_monotonic\x18\x03\x20\ - \x01(\x08R\x0bisMonotonic\"\xf1\x01\n\tDoubleSum\x12P\n\x0bdata_points\ - \x18\x01\x20\x03(\x0b2/.opentelemetry.proto.metrics.v1.DoubleDataPointR\ - \ndataPoints\x12o\n\x17aggregation_temporality\x18\x02\x20\x01(\x0e26.op\ - entelemetry.proto.metrics.v1.AggregationTemporalityR\x16aggregationTempo\ - rality\x12!\n\x0cis_monotonic\x18\x03\x20\x01(\x08R\x0bisMonotonic\"\xd7\ - \x01\n\x0cIntHistogram\x12V\n\x0bdata_points\x18\x01\x20\x03(\x0b25.open\ - telemetry.proto.metrics.v1.IntHistogramDataPointR\ndataPoints\x12o\n\x17\ - aggregation_temporality\x18\x02\x20\x01(\x0e26.opentelemetry.proto.metri\ - cs.v1.AggregationTemporalityR\x16aggregationTemporality\"\xdd\x01\n\x0fD\ - oubleHistogram\x12Y\n\x0bdata_points\x18\x01\x20\x03(\x0b28.opentelemetr\ - y.proto.metrics.v1.DoubleHistogramDataPointR\ndataPoints\x12o\n\x17aggre\ - gation_temporality\x18\x02\x20\x01(\x0e26.opentelemetry.proto.metrics.v1\ - .AggregationTemporalityR\x16aggregationTemporality\"h\n\rDoubleSummary\ - \x12W\n\x0bdata_points\x18\x01\x20\x03(\x0b26.opentelemetry.proto.metric\ - s.v1.DoubleSummaryDataPointR\ndataPoints\"\x8d\x02\n\x0cIntDataPoint\x12\ - E\n\x06labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.Strin\ - gKeyValueR\x06labels\x12/\n\x14start_time_unix_nano\x18\x02\x20\x01(\x06\ - R\x11startTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\ - \x0ctimeUnixNano\x12\x14\n\x05value\x18\x04\x20\x01(\x10R\x05value\x12I\ - \n\texemplars\x18\x05\x20\x03(\x0b2+.opentelemetry.proto.metrics.v1.IntE\ - xemplarR\texemplars\"\x93\x02\n\x0fDoubleDataPoint\x12E\n\x06labels\x18\ - \x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.StringKeyValueR\x06lab\ - els\x12/\n\x14start_time_unix_nano\x18\x02\x20\x01(\x06R\x11startTimeUni\ - xNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\x0ctimeUnixNano\x12\ - \x14\n\x05value\x18\x04\x20\x01(\x01R\x05value\x12L\n\texemplars\x18\x05\ - \x20\x03(\x0b2..opentelemetry.proto.metrics.v1.DoubleExemplarR\texemplar\ - s\"\xf6\x02\n\x15IntHistogramDataPoint\x12E\n\x06labels\x18\x01\x20\x03(\ - \x0b2-.opentelemetry.proto.common.v1.StringKeyValueR\x06labels\x12/\n\ - \x14start_time_unix_nano\x18\x02\x20\x01(\x06R\x11startTimeUnixNano\x12$\ - \n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\x0ctimeUnixNano\x12\x14\n\x05\ - count\x18\x04\x20\x01(\x06R\x05count\x12\x10\n\x03sum\x18\x05\x20\x01(\ - \x10R\x03sum\x12#\n\rbucket_counts\x18\x06\x20\x03(\x06R\x0cbucketCounts\ - \x12'\n\x0fexplicit_bounds\x18\x07\x20\x03(\x01R\x0eexplicitBounds\x12I\ - \n\texemplars\x18\x08\x20\x03(\x0b2+.opentelemetry.proto.metrics.v1.IntE\ - xemplarR\texemplars\"\xfc\x02\n\x18DoubleHistogramDataPoint\x12E\n\x06la\ - bels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.StringKeyValue\ - R\x06labels\x12/\n\x14start_time_unix_nano\x18\x02\x20\x01(\x06R\x11star\ - tTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\x0ctimeUnix\ - Nano\x12\x14\n\x05count\x18\x04\x20\x01(\x06R\x05count\x12\x10\n\x03sum\ + geH\0R\x08intGaugeB\x02\x18\x01\x12=\n\x05gauge\x18\x05\x20\x01(\x0b2%.o\ + pentelemetry.proto.metrics.v1.GaugeH\0R\x05gauge\x12E\n\x07int_sum\x18\ + \x06\x20\x01(\x0b2&.opentelemetry.proto.metrics.v1.IntSumH\0R\x06intSumB\ + \x02\x18\x01\x127\n\x03sum\x18\x07\x20\x01(\x0b2#.opentelemetry.proto.me\ + trics.v1.SumH\0R\x03sum\x12W\n\rint_histogram\x18\x08\x20\x01(\x0b2,.ope\ + ntelemetry.proto.metrics.v1.IntHistogramH\0R\x0cintHistogramB\x02\x18\ + \x01\x12I\n\thistogram\x18\t\x20\x01(\x0b2).opentelemetry.proto.metrics.\ + v1.HistogramH\0R\thistogram\x12C\n\x07summary\x18\x0b\x20\x01(\x0b2'.ope\ + ntelemetry.proto.metrics.v1.SummaryH\0R\x07summaryB\x06\n\x04data\"]\n\ + \x08IntGauge\x12M\n\x0bdata_points\x18\x01\x20\x03(\x0b2,.opentelemetry.\ + proto.metrics.v1.IntDataPointR\ndataPoints:\x02\x18\x01\"Y\n\x05Gauge\ + \x12P\n\x0bdata_points\x18\x01\x20\x03(\x0b2/.opentelemetry.proto.metric\ + s.v1.NumberDataPointR\ndataPoints\"\xef\x01\n\x06IntSum\x12M\n\x0bdata_p\ + oints\x18\x01\x20\x03(\x0b2,.opentelemetry.proto.metrics.v1.IntDataPoint\ + R\ndataPoints\x12o\n\x17aggregation_temporality\x18\x02\x20\x01(\x0e26.o\ + pentelemetry.proto.metrics.v1.AggregationTemporalityR\x16aggregationTemp\ + orality\x12!\n\x0cis_monotonic\x18\x03\x20\x01(\x08R\x0bisMonotonic:\x02\ + \x18\x01\"\xeb\x01\n\x03Sum\x12P\n\x0bdata_points\x18\x01\x20\x03(\x0b2/\ + .opentelemetry.proto.metrics.v1.NumberDataPointR\ndataPoints\x12o\n\x17a\ + ggregation_temporality\x18\x02\x20\x01(\x0e26.opentelemetry.proto.metric\ + s.v1.AggregationTemporalityR\x16aggregationTemporality\x12!\n\x0cis_mono\ + tonic\x18\x03\x20\x01(\x08R\x0bisMonotonic\"\xdb\x01\n\x0cIntHistogram\ + \x12V\n\x0bdata_points\x18\x01\x20\x03(\x0b25.opentelemetry.proto.metric\ + s.v1.IntHistogramDataPointR\ndataPoints\x12o\n\x17aggregation_temporalit\ + y\x18\x02\x20\x01(\x0e26.opentelemetry.proto.metrics.v1.AggregationTempo\ + ralityR\x16aggregationTemporality:\x02\x18\x01\"\xd1\x01\n\tHistogram\ + \x12S\n\x0bdata_points\x18\x01\x20\x03(\x0b22.opentelemetry.proto.metric\ + s.v1.HistogramDataPointR\ndataPoints\x12o\n\x17aggregation_temporality\ + \x18\x02\x20\x01(\x0e26.opentelemetry.proto.metrics.v1.AggregationTempor\ + alityR\x16aggregationTemporality\"\\\n\x07Summary\x12Q\n\x0bdata_points\ + \x18\x01\x20\x03(\x0b20.opentelemetry.proto.metrics.v1.SummaryDataPointR\ + \ndataPoints\"\x91\x02\n\x0cIntDataPoint\x12E\n\x06labels\x18\x01\x20\ + \x03(\x0b2-.opentelemetry.proto.common.v1.StringKeyValueR\x06labels\x12/\ + \n\x14start_time_unix_nano\x18\x02\x20\x01(\x06R\x11startTimeUnixNano\ + \x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\x0ctimeUnixNano\x12\x14\ + \n\x05value\x18\x04\x20\x01(\x10R\x05value\x12I\n\texemplars\x18\x05\x20\ + \x03(\x0b2+.opentelemetry.proto.metrics.v1.IntExemplarR\texemplars:\x02\ + \x18\x01\"\x85\x03\n\x0fNumberDataPoint\x12G\n\nattributes\x18\x07\x20\ + \x03(\x0b2'.opentelemetry.proto.common.v1.KeyValueR\nattributes\x12I\n\ + \x06labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.StringKe\ + yValueR\x06labelsB\x02\x18\x01\x12/\n\x14start_time_unix_nano\x18\x02\ + \x20\x01(\x06R\x11startTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\ + \x01(\x06R\x0ctimeUnixNano\x12\x1d\n\tas_double\x18\x04\x20\x01(\x01H\0R\ + \x08asDouble\x12\x17\n\x06as_int\x18\x06\x20\x01(\x10H\0R\x05asInt\x12F\ + \n\texemplars\x18\x05\x20\x03(\x0b2(.opentelemetry.proto.metrics.v1.Exem\ + plarR\texemplarsB\x07\n\x05value\"\xfa\x02\n\x15IntHistogramDataPoint\ + \x12E\n\x06labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.S\ + tringKeyValueR\x06labels\x12/\n\x14start_time_unix_nano\x18\x02\x20\x01(\ + \x06R\x11startTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06\ + R\x0ctimeUnixNano\x12\x14\n\x05count\x18\x04\x20\x01(\x06R\x05count\x12\ + \x10\n\x03sum\x18\x05\x20\x01(\x10R\x03sum\x12#\n\rbucket_counts\x18\x06\ + \x20\x03(\x06R\x0cbucketCounts\x12'\n\x0fexplicit_bounds\x18\x07\x20\x03\ + (\x01R\x0eexplicitBounds\x12I\n\texemplars\x18\x08\x20\x03(\x0b2+.opente\ + lemetry.proto.metrics.v1.IntExemplarR\texemplars:\x02\x18\x01\"\xbd\x03\ + \n\x12HistogramDataPoint\x12G\n\nattributes\x18\t\x20\x03(\x0b2'.opentel\ + emetry.proto.common.v1.KeyValueR\nattributes\x12I\n\x06labels\x18\x01\ + \x20\x03(\x0b2-.opentelemetry.proto.common.v1.StringKeyValueR\x06labelsB\ + \x02\x18\x01\x12/\n\x14start_time_unix_nano\x18\x02\x20\x01(\x06R\x11sta\ + rtTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01(\x06R\x0ctimeUni\ + xNano\x12\x14\n\x05count\x18\x04\x20\x01(\x06R\x05count\x12\x10\n\x03sum\ \x18\x05\x20\x01(\x01R\x03sum\x12#\n\rbucket_counts\x18\x06\x20\x03(\x06\ R\x0cbucketCounts\x12'\n\x0fexplicit_bounds\x18\x07\x20\x03(\x01R\x0eexp\ - licitBounds\x12L\n\texemplars\x18\x08\x20\x03(\x0b2..opentelemetry.proto\ - .metrics.v1.DoubleExemplarR\texemplars\"\x94\x03\n\x16DoubleSummaryDataP\ - oint\x12E\n\x06labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.\ - v1.StringKeyValueR\x06labels\x12/\n\x14start_time_unix_nano\x18\x02\x20\ - \x01(\x06R\x11startTimeUnixNano\x12$\n\x0etime_unix_nano\x18\x03\x20\x01\ - (\x06R\x0ctimeUnixNano\x12\x14\n\x05count\x18\x04\x20\x01(\x06R\x05count\ - \x12\x10\n\x03sum\x18\x05\x20\x01(\x01R\x03sum\x12o\n\x0fquantile_values\ - \x18\x06\x20\x03(\x0b2F.opentelemetry.proto.metrics.v1.DoubleSummaryData\ - Point.ValueAtQuantileR\x0equantileValues\x1aC\n\x0fValueAtQuantile\x12\ - \x1a\n\x08quantile\x18\x01\x20\x01(\x01R\x08quantile\x12\x14\n\x05value\ - \x18\x02\x20\x01(\x01R\x05value\"\xd5\x01\n\x0bIntExemplar\x12V\n\x0ffil\ - tered_labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.v1.String\ - KeyValueR\x0efilteredLabels\x12$\n\x0etime_unix_nano\x18\x02\x20\x01(\ - \x06R\x0ctimeUnixNano\x12\x14\n\x05value\x18\x03\x20\x01(\x10R\x05value\ - \x12\x17\n\x07span_id\x18\x04\x20\x01(\x0cR\x06spanId\x12\x19\n\x08trace\ - _id\x18\x05\x20\x01(\x0cR\x07traceId\"\xd8\x01\n\x0eDoubleExemplar\x12V\ - \n\x0ffiltered_labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common.\ - v1.StringKeyValueR\x0efilteredLabels\x12$\n\x0etime_unix_nano\x18\x02\ - \x20\x01(\x06R\x0ctimeUnixNano\x12\x14\n\x05value\x18\x03\x20\x01(\x01R\ - \x05value\x12\x17\n\x07span_id\x18\x04\x20\x01(\x0cR\x06spanId\x12\x19\n\ - \x08trace_id\x18\x05\x20\x01(\x0cR\x07traceId*\x8c\x01\n\x16AggregationT\ - emporality\x12'\n#AGGREGATION_TEMPORALITY_UNSPECIFIED\x10\0\x12!\n\x1dAG\ - GREGATION_TEMPORALITY_DELTA\x10\x01\x12&\n\"AGGREGATION_TEMPORALITY_CUMU\ - LATIVE\x10\x02Bt\n!io.opentelemetry.proto.metrics.v1B\x0cMetricsProtoP\ - \x01Z?github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1b\ - \x06proto3\ + licitBounds\x12F\n\texemplars\x18\x08\x20\x03(\x0b2(.opentelemetry.proto\ + .metrics.v1.ExemplarR\texemplars\"\xd5\x03\n\x10SummaryDataPoint\x12G\n\ + \nattributes\x18\x07\x20\x03(\x0b2'.opentelemetry.proto.common.v1.KeyVal\ + ueR\nattributes\x12I\n\x06labels\x18\x01\x20\x03(\x0b2-.opentelemetry.pr\ + oto.common.v1.StringKeyValueR\x06labelsB\x02\x18\x01\x12/\n\x14start_tim\ + e_unix_nano\x18\x02\x20\x01(\x06R\x11startTimeUnixNano\x12$\n\x0etime_un\ + ix_nano\x18\x03\x20\x01(\x06R\x0ctimeUnixNano\x12\x14\n\x05count\x18\x04\ + \x20\x01(\x06R\x05count\x12\x10\n\x03sum\x18\x05\x20\x01(\x01R\x03sum\ + \x12i\n\x0fquantile_values\x18\x06\x20\x03(\x0b2@.opentelemetry.proto.me\ + trics.v1.SummaryDataPoint.ValueAtQuantileR\x0equantileValues\x1aC\n\x0fV\ + alueAtQuantile\x12\x1a\n\x08quantile\x18\x01\x20\x01(\x01R\x08quantile\ + \x12\x14\n\x05value\x18\x02\x20\x01(\x01R\x05value\"\xd9\x01\n\x0bIntExe\ + mplar\x12V\n\x0ffiltered_labels\x18\x01\x20\x03(\x0b2-.opentelemetry.pro\ + to.common.v1.StringKeyValueR\x0efilteredLabels\x12$\n\x0etime_unix_nano\ + \x18\x02\x20\x01(\x06R\x0ctimeUnixNano\x12\x14\n\x05value\x18\x03\x20\ + \x01(\x10R\x05value\x12\x17\n\x07span_id\x18\x04\x20\x01(\x0cR\x06spanId\ + \x12\x19\n\x08trace_id\x18\x05\x20\x01(\x0cR\x07traceId:\x02\x18\x01\"\ + \xdb\x02\n\x08Exemplar\x12X\n\x13filtered_attributes\x18\x07\x20\x03(\ + \x0b2'.opentelemetry.proto.common.v1.KeyValueR\x12filteredAttributes\x12\ + Z\n\x0ffiltered_labels\x18\x01\x20\x03(\x0b2-.opentelemetry.proto.common\ + .v1.StringKeyValueR\x0efilteredLabelsB\x02\x18\x01\x12$\n\x0etime_unix_n\ + ano\x18\x02\x20\x01(\x06R\x0ctimeUnixNano\x12\x1d\n\tas_double\x18\x03\ + \x20\x01(\x01H\0R\x08asDouble\x12\x17\n\x06as_int\x18\x06\x20\x01(\x10H\ + \0R\x05asInt\x12\x17\n\x07span_id\x18\x04\x20\x01(\x0cR\x06spanId\x12\ + \x19\n\x08trace_id\x18\x05\x20\x01(\x0cR\x07traceIdB\x07\n\x05value*\x8c\ + \x01\n\x16AggregationTemporality\x12'\n#AGGREGATION_TEMPORALITY_UNSPECIF\ + IED\x10\0\x12!\n\x1dAGGREGATION_TEMPORALITY_DELTA\x10\x01\x12&\n\"AGGREG\ + ATION_TEMPORALITY_CUMULATIVE\x10\x02Bt\n!io.opentelemetry.proto.metrics.\ + v1B\x0cMetricsProtoP\x01Z?github.com/open-telemetry/opentelemetry-proto/\ + gen/go/metrics/v1b\x06proto3\ "; static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT; diff --git a/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs b/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs index 6bee63e50f..a188fdd508 100644 --- a/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs +++ b/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/resource.rs b/opentelemetry-otlp/src/proto/grpcio/resource.rs index 4593b0e792..4bf7b9f430 100644 --- a/opentelemetry-otlp/src/proto/grpcio/resource.rs +++ b/opentelemetry-otlp/src/proto/grpcio/resource.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace.rs b/opentelemetry-otlp/src/proto/grpcio/trace.rs index 6597f32d17..f1f943266b 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace_config.rs b/opentelemetry-otlp/src/proto/grpcio/trace_config.rs index cd3a317294..26f8c66ab4 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace_config.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace_config.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace_service.rs b/opentelemetry-otlp/src/proto/grpcio/trace_service.rs index 4ff18247e0..6ce4e359c8 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace_service.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace_service.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.22.1. Do not edit +// This file is generated by rust-protobuf 2.23.0. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_22_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_23_0; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/opentelemetry-proto b/opentelemetry-otlp/src/proto/opentelemetry-proto index 8ab21e9da6..a17f202fda 160000 --- a/opentelemetry-otlp/src/proto/opentelemetry-proto +++ b/opentelemetry-otlp/src/proto/opentelemetry-proto @@ -1 +1 @@ -Subproject commit 8ab21e9da6246e465cd9d50d405561aedef31a1e +Subproject commit a17f202fdae65e828ac29fb663b5bc5b64b13290 diff --git a/opentelemetry-otlp/src/transform/metrics.rs b/opentelemetry-otlp/src/transform/metrics.rs index d5275d919b..ea1b2d3e24 100644 --- a/opentelemetry-otlp/src/transform/metrics.rs +++ b/opentelemetry-otlp/src/transform/metrics.rs @@ -1,34 +1,53 @@ #[cfg(feature = "tonic")] +// The prost currently will generate a non optional deprecated field for labels. +// We cannot assign value to it otherwise clippy will complain. +// We cannot ignore it as it's not an optional field. +// We can remove this after we removed the labels field from proto. +#[allow(deprecated)] pub(crate) mod tonic { use crate::proto::{ collector::metrics::v1::ExportMetricsServiceRequest, + common::v1::KeyValue, metrics::v1::{ - metric::Data, AggregationTemporality, DoubleDataPoint, DoubleGauge, DoubleHistogram, - DoubleHistogramDataPoint, DoubleSum, InstrumentationLibraryMetrics, IntDataPoint, - IntGauge, IntHistogram, IntHistogramDataPoint, IntSum, Metric, ResourceMetrics, + metric::Data, number_data_point, AggregationTemporality, Gauge, Histogram, + HistogramDataPoint, InstrumentationLibraryMetrics, Metric, NumberDataPoint, + ResourceMetrics, Sum, }, }; - use opentelemetry::metrics::{MetricsError, NumberKind}; + use opentelemetry::metrics::{MetricsError, Number, NumberKind}; use opentelemetry::sdk::export::metrics::{ - Count, ExportKind, ExportKindFor, Histogram, LastValue, Max, Min, Points, Record, Sum, + Count, ExportKind, ExportKindFor, Histogram as SdkHistogram, LastValue, Max, Min, Points, + Record, Sum as SdkSum, }; use opentelemetry::sdk::metrics::aggregators::{ ArrayAggregator, HistogramAggregator, LastValueAggregator, MinMaxSumCountAggregator, SumAggregator, }; - use crate::proto::common::v1::StringKeyValue; use crate::transform::common::to_nanos; use crate::transform::{CheckpointedMetrics, ResourceWrapper}; use opentelemetry::sdk::InstrumentationLibrary; use opentelemetry::{Key, Value}; use std::collections::{BTreeMap, HashMap}; - impl From<(&Key, &Value)> for StringKeyValue { + type NumberWithKind<'a> = (Number, &'a NumberKind); + + impl From<(&Key, &Value)> for KeyValue { fn from(kv: (&Key, &Value)) -> Self { - StringKeyValue { + KeyValue { key: kv.0.clone().into(), - value: kv.1.as_str().into(), + value: Some(kv.1.clone().into()), + } + } + } + + impl<'a> From> for number_data_point::Value { + fn from(number: NumberWithKind<'a>) -> Self { + match &number.1 { + NumberKind::I64 | NumberKind::U64 => { + number_data_point::Value::AsInt(number.0.to_i64(&number.1)) + } + NumberKind::F64 => number_data_point::Value::AsDouble(number.0.to_f64(&number.1)), } } } @@ -52,7 +71,7 @@ pub(crate) mod tonic { .labels() .iter() .map(|kv| kv.into()) - .collect::>(); + .collect::>(); let temporality: AggregationTemporality = export_selector.export_kind_for(descriptor).into(); let kind = descriptor.number_kind(); @@ -66,34 +85,19 @@ pub(crate) mod tonic { data: { if let Some(array) = aggregator.as_any().downcast_ref::() { if let Ok(points) = array.points() { - Some({ - match kind { - NumberKind::I64 | NumberKind::U64 => Data::IntGauge(IntGauge { - data_points: points - .into_iter() - .map(|val| IntDataPoint { - labels: labels.clone(), - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - value: val.to_i64(kind), - exemplars: Vec::default(), - }) - .collect(), - }), - NumberKind::F64 => Data::DoubleGauge(DoubleGauge { - data_points: points - .into_iter() - .map(|val| DoubleDataPoint { - labels: labels.clone(), - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - value: val.to_f64(kind), - exemplars: Vec::default(), - }) - .collect(), - }), - } - }) + Some(Data::Gauge(Gauge { + data_points: points + .into_iter() + .map(|val| NumberDataPoint { + attributes: labels.clone(), + labels: vec![], + start_time_unix_nano: to_nanos(*record.start_time()), + time_unix_nano: to_nanos(*record.end_time()), + value: Some((val, kind).into()), + exemplars: Vec::default(), + }) + .collect(), + })) } else { None } @@ -102,54 +106,32 @@ pub(crate) mod tonic { { Some({ let (val, sample_time) = last_value.last_value()?; - match kind { - NumberKind::I64 | NumberKind::U64 => Data::IntGauge(IntGauge { - data_points: vec![IntDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(sample_time), - value: val.to_i64(kind), - exemplars: Vec::default(), - }], - }), - NumberKind::F64 => Data::DoubleGauge(DoubleGauge { - data_points: vec![DoubleDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(sample_time), - value: val.to_f64(kind), - exemplars: Vec::default(), - }], - }), - } + Data::Gauge(Gauge { + data_points: vec![NumberDataPoint { + attributes: labels, + labels: vec![], + start_time_unix_nano: to_nanos(*record.start_time()), + time_unix_nano: to_nanos(sample_time), + value: Some((val, kind).into()), + exemplars: Vec::default(), + }], + }) }) } else if let Some(sum) = aggregator.as_any().downcast_ref::() { Some({ let val = sum.sum()?; - match kind { - NumberKind::U64 | NumberKind::I64 => Data::IntSum(IntSum { - data_points: vec![IntDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - value: val.to_i64(kind), - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - is_monotonic: descriptor.instrument_kind().monotonic(), - }), - NumberKind::F64 => Data::DoubleSum(DoubleSum { - data_points: vec![DoubleDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - value: val.to_f64(kind), - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - is_monotonic: descriptor.instrument_kind().monotonic(), - }), - } + Data::Sum(Sum { + data_points: vec![NumberDataPoint { + attributes: labels, + labels: vec![], + start_time_unix_nano: to_nanos(*record.start_time()), + time_unix_nano: to_nanos(*record.end_time()), + value: Some((val, kind).into()), + exemplars: Vec::default(), + }], + aggregation_temporality: temporality as i32, + is_monotonic: descriptor.instrument_kind().monotonic(), + }) }) } else if let Some(histogram) = aggregator.as_any().downcast_ref::() @@ -157,44 +139,25 @@ pub(crate) mod tonic { Some({ let (sum, count, buckets) = (histogram.sum()?, histogram.count()?, histogram.histogram()?); - match kind { - NumberKind::I64 | NumberKind::U64 => Data::IntHistogram(IntHistogram { - data_points: vec![IntHistogramDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - count, - sum: sum.to_i64(kind), - bucket_counts: buckets - .counts() - .iter() - .cloned() - .map(|c| c as u64) - .collect(), - explicit_bounds: buckets.boundaries().clone(), - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - }), - NumberKind::F64 => Data::DoubleHistogram(DoubleHistogram { - data_points: vec![DoubleHistogramDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - count, - sum: sum.to_f64(kind), - bucket_counts: buckets - .counts() - .iter() - .cloned() - .map(|c| c as u64) - .collect(), - explicit_bounds: buckets.boundaries().clone(), - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - }), - } + Data::Histogram(Histogram { + data_points: vec![HistogramDataPoint { + attributes: labels, + labels: vec![], + start_time_unix_nano: to_nanos(*record.start_time()), + time_unix_nano: to_nanos(*record.end_time()), + count, + sum: sum.to_f64(kind), + bucket_counts: buckets + .counts() + .iter() + .cloned() + .map(|c| c as u64) + .collect(), + explicit_bounds: buckets.boundaries().clone(), + exemplars: Vec::default(), + }], + aggregation_temporality: temporality as i32, + }) }) } else if let Some(min_max_sum_count) = aggregator .as_any() @@ -209,34 +172,20 @@ pub(crate) mod tonic { ); let buckets = vec![min.to_u64(kind), max.to_u64(kind)]; let bounds = vec![0.0, 100.0]; - match kind { - NumberKind::U64 | NumberKind::I64 => Data::IntHistogram(IntHistogram { - data_points: vec![IntHistogramDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - count, - sum: sum.to_i64(kind), - bucket_counts: buckets, - explicit_bounds: bounds, - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - }), - NumberKind::F64 => Data::DoubleHistogram(DoubleHistogram { - data_points: vec![DoubleHistogramDataPoint { - labels, - start_time_unix_nano: to_nanos(*record.start_time()), - time_unix_nano: to_nanos(*record.end_time()), - count, - sum: sum.to_f64(kind), - bucket_counts: buckets, - explicit_bounds: bounds, - exemplars: Vec::default(), - }], - aggregation_temporality: temporality as i32, - }), - } + Data::Histogram(Histogram { + data_points: vec![HistogramDataPoint { + attributes: labels, + labels: vec![], + start_time_unix_nano: to_nanos(*record.start_time()), + time_unix_nano: to_nanos(*record.end_time()), + count, + sum: sum.to_f64(kind), + bucket_counts: buckets, + explicit_bounds: bounds, + exemplars: Vec::default(), + }], + aggregation_temporality: temporality as i32, + }) }) } else { None @@ -344,25 +293,23 @@ pub(crate) mod tonic { return; } merge_compatible_type!(base, other, - Data::IntSum => Data::IntSum; - Data::DoubleSum => Data::DoubleSum; - Data::IntGauge => Data::IntSum, Data::IntGauge; - Data::DoubleGauge => Data::DoubleSum, Data::DoubleGauge; - Data::DoubleHistogram => Data::DoubleHistogram; - Data::IntHistogram => Data::IntHistogram; - Data::DoubleSummary => Data::DoubleSummary + Data::Sum => Data::Sum; + Data::Gauge => Data::Sum, Data::Gauge; + Data::Histogram => Data::Histogram; + Data::Summary => Data::Summary ); } } #[cfg(test)] +#[allow(deprecated)] mod tests { #[cfg(feature = "tonic")] mod tonic { - use crate::proto::common::v1::StringKeyValue; + use crate::proto::common::v1::{any_value, AnyValue, KeyValue}; use crate::proto::metrics::v1::{ - metric::Data, InstrumentationLibraryMetrics, IntDataPoint, IntGauge, IntHistogram, - IntHistogramDataPoint, IntSum, Metric, ResourceMetrics, + metric::Data, number_data_point, Gauge, Histogram, HistogramDataPoint, + InstrumentationLibraryMetrics, Metric, NumberDataPoint, ResourceMetrics, Sum, }; use crate::transform::common::tonic::Attributes; use crate::transform::metrics::tonic::merge; @@ -377,10 +324,26 @@ mod tests { histogram, last_value, min_max_sum_count, SumAggregator, }; use opentelemetry::sdk::{InstrumentationLibrary, Resource}; - use opentelemetry::KeyValue; use std::cmp::Ordering; use std::sync::Arc; + impl From<(&str, &str)> for KeyValue { + fn from(kv: (&str, &str)) -> Self { + KeyValue { + key: kv.0.to_string(), + value: Some(AnyValue { + value: Some(any_value::Value::StringValue(kv.1.to_string())), + }), + } + } + } + + impl From for number_data_point::Value { + fn from(val: i64) -> Self { + number_data_point::Value::AsInt(val) + } + } + #[allow(clippy::type_complexity)] fn get_metric_with_name( name: &'static str, @@ -390,13 +353,13 @@ mod tests { name: name.to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntGauge(IntGauge { + data: Some(Data::Gauge(Gauge { data_points: data_points .into_iter() .map(|(labels, start_time, end_time, value)| { get_int_data_point(labels, start_time, end_time, value) }) - .collect::>(), + .collect::>(), })), } } @@ -406,18 +369,16 @@ mod tests { start_time: u64, end_time: u64, value: i64, - ) -> IntDataPoint { - IntDataPoint { - labels: labels + ) -> NumberDataPoint { + NumberDataPoint { + attributes: labels .into_iter() - .map(|(k, v)| StringKeyValue { - key: k.to_string(), - value: v.to_string(), - }) - .collect::>(), + .map(Into::into) + .collect::>(), + labels: vec![], start_time_unix_nano: start_time, time_unix_nano: end_time, - value, + value: Some((Number::from(value), &NumberKind::I64).into()), exemplars: vec![], } } @@ -434,8 +395,8 @@ mod tests { let attributes: Attributes = data .0 .into_iter() - .map(|(k, v)| KeyValue::new(k.to_string(), v.to_string())) - .collect::>() + .map(|(k, v)| opentelemetry::KeyValue::new(k.to_string(), v.to_string())) + .collect::>() .into(); let resource = crate::proto::resource::v1::Resource { attributes: attributes.0, @@ -527,16 +488,17 @@ mod tests { let str_kv_labels = labels .iter() .cloned() - .map(|(key, value)| StringKeyValue { - key: key.to_string(), - value: value.to_string(), - }) - .collect::>(); - let label_set = - LabelSet::from_labels(labels.iter().cloned().map(|(k, v)| KeyValue::new(k, v))); + .map(Into::into) + .collect::>(); + let label_set = LabelSet::from_labels( + labels + .iter() + .cloned() + .map(|(k, v)| opentelemetry::KeyValue::new(k, v)), + ); let resource = Resource::new(vec![ - KeyValue::new("process", "rust"), - KeyValue::new("runtime", "sync"), + opentelemetry::KeyValue::new("process", "rust"), + opentelemetry::KeyValue::new("runtime", "sync"), ]); let start_time = Utc.ymd(2020, 12, 25).and_hms(10, 10, 0); // unit nano 1608891000000000000 let end_time = Utc.ymd(2020, 12, 25).and_hms(10, 10, 30); // unix nano 1608891030000000000 @@ -568,12 +530,13 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntSum(IntSum { - data_points: vec![IntDataPoint { - labels: str_kv_labels.clone(), + data: Some(Data::Sum(Sum { + data_points: vec![NumberDataPoint { + attributes: str_kv_labels.clone(), + labels: vec![], start_time_unix_nano: 1608891000000000000, time_unix_nano: 1608891030000000000, - value: 12, + value: Some(12i64.into()), exemplars: vec![], }], aggregation_temporality: 2, @@ -613,12 +576,12 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntGauge(IntGauge { - data_points: vec![IntDataPoint { - labels: str_kv_labels.clone(), + data: Some(Data::Gauge(Gauge { + data_points: vec![NumberDataPoint { + attributes: str_kv_labels.clone(), + labels: vec![], start_time_unix_nano: 1608891000000000000, - time_unix_nano: if let Data::IntGauge(gauge) = - metric.data.clone().unwrap() + time_unix_nano: if let Data::Gauge(gauge) = metric.data.clone().unwrap() { // ignore this field as it is the time the value updated. // It changes every time the test runs @@ -626,7 +589,7 @@ mod tests { } else { 0 }, - value: 14, + value: Some(14i64.into()), exemplars: vec![], }], })), @@ -664,13 +627,14 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntHistogram(IntHistogram { - data_points: vec![IntHistogramDataPoint { - labels: str_kv_labels.clone(), + data: Some(Data::Histogram(Histogram { + data_points: vec![HistogramDataPoint { + attributes: str_kv_labels.clone(), + labels: vec![], start_time_unix_nano: 1608891000000000000, time_unix_nano: 1608891030000000000, count: 3, - sum: 6, + sum: 6f64, bucket_counts: vec![1, 3], explicit_bounds: vec![0.0, 100.0], exemplars: vec![], @@ -712,13 +676,14 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntHistogram(IntHistogram { - data_points: vec![IntHistogramDataPoint { - labels: str_kv_labels, + data: Some(Data::Histogram(Histogram { + data_points: vec![HistogramDataPoint { + attributes: str_kv_labels, + labels: vec![], start_time_unix_nano: 1608891000000000000, time_unix_nano: 1608891030000000000, count: 3, - sum: 6, + sum: 6f64, bucket_counts: vec![0, 0, 0, 3], explicit_bounds: vec![0.1, 0.2, 0.3], exemplars: vec![], @@ -771,10 +736,9 @@ mod tests { .map( |(kvs, (name, version), metric_name, (labels, start_time, end_time, value))| { ( - ResourceWrapper::from(Resource::new( - kvs.into_iter() - .map(|(k, v)| KeyValue::new(k.to_string(), v.to_string())), - )), + ResourceWrapper::from(Resource::new(kvs.into_iter().map(|(k, v)| { + opentelemetry::KeyValue::new(k.to_string(), v.to_string()) + }))), InstrumentationLibrary::new(name, version), get_metric_with_name( metric_name, @@ -840,7 +804,7 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntSum(IntSum { + data: Some(Data::Sum(Sum { data_points: vec![data_point_base.clone()], aggregation_temporality: 2, is_monotonic: true, @@ -851,7 +815,7 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntSum(IntSum { + data: Some(Data::Sum(Sum { data_points: vec![data_point_addon.clone()], aggregation_temporality: 2, is_monotonic: true, @@ -862,7 +826,7 @@ mod tests { name: "test".to_string(), description: "".to_string(), unit: "".to_string(), - data: Some(Data::IntSum(IntSum { + data: Some(Data::Sum(Sum { data_points: vec![data_point_base, data_point_addon], aggregation_temporality: 2, is_monotonic: true, diff --git a/opentelemetry-otlp/tests/grpc_build.rs b/opentelemetry-otlp/tests/grpc_build.rs index 2e7036e070..021f13d1e2 100644 --- a/opentelemetry-otlp/tests/grpc_build.rs +++ b/opentelemetry-otlp/tests/grpc_build.rs @@ -29,8 +29,10 @@ fn build_grpc() { ) .expect("Error generating protobuf"); let after_build = build_content_map(); - // we cannot use assert_eq! here because it will print both maps when they don't match, which makes - // the error message unreadable. + // we cannot use assert_eq! here because it will print both maps when they don't match, which + // makes the error message unreadable. + // If you find the test passed locally but not in CI pipeline. Try update the dependency. It may + // be a new version of protobuf or other dependencies assert!( before_build == after_build, "generated file has changed, please commit the change file and rerun the test" diff --git a/precommit.sh b/precommit.sh index f1495ca5c2..0144ba8a36 100755 --- a/precommit.sh +++ b/precommit.sh @@ -1 +1 @@ -cargo fmt --all && ./scripts/lint.sh && ./scripts/test.sh \ No newline at end of file +cargo update && cargo fmt --all && ./scripts/lint.sh && ./scripts/test.sh \ No newline at end of file