Skip to content

Commit 6ed2b43

Browse files
lalitblalitb
authored
Fix CI - Regenerate proto files, and selective msrv-patching (#2159)
1 parent 161929d commit 6ed2b43

File tree

5 files changed

+109
-56
lines changed

5 files changed

+109
-56
lines changed

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

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ pub struct ExportLogsPartialSuccess {
6161
/// Generated client implementations.
6262
#[cfg(feature = "gen-tonic")]
6363
pub mod logs_service_client {
64-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
64+
#![allow(
65+
unused_variables,
66+
dead_code,
67+
missing_docs,
68+
clippy::wildcard_imports,
69+
clippy::let_unit_value,
70+
)]
6571
use tonic::codegen::*;
6672
use tonic::codegen::http::Uri;
6773
/// Service that can be used to push logs between one Application instrumented with
@@ -160,8 +166,7 @@ pub mod logs_service_client {
160166
.ready()
161167
.await
162168
.map_err(|e| {
163-
tonic::Status::new(
164-
tonic::Code::Unknown,
169+
tonic::Status::unknown(
165170
format!("Service was not ready: {}", e.into()),
166171
)
167172
})?;
@@ -184,7 +189,13 @@ pub mod logs_service_client {
184189
/// Generated server implementations.
185190
#[cfg(feature = "gen-tonic")]
186191
pub mod logs_service_server {
187-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
192+
#![allow(
193+
unused_variables,
194+
dead_code,
195+
missing_docs,
196+
clippy::wildcard_imports,
197+
clippy::let_unit_value,
198+
)]
188199
use tonic::codegen::*;
189200
/// Generated trait containing gRPC methods that should be implemented for use with LogsServiceServer.
190201
#[async_trait]
@@ -325,17 +336,19 @@ pub mod logs_service_server {
325336
}
326337
_ => {
327338
Box::pin(async move {
328-
Ok(
329-
http::Response::builder()
330-
.status(200)
331-
.header("grpc-status", tonic::Code::Unimplemented as i32)
332-
.header(
333-
http::header::CONTENT_TYPE,
334-
tonic::metadata::GRPC_CONTENT_TYPE,
335-
)
336-
.body(empty_body())
337-
.unwrap(),
338-
)
339+
let mut response = http::Response::new(empty_body());
340+
let headers = response.headers_mut();
341+
headers
342+
.insert(
343+
tonic::Status::GRPC_STATUS,
344+
(tonic::Code::Unimplemented as i32).into(),
345+
);
346+
headers
347+
.insert(
348+
http::header::CONTENT_TYPE,
349+
tonic::metadata::GRPC_CONTENT_TYPE,
350+
);
351+
Ok(response)
339352
})
340353
}
341354
}

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

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ pub struct ExportMetricsPartialSuccess {
6161
/// Generated client implementations.
6262
#[cfg(feature = "gen-tonic")]
6363
pub mod metrics_service_client {
64-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
64+
#![allow(
65+
unused_variables,
66+
dead_code,
67+
missing_docs,
68+
clippy::wildcard_imports,
69+
clippy::let_unit_value,
70+
)]
6571
use tonic::codegen::*;
6672
use tonic::codegen::http::Uri;
6773
/// Service that can be used to push metrics between one Application
@@ -160,8 +166,7 @@ pub mod metrics_service_client {
160166
.ready()
161167
.await
162168
.map_err(|e| {
163-
tonic::Status::new(
164-
tonic::Code::Unknown,
169+
tonic::Status::unknown(
165170
format!("Service was not ready: {}", e.into()),
166171
)
167172
})?;
@@ -184,7 +189,13 @@ pub mod metrics_service_client {
184189
/// Generated server implementations.
185190
#[cfg(feature = "gen-tonic")]
186191
pub mod metrics_service_server {
187-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
192+
#![allow(
193+
unused_variables,
194+
dead_code,
195+
missing_docs,
196+
clippy::wildcard_imports,
197+
clippy::let_unit_value,
198+
)]
188199
use tonic::codegen::*;
189200
/// Generated trait containing gRPC methods that should be implemented for use with MetricsServiceServer.
190201
#[async_trait]
@@ -325,17 +336,19 @@ pub mod metrics_service_server {
325336
}
326337
_ => {
327338
Box::pin(async move {
328-
Ok(
329-
http::Response::builder()
330-
.status(200)
331-
.header("grpc-status", tonic::Code::Unimplemented as i32)
332-
.header(
333-
http::header::CONTENT_TYPE,
334-
tonic::metadata::GRPC_CONTENT_TYPE,
335-
)
336-
.body(empty_body())
337-
.unwrap(),
338-
)
339+
let mut response = http::Response::new(empty_body());
340+
let headers = response.headers_mut();
341+
headers
342+
.insert(
343+
tonic::Status::GRPC_STATUS,
344+
(tonic::Code::Unimplemented as i32).into(),
345+
);
346+
headers
347+
.insert(
348+
http::header::CONTENT_TYPE,
349+
tonic::metadata::GRPC_CONTENT_TYPE,
350+
);
351+
Ok(response)
339352
})
340353
}
341354
}

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

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ pub struct ExportTracePartialSuccess {
6161
/// Generated client implementations.
6262
#[cfg(feature = "gen-tonic")]
6363
pub mod trace_service_client {
64-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
64+
#![allow(
65+
unused_variables,
66+
dead_code,
67+
missing_docs,
68+
clippy::wildcard_imports,
69+
clippy::let_unit_value,
70+
)]
6571
use tonic::codegen::*;
6672
use tonic::codegen::http::Uri;
6773
/// Service that can be used to push spans between one Application instrumented with
@@ -160,8 +166,7 @@ pub mod trace_service_client {
160166
.ready()
161167
.await
162168
.map_err(|e| {
163-
tonic::Status::new(
164-
tonic::Code::Unknown,
169+
tonic::Status::unknown(
165170
format!("Service was not ready: {}", e.into()),
166171
)
167172
})?;
@@ -184,7 +189,13 @@ pub mod trace_service_client {
184189
/// Generated server implementations.
185190
#[cfg(feature = "gen-tonic")]
186191
pub mod trace_service_server {
187-
#![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
192+
#![allow(
193+
unused_variables,
194+
dead_code,
195+
missing_docs,
196+
clippy::wildcard_imports,
197+
clippy::let_unit_value,
198+
)]
188199
use tonic::codegen::*;
189200
/// Generated trait containing gRPC methods that should be implemented for use with TraceServiceServer.
190201
#[async_trait]
@@ -325,17 +336,19 @@ pub mod trace_service_server {
325336
}
326337
_ => {
327338
Box::pin(async move {
328-
Ok(
329-
http::Response::builder()
330-
.status(200)
331-
.header("grpc-status", tonic::Code::Unimplemented as i32)
332-
.header(
333-
http::header::CONTENT_TYPE,
334-
tonic::metadata::GRPC_CONTENT_TYPE,
335-
)
336-
.body(empty_body())
337-
.unwrap(),
338-
)
339+
let mut response = http::Response::new(empty_body());
340+
let headers = response.headers_mut();
341+
headers
342+
.insert(
343+
tonic::Status::GRPC_STATUS,
344+
(tonic::Code::Unimplemented as i32).into(),
345+
);
346+
headers
347+
.insert(
348+
http::header::CONTENT_TYPE,
349+
tonic::metadata::GRPC_CONTENT_TYPE,
350+
);
351+
Ok(response)
339352
})
340353
}
341354
}

‎opentelemetry-proto/tests/grpc_build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn build_tonic() {
125125

126126
builder
127127
.out_dir(out_dir.path())
128-
.compile(TONIC_PROTO_FILES, TONIC_INCLUDES)
128+
.compile_protos(TONIC_PROTO_FILES, TONIC_INCLUDES)
129129
.expect("cannot compile protobuf using tonic");
130130

131131
let after_build = build_content_map(out_dir.path(), true);

‎scripts/patch_dependencies.sh

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
#!/bin/bash
22

3-
function patch_version() {
4-
local latest_version=$(cargo search --limit 1 $1 | head -1 | cut -d'"' -f2)
5-
echo "patching $1 from $latest_version to $2"
6-
cargo update -p $1:$latest_version --precise $2
3+
# Function to compare two version numbers
4+
function version_lt() {
5+
[ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" != "$2" ]
76
}
87

9-
patch_version cc 1.0.105
10-
patch_version url 2.5.0
11-
patch_version hyper-rustls 0.27.2 # 0.27.3 needs rustc v1.70.0
12-
patch_version tokio-util 0.7.11 # 0.7.12 needs rustc v1.70.0
13-
patch_version tokio-stream 0.1.15 # 0.1.16 needs rustc v1.70.0
14-
patch_version tokio 1.38.0 # 1.39 needs msrv bump to rustc 1.70
8+
# Get the current Rust compiler version
9+
rust_version=$(rustc --version | cut -d' ' -f2)
10+
11+
# Target version (Rust 1.71.1)
12+
target_version="1.71.1"
13+
14+
function patch_version() {
15+
local latest_version=$(cargo search --limit 1 $1 | head -1 | cut -d'"' -f2)
16+
echo "patching $1 from $latest_version to $2"
17+
cargo update -p $1:$latest_version --precise $2
18+
}
19+
20+
patch_version cc 1.0.105
21+
patch_version url 2.5.0
22+
if version_lt "$rust_version" "$target_version"; then
23+
patch_version tonic 0.12.2
24+
patch_version hyper-rustls 0.27.2 # 0.27.3 needs rustc v1.70.0
25+
patch_version tokio-util 0.7.11 # 0.7.12 needs rustc v1.70.0
26+
patch_version tokio-stream 0.1.15 # 0.1.16 needs rustc v1.70.0
27+
patch_version tokio 1.38.0 # 1.39 needs msrv bump to rustc 1.70
28+
fi

0 commit comments

Comments
 (0)