Skip to content

refactor(app/integration): forward-compatible test code #3699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

refactor(app/integration): forward-compatible test code #3699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions linkerd/app/integration/src/tests/telemetry/log_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,26 @@ async fn query_log_stream(

/// Spawns a task to collect all the logs in a streaming body and parse them as
/// JSON.
fn collect_logs(
mut body: hyper::Body,
) -> (JoinHandle<Vec<serde_json::Value>>, oneshot::Sender<()>) {
fn collect_logs<B>(body: B) -> (JoinHandle<Vec<serde_json::Value>>, oneshot::Sender<()>)
where
B: Body<Data = Bytes> + Send + Unpin + 'static,
B::Error: std::error::Error,
{
let mut body = linkerd_http_body_compat::ForwardCompatibleBody::new(body);
let (done_tx, done_rx) = oneshot::channel();
let result = tokio::spawn(async move {
let mut result = Vec::new();
let logs = &mut result;
let fut = async move {
while let Some(res) = body.data().await {
while let Some(res) = body.frame().await {
let chunk = match res {
Ok(chunk) => chunk,
Ok(frame) => {
if let Ok(data) = frame.into_data() {
data
} else {
break;
}
}
Err(e) => {
println!("body failed: {}", e);
break;
Expand Down
Loading