Skip to content

Commit f1c6c69

Browse files
lym953claude
andcommitted
merge: resolve conflict with main — fix Processor::new call in new test
A new test added in main calls Processor::new with 5 args, missing the durable_context_tx parameter added on this branch. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 2120e5a commit f1c6c69

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

bottlecap/src/lifecycle/invocation/processor.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2206,12 +2206,14 @@ mod tests {
22062206
AggregatorService::new(EMPTY_TAGS, 1024).expect("failed to create aggregator service");
22072207
tokio::spawn(aggregator_service.run());
22082208
let propagator = Arc::new(DatadogCompositePropagator::new(Arc::clone(&config)));
2209+
let (durable_context_tx, _) = tokio::sync::mpsc::channel(1);
22092210
let mut p = Processor::new(
22102211
Arc::clone(&tags_provider),
22112212
Arc::clone(&config),
22122213
aws_config,
22132214
aggregator_handle,
22142215
propagator,
2216+
durable_context_tx,
22152217
);
22162218

22172219
let (trace_tx, mut trace_rx) = mpsc::channel(10);

0 commit comments

Comments
 (0)