Interleave query

crates/items_2/src/binning/aggregator.rs

@@ -73,7 +73,7 @@ where
 
     fn result_and_reset_for_new_bin(&mut self, filled_width_fraction: f32) -> EVT::AggTimeWeightOutputAvg {
         let sum = self.sum.clone();
-        trace!("result_and_reset_for_new_bin  sum {}  {}", sum, filled_width_fraction);
+        trace_result!("result_and_reset_for_new_bin  sum {}  {}", sum, filled_width_fraction);
         self.sum = 0.;
         sum / filled_width_fraction as f64
     }

crates/items_2/src/binning/container_bins.rs

@@ -472,7 +472,6 @@ where
             avgs,
         };
         let ret = serde_json::to_value(&val).map_err(err::Error::from_string);
-        info!("VALUE: {:?}", ret);
         ret
     }
 }
@@ -540,10 +539,7 @@ where
         range: Option<netpod::range::evrange::SeriesRange>,
         binrange: Option<netpod::BinnedRangeEnum>,
     ) -> Result<Box<dyn items_0::collect_s::CollectedDyn>, err::Error> {
-        info!(
-            "-----------   ContainerBinsCollector  result called  len {}",
-            self.len()
-        );
+        // TODO do we need to set timeout, continueAt or anything?
         let bins = mem::replace(&mut self.bins, ContainerBins::new());
         let ret = ContainerBinsCollectorOutput { bins };
         Ok(Box::new(ret))

crates/items_2/src/binning/timeweight/timeweight_events.rs

@@ -18,28 +18,28 @@ use std::mem;
 macro_rules! trace_ { ($($arg:tt)*) => ( if true { trace!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_init { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_init { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_cycle { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_cycle { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
 macro_rules! trace_event_next { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_ingest_init_lst { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_ingest_init_lst { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_ingest_minmax { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_ingest_minmax { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
 macro_rules! trace_ingest_event { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_ingest_firsts { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_ingest_firsts { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
-macro_rules! trace_ingest_finish_bin { ($($arg:tt)*) => ( if true { trace_!($($arg)*); }) }
+macro_rules! trace_ingest_finish_bin { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }
 
 #[allow(unused)]
 macro_rules! trace_ingest_container { ($($arg:tt)*) => ( if false { trace_!($($arg)*); }) }