Skip to content

Commit 65f3170

Browse files
aumetraaumetra
committed
Regenerate protobuf types
1 parent 9b82a61 commit 65f3170

4 files changed

+21
-54
lines changed

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs

+6-17
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,17 @@ pub mod logs_service_server {
207207
/// case logs are sent/received to/from multiple Applications).
208208
#[derive(Debug)]
209209
pub struct LogsServiceServer<T: LogsService> {
210-
inner: _Inner<T>,
210+
inner: Arc<T>,
211211
accept_compression_encodings: EnabledCompressionEncodings,
212212
send_compression_encodings: EnabledCompressionEncodings,
213213
max_decoding_message_size: Option<usize>,
214214
max_encoding_message_size: Option<usize>,
215215
}
216-
struct _Inner<T>(Arc<T>);
217216
impl<T: LogsService> LogsServiceServer<T> {
218217
pub fn new(inner: T) -> Self {
219218
Self::from_arc(Arc::new(inner))
220219
}
221220
pub fn from_arc(inner: Arc<T>) -> Self {
222-
let inner = _Inner(inner);
223221
Self {
224222
inner,
225223
accept_compression_encodings: Default::default(),
@@ -282,7 +280,6 @@ pub mod logs_service_server {
282280
Poll::Ready(Ok(()))
283281
}
284282
fn call(&mut self, req: http::Request<B>) -> Self::Future {
285-
let inner = self.inner.clone();
286283
match req.uri().path() {
287284
"/opentelemetry.proto.collector.logs.v1.LogsService/Export" => {
288285
#[allow(non_camel_case_types)]
@@ -313,7 +310,6 @@ pub mod logs_service_server {
313310
let max_encoding_message_size = self.max_encoding_message_size;
314311
let inner = self.inner.clone();
315312
let fut = async move {
316-
let inner = inner.0;
317313
let method = ExportSvc(inner);
318314
let codec = tonic::codec::ProstCodec::default();
319315
let mut grpc = tonic::server::Grpc::new(codec)
@@ -335,8 +331,11 @@ pub mod logs_service_server {
335331
Ok(
336332
http::Response::builder()
337333
.status(200)
338-
.header("grpc-status", "12")
339-
.header("content-type", "application/grpc")
334+
.header("grpc-status", tonic::Code::Unimplemented as i32)
335+
.header(
336+
http::header::CONTENT_TYPE,
337+
tonic::metadata::GRPC_CONTENT_TYPE,
338+
)
340339
.body(empty_body())
341340
.unwrap(),
342341
)
@@ -357,16 +356,6 @@ pub mod logs_service_server {
357356
}
358357
}
359358
}
360-
impl<T: LogsService> Clone for _Inner<T> {
361-
fn clone(&self) -> Self {
362-
Self(Arc::clone(&self.0))
363-
}
364-
}
365-
impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
366-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
367-
write!(f, "{:?}", self.0)
368-
}
369-
}
370359
impl<T: LogsService> tonic::server::NamedService for LogsServiceServer<T> {
371360
const NAME: &'static str = "opentelemetry.proto.collector.logs.v1.LogsService";
372361
}

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs

+6-17
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,17 @@ pub mod metrics_service_server {
207207
/// central collector.
208208
#[derive(Debug)]
209209
pub struct MetricsServiceServer<T: MetricsService> {
210-
inner: _Inner<T>,
210+
inner: Arc<T>,
211211
accept_compression_encodings: EnabledCompressionEncodings,
212212
send_compression_encodings: EnabledCompressionEncodings,
213213
max_decoding_message_size: Option<usize>,
214214
max_encoding_message_size: Option<usize>,
215215
}
216-
struct _Inner<T>(Arc<T>);
217216
impl<T: MetricsService> MetricsServiceServer<T> {
218217
pub fn new(inner: T) -> Self {
219218
Self::from_arc(Arc::new(inner))
220219
}
221220
pub fn from_arc(inner: Arc<T>) -> Self {
222-
let inner = _Inner(inner);
223221
Self {
224222
inner,
225223
accept_compression_encodings: Default::default(),
@@ -282,7 +280,6 @@ pub mod metrics_service_server {
282280
Poll::Ready(Ok(()))
283281
}
284282
fn call(&mut self, req: http::Request<B>) -> Self::Future {
285-
let inner = self.inner.clone();
286283
match req.uri().path() {
287284
"/opentelemetry.proto.collector.metrics.v1.MetricsService/Export" => {
288285
#[allow(non_camel_case_types)]
@@ -313,7 +310,6 @@ pub mod metrics_service_server {
313310
let max_encoding_message_size = self.max_encoding_message_size;
314311
let inner = self.inner.clone();
315312
let fut = async move {
316-
let inner = inner.0;
317313
let method = ExportSvc(inner);
318314
let codec = tonic::codec::ProstCodec::default();
319315
let mut grpc = tonic::server::Grpc::new(codec)
@@ -335,8 +331,11 @@ pub mod metrics_service_server {
335331
Ok(
336332
http::Response::builder()
337333
.status(200)
338-
.header("grpc-status", "12")
339-
.header("content-type", "application/grpc")
334+
.header("grpc-status", tonic::Code::Unimplemented as i32)
335+
.header(
336+
http::header::CONTENT_TYPE,
337+
tonic::metadata::GRPC_CONTENT_TYPE,
338+
)
340339
.body(empty_body())
341340
.unwrap(),
342341
)
@@ -357,16 +356,6 @@ pub mod metrics_service_server {
357356
}
358357
}
359358
}
360-
impl<T: MetricsService> Clone for _Inner<T> {
361-
fn clone(&self) -> Self {
362-
Self(Arc::clone(&self.0))
363-
}
364-
}
365-
impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
366-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
367-
write!(f, "{:?}", self.0)
368-
}
369-
}
370359
impl<T: MetricsService> tonic::server::NamedService for MetricsServiceServer<T> {
371360
const NAME: &'static str = "opentelemetry.proto.collector.metrics.v1.MetricsService";
372361
}

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs

+6-17
Original file line numberDiff line numberDiff line change
@@ -207,19 +207,17 @@ pub mod trace_service_server {
207207
/// case spans are sent/received to/from multiple Applications).
208208
#[derive(Debug)]
209209
pub struct TraceServiceServer<T: TraceService> {
210-
inner: _Inner<T>,
210+
inner: Arc<T>,
211211
accept_compression_encodings: EnabledCompressionEncodings,
212212
send_compression_encodings: EnabledCompressionEncodings,
213213
max_decoding_message_size: Option<usize>,
214214
max_encoding_message_size: Option<usize>,
215215
}
216-
struct _Inner<T>(Arc<T>);
217216
impl<T: TraceService> TraceServiceServer<T> {
218217
pub fn new(inner: T) -> Self {
219218
Self::from_arc(Arc::new(inner))
220219
}
221220
pub fn from_arc(inner: Arc<T>) -> Self {
222-
let inner = _Inner(inner);
223221
Self {
224222
inner,
225223
accept_compression_encodings: Default::default(),
@@ -282,7 +280,6 @@ pub mod trace_service_server {
282280
Poll::Ready(Ok(()))
283281
}
284282
fn call(&mut self, req: http::Request<B>) -> Self::Future {
285-
let inner = self.inner.clone();
286283
match req.uri().path() {
287284
"/opentelemetry.proto.collector.trace.v1.TraceService/Export" => {
288285
#[allow(non_camel_case_types)]
@@ -313,7 +310,6 @@ pub mod trace_service_server {
313310
let max_encoding_message_size = self.max_encoding_message_size;
314311
let inner = self.inner.clone();
315312
let fut = async move {
316-
let inner = inner.0;
317313
let method = ExportSvc(inner);
318314
let codec = tonic::codec::ProstCodec::default();
319315
let mut grpc = tonic::server::Grpc::new(codec)
@@ -335,8 +331,11 @@ pub mod trace_service_server {
335331
Ok(
336332
http::Response::builder()
337333
.status(200)
338-
.header("grpc-status", "12")
339-
.header("content-type", "application/grpc")
334+
.header("grpc-status", tonic::Code::Unimplemented as i32)
335+
.header(
336+
http::header::CONTENT_TYPE,
337+
tonic::metadata::GRPC_CONTENT_TYPE,
338+
)
340339
.body(empty_body())
341340
.unwrap(),
342341
)
@@ -357,16 +356,6 @@ pub mod trace_service_server {
357356
}
358357
}
359358
}
360-
impl<T: TraceService> Clone for _Inner<T> {
361-
fn clone(&self) -> Self {
362-
Self(Arc::clone(&self.0))
363-
}
364-
}
365-
impl<T: std::fmt::Debug> std::fmt::Debug for _Inner<T> {
366-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
367-
write!(f, "{:?}", self.0)
368-
}
369-
}
370359
impl<T: TraceService> tonic::server::NamedService for TraceServiceServer<T> {
371360
const NAME: &'static str = "opentelemetry.proto.collector.trace.v1.TraceService";
372361
}

‎opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ pub mod number_data_point {
335335
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
336336
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
337337
#[allow(clippy::derive_partial_eq_without_eq)]
338-
#[derive(Clone, PartialEq, ::prost::Oneof)]
338+
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
339339
pub enum Value {
340340
#[prost(double, tag = "4")]
341341
AsDouble(f64),
@@ -624,7 +624,7 @@ pub mod summary_data_point {
624624
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
625625
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
626626
#[allow(clippy::derive_partial_eq_without_eq)]
627-
#[derive(Clone, PartialEq, ::prost::Message)]
627+
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
628628
pub struct ValueAtQuantile {
629629
/// The quantile of a distribution. Must be in the interval
630630
/// \[0.0, 1.0\].
@@ -685,7 +685,7 @@ pub mod exemplar {
685685
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
686686
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
687687
#[allow(clippy::derive_partial_eq_without_eq)]
688-
#[derive(Clone, PartialEq, ::prost::Oneof)]
688+
#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
689689
pub enum Value {
690690
#[prost(double, tag = "3")]
691691
AsDouble(f64),

0 commit comments

Comments
 (0)