Skip to content

Commit 16f9da0

Browse files
mcruzdevcicoyle
andauthored
Change CountWordsAcitivy output format due to clashing (#1279)
Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com> Co-authored-by: Cassie Coyle <cassie@diagrid.io>
1 parent 7990ed7 commit 16f9da0

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

examples/src/main/java/io/dapr/examples/workflows/README.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,13 @@ public class CountWordsActivity implements WorkflowActivity {
226226
@Override
227227
public Object run(WorkflowActivityContext ctx) {
228228
Logger logger = LoggerFactory.getLogger(ToUpperCaseActivity.class);
229-
logger.info("Starting Activity: " + ctx.getName());
229+
logger.info("Starting Activity: {}", ctx.getName());
230230

231231
String input = ctx.getInput(String.class);
232232
StringTokenizer tokenizer = new StringTokenizer(input);
233233
int result = tokenizer.countTokens();
234234

235-
logger.info("Activity returned: " + result);
235+
logger.info("Activity returned: {}.", result);
236236
logger.info("Activity finished");
237237

238238
return result;
@@ -244,10 +244,11 @@ name: Run Chaining Pattern workflow
244244
match_order: none
245245
output_match_mode: substring
246246
expected_stdout_lines:
247-
- 'Activity returned: 2'
248-
- 'Activity returned: 9'
249-
- 'Activity returned: 21'
250-
- 'Activity returned: 17'
247+
- 'Activity returned: 2.'
248+
- 'Activity returned: 9.'
249+
- 'Activity returned: 21.'
250+
- 'Activity returned: 17.'
251+
- 'Activity returned: 11.'
251252
- 'Workflow finished with result: 60'
252253
background: true
253254
sleep: 60
@@ -270,19 +271,19 @@ Now you can see the logs from worker:
270271
```text
271272
== 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
272273
== 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
273-
== APP == 2023-11-07 14:52:03,147 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 2
274+
== APP == 2023-11-07 14:52:03,147 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 2.
274275
== APP == 2023-11-07 14:52:03,148 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished
275276
== 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
276-
== APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 9
277+
== APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 9.
277278
== APP == 2023-11-07 14:52:03,152 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished
278279
== 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
279-
== APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 21
280+
== APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 21.
280281
== APP == 2023-11-07 14:52:03,167 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished
281282
== 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
282-
== APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 17
283+
== APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 17.
283284
== APP == 2023-11-07 14:52:03,170 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished
284285
== 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
285-
== APP == 2023-11-07 14:52:03,173 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 11
286+
== APP == 2023-11-07 14:52:03,173 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity returned: 11.
286287
== APP == 2023-11-07 14:52:03,174 {HH:mm:ss.SSS} [main] INFO i.d.e.w.faninout.CountWordsActivity - Activity finished
287288
== APP == 2023-11-07 14:52:03,212 {HH:mm:ss.SSS} [main] INFO io.dapr.workflows.WorkflowContext - Workflow finished with result: 60
288289
```
@@ -538,4 +539,4 @@ The log from client:
538539
```text
539540
Started a new child-workflow model workflow with instance ID: c2fb9c83-435b-4b55-bdf1-833b39366cfb
540541
workflow instance with ID: c2fb9c83-435b-4b55-bdf1-833b39366cfb completed with result: !wolfkroW rpaD olleH
541-
```
542+
```

examples/src/main/java/io/dapr/examples/workflows/faninout/CountWordsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public class CountWordsActivity implements WorkflowActivity {
2424
@Override
2525
public Object run(WorkflowActivityContext ctx) {
2626
Logger logger = LoggerFactory.getLogger(CountWordsActivity.class);
27-
logger.info("Starting Activity: " + ctx.getName());
27+
logger.info("Starting Activity: {}", ctx.getName());
2828

2929
String input = ctx.getInput(String.class);
3030
StringTokenizer tokenizer = new StringTokenizer(input);
3131
int result = tokenizer.countTokens();
3232

33-
logger.info("Activity returned: " + result);
33+
logger.info("Activity returned: {}.", result);
3434
logger.info("Activity finished");
3535

3636
return result;

0 commit comments

Comments
 (0)