From 16f9da0c4bf9b9bcb0a46385dddff54d44a4a877 Mon Sep 17 00:00:00 2001 From: Matheus Cruz <56329339+mcruzdev@users.noreply.github.com> Date: Tue, 25 Mar 2025 11:17:13 -0300 Subject: [PATCH] Change CountWordsAcitivy output format due to clashing (#1279) Signed-off-by: Matheus Cruz Co-authored-by: Cassie Coyle --- .../java/io/dapr/examples/workflows/README.md | 25 ++++++++++--------- .../faninout/CountWordsActivity.java | 4 +-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/examples/src/main/java/io/dapr/examples/workflows/README.md b/examples/src/main/java/io/dapr/examples/workflows/README.md index 4cd4c135a..047f1d744 100644 --- a/examples/src/main/java/io/dapr/examples/workflows/README.md +++ b/examples/src/main/java/io/dapr/examples/workflows/README.md @@ -226,13 +226,13 @@ public class CountWordsActivity implements WorkflowActivity { @Override public Object run(WorkflowActivityContext ctx) { Logger logger = LoggerFactory.getLogger(ToUpperCaseActivity.class); - logger.info("Starting Activity: " + ctx.getName()); + logger.info("Starting Activity: {}", ctx.getName()); String input = ctx.getInput(String.class); StringTokenizer tokenizer = new StringTokenizer(input); int result = tokenizer.countTokens(); - logger.info("Activity returned: " + result); + logger.info("Activity returned: {}.", result); logger.info("Activity finished"); return result; @@ -244,10 +244,11 @@ name: Run Chaining Pattern workflow match_order: none output_match_mode: substring expected_stdout_lines: - - 'Activity returned: 2' - - 'Activity returned: 9' - - 'Activity returned: 21' - - 'Activity returned: 17' + - 'Activity returned: 2.' + - 'Activity returned: 9.' + - 'Activity returned: 21.' + - 'Activity returned: 17.' + - 'Activity returned: 11.' - 'Workflow finished with result: 60' background: true sleep: 60 @@ -270,19 +271,19 @@ Now you can see the logs from worker: ```text == APP == 2023-11-07 14:52:03,075 {HH:mm:ss.SSS} [main] INFO io.dapr.workflows.WorkflowContext - Starting Workflow: io.dapr.examples.workflows.faninout.DemoFanInOutWorkflow == APP == 2023-11-07 14:52:03,144 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Starting Activity: io.dapr.examples.workflows.faninout.CountWordsActivity -== APP == 2023-11-07 14:52:03,147 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 2 +== APP == 2023-11-07 14:52:03,147 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 2. == APP == 2023-11-07 14:52:03,148 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished == APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Starting Activity: io.dapr.examples.workflows.faninout.CountWordsActivity -== APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 9 +== APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 9. == APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished == APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Starting Activity: io.dapr.examples.workflows.faninout.CountWordsActivity -== APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 21 +== APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 21. == APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished == APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Starting Activity: io.dapr.examples.workflows.faninout.CountWordsActivity -== APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 17 +== APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 17. == APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished == APP == 2023-11-07 14:52:03,173 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Starting Activity: io.dapr.examples.workflows.faninout.CountWordsActivity -== APP == 2023-11-07 14:52:03,173 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 11 +== APP == 2023-11-07 14:52:03,173 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 11. == APP == 2023-11-07 14:52:03,174 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished == APP == 2023-11-07 14:52:03,212 {HH:mm:ss.SSS} [main] INFO io.dapr.workflows.WorkflowContext - Workflow finished with result: 60 ``` @@ -538,4 +539,4 @@ The log from client: ```text Started a new child-workflow model workflow with instance ID: c2fb9c83-435b-4b55-bdf1-833b39366cfb workflow instance with ID: c2fb9c83-435b-4b55-bdf1-833b39366cfb completed with result: !wolfkroW rpaD olleH -``` \ No newline at end of file +``` diff --git a/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java b/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java index 654b4e884..cf3f63720 100644 --- a/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java +++ b/examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java @@ -24,13 +24,13 @@ public class CountWordsActivity implements WorkflowActivity { @Override public Object run(WorkflowActivityContext ctx) { Logger logger = LoggerFactory.getLogger(CountWordsActivity.class); - logger.info("Starting Activity: " + ctx.getName()); + logger.info("Starting Activity: {}", ctx.getName()); String input = ctx.getInput(String.class); StringTokenizer tokenizer = new StringTokenizer(input); int result = tokenizer.countTokens(); - logger.info("Activity returned: " + result); + logger.info("Activity returned: {}.", result); logger.info("Activity finished"); return result;