Udate deps, backend list for plain node

This commit is contained in:
Dominik Werder
2024-06-12 13:43:28 +02:00
parent 437e6d0d76
commit 03e8ac7a70
35 changed files with 1459 additions and 343 deletions

View File

@@ -166,6 +166,7 @@ impl Future for Collect {
break if self.done_input {
if self.timeout {
if let Some(coll) = self.collector.as_mut() {
info!("Collect call set_timed_out");
coll.set_timed_out();
} else {
warn!("collect timeout but no collector yet");
@@ -199,7 +200,7 @@ impl Future for Collect {
continue;
}
Err(e) => {
error!("{e}");
error!("Collect {e}");
Ready(Err(e))
}
},
@@ -241,6 +242,7 @@ where
warn!("collect timeout");
timed_out = true;
if let Some(coll) = collector.as_mut() {
info!("collect_in_span call set_timed_out");
coll.set_timed_out();
} else {
warn!("collect timeout but no collector yet");
@@ -269,6 +271,7 @@ where
coll.ingest(&mut item);
if coll.len() as u64 >= events_max {
warn!("span reached events_max {}", events_max);
info!("collect_in_span call set_continue_at_here");
coll.set_continue_at_here();
break;
}

View File

@@ -24,7 +24,7 @@ pub async fn plain_events_json(
_cluster: &Cluster,
open_bytes: OpenBoxedBytesStreamsBox,
) -> Result<JsonValue, Error> {
info!("plain_events_json evquery {:?}", evq);
debug!("plain_events_json evquery {:?}", evq);
let deadline = Instant::now() + evq.timeout();
let stream = dyn_events_stream(evq, ch_conf, ctx, open_bytes).await?;
@@ -40,7 +40,7 @@ pub async fn plain_events_json(
//let stream = EventsToTimeBinnable::new(stream);
//let stream = TimeBinnableToCollectable::new(stream);
let stream = Box::pin(stream);
info!("plain_events_json boxed stream created");
debug!("plain_events_json boxed stream created");
let collected = Collect::new(
stream,
deadline,
@@ -50,9 +50,9 @@ pub async fn plain_events_json(
None,
)
.await?;
info!("plain_events_json collected");
debug!("plain_events_json collected");
let jsval = serde_json::to_value(&collected)?;
info!("plain_events_json json serialized");
debug!("plain_events_json json serialized");
Ok(jsval)
}

View File

@@ -33,6 +33,7 @@ pub async fn dyn_events_stream(
evq.transform().clone(),
evq.test_do_wasm(),
evq,
evq.log_level().into(),
ctx,
);
let inmem_bufcap = subq.inmem_bufcap();

View File

@@ -203,6 +203,7 @@ pub fn make_sub_query<SUB>(
transform: TransformQuery,
test_do_wasm: Option<&str>,
sub: SUB,
log_level: String,
ctx: &ReqCtx,
) -> EventsSubQuery
where
@@ -213,6 +214,6 @@ where
select.set_wasm1(wasm1.into());
}
let settings = sub.into();
let subq = EventsSubQuery::from_parts(select, settings, ctx.reqid().into());
let subq = EventsSubQuery::from_parts(select, settings, ctx.reqid().into(), log_level);
subq
}

View File

@@ -50,6 +50,7 @@ async fn timebinnable_stream(
query.transform().clone(),
query.test_do_wasm(),
&query,
query.log_level().into(),
ctx,
);
let inmem_bufcap = subq.inmem_bufcap();