Skip to content

Commit a0c5807

Browse files
Merge branch 'master' into fix-worflow-maxRetryInterval
2 parents 170663b + 129c29d commit a0c5807

File tree

22 files changed

+393
-393
lines changed

22 files changed

+393
-393
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ jobs:
117117
GOARCH: amd64
118118
GOPROXY: https://proxy.golang.org
119119
JDK_VER: ${{ matrix.java }}
120-
DAPR_CLI_VER: 1.17.0-rc.2
121-
DAPR_RUNTIME_VER: 1.17.0-rc.10
122-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0-rc.2/install/install.sh
120+
DAPR_CLI_VER: 1.17.0
121+
DAPR_RUNTIME_VER: 1.17.0
122+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh
123123
DAPR_CLI_REF:
124124
DAPR_REF:
125125
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

.github/workflows/validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
40-
DAPR_CLI_VER: 1.17.0-rc.2
41-
DAPR_RUNTIME_VER: 1.17.0-rc.10
42-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0-rc.2/install/install.sh
40+
DAPR_CLI_VER: 1.17.0
41+
DAPR_RUNTIME_VER: 1.17.0
42+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:
4545
steps:

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -260,49 +260,49 @@ dapr run --resources-path ./components/actors --app-id demoactorclient -- java -
260260
Once running, the `demoactorservice` logs will start displaying the different steps:
261261
First, we can see actors being activated and the `say` method being invoked:
262262
```text
263-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-5] INFO io.dapr.actors.ActorTrace - Actor:a855706e-f477-4530-9bff-d7b1cd2988f8 Activating ...
263+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-5] INFO io.dapr.actors.ActorTrace - Actor:a855706e-f477-4530-9bff-d7b1cd2988f8 Activating ...
264264
265-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-6] INFO io.dapr.actors.ActorTrace - Actor:4720f646-baaa-4fae-86dd-aec2fc2ead6e Activating ...
265+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-6] INFO io.dapr.actors.ActorTrace - Actor:4720f646-baaa-4fae-86dd-aec2fc2ead6e Activating ...
266266
267-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-7] INFO io.dapr.actors.ActorTrace - Actor:d54592a5-5b5b-4925-8974-6cf309fbdbbf Activating ...
267+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-7] INFO io.dapr.actors.ActorTrace - Actor:d54592a5-5b5b-4925-8974-6cf309fbdbbf Activating ...
268268
269-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-5] INFO io.dapr.actors.ActorTrace - Actor:a855706e-f477-4530-9bff-d7b1cd2988f8 Activated
269+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-5] INFO io.dapr.actors.ActorTrace - Actor:a855706e-f477-4530-9bff-d7b1cd2988f8 Activated
270270
271-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-7] INFO io.dapr.actors.ActorTrace - Actor:d54592a5-5b5b-4925-8974-6cf309fbdbbf Activated
271+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-7] INFO io.dapr.actors.ActorTrace - Actor:d54592a5-5b5b-4925-8974-6cf309fbdbbf Activated
272272
273-
== APP == 2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-6] INFO io.dapr.actors.ActorTrace - Actor:4720f646-baaa-4fae-86dd-aec2fc2ead6e Activated
273+
2023-05-23 11:04:47,348 {HH:mm:ss.SSS} [http-nio-3000-exec-6] INFO io.dapr.actors.ActorTrace - Actor:4720f646-baaa-4fae-86dd-aec2fc2ead6e Activated
274274
275-
== APP == Server say method for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf: Message #2 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:48.459
275+
Server say method for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf: Message #2 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:48.459
276276
277-
== APP == Server say method for actor 4720f646-baaa-4fae-86dd-aec2fc2ead6e: Message #4 received from actor at index 2 with ID 4720f646-baaa-4fae-86dd-aec2fc2ead6e @ 2023-05-23 11:04:48.695
277+
Server say method for actor 4720f646-baaa-4fae-86dd-aec2fc2ead6e: Message #4 received from actor at index 2 with ID 4720f646-baaa-4fae-86dd-aec2fc2ead6e @ 2023-05-23 11:04:48.695
278278
279-
== APP == Server say method for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf: Message #3 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:48.708
279+
Server say method for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf: Message #3 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:48.708
280280
```
281281

282282
Then we can see reminders and timers in action:
283283
```text
284-
== APP == Server timer triggered with state ping! {0} for actor a855706e-f477-4530-9bff-d7b1cd2988f8@ 2023-05-23 11:04:49.021
284+
Server timer triggered with state ping! {0} for actor a855706e-f477-4530-9bff-d7b1cd2988f8@ 2023-05-23 11:04:49.021
285285
286-
== APP == Server timer triggered with state ping! {1} for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf@ 2023-05-23 11:04:49.021
286+
Server timer triggered with state ping! {1} for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf@ 2023-05-23 11:04:49.021
287287
288-
== APP == Reminder myremind with state {2} triggered for actor 4720f646-baaa-4fae-86dd-aec2fc2ead6e @ 2023-05-23 11:04:52.012
288+
Reminder myremind with state {2} triggered for actor 4720f646-baaa-4fae-86dd-aec2fc2ead6e @ 2023-05-23 11:04:52.012
289289
290-
== APP == Reminder myremind with state {1} triggered for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:52.012
290+
Reminder myremind with state {1} triggered for actor d54592a5-5b5b-4925-8974-6cf309fbdbbf @ 2023-05-23 11:04:52.012
291291
292-
== APP == Reminder myremind with state {0} triggered for actor a855706e-f477-4530-9bff-d7b1cd2988f8 @ 2023-05-23 11:04:52.012
292+
Reminder myremind with state {0} triggered for actor a855706e-f477-4530-9bff-d7b1cd2988f8 @ 2023-05-23 11:04:52.012
293293
```
294294

295295
Finally, the console for `demoactorclient` got the service responses:
296296
```text
297-
== APP == Reply 2023-05-23 11:04:49.288 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
297+
Reply 2023-05-23 11:04:49.288 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
298298
299-
== APP == Reply 2023-05-23 11:04:49.408 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
299+
Reply 2023-05-23 11:04:49.408 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
300300
301-
== APP == Reply 2023-05-23 11:04:49.515 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf
301+
Reply 2023-05-23 11:04:49.515 received from actor at index 1 with ID d54592a5-5b5b-4925-8974-6cf309fbdbbf
302302
303-
== APP == Reply 2023-05-23 11:04:49.740 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
303+
Reply 2023-05-23 11:04:49.740 received from actor at index 0 with ID a855706e-f477-4530-9bff-d7b1cd2988f8
304304
305-
== APP == Reply 2023-05-23 11:04:49.863 received from actor at index 2 with ID 4720f646-baaa-4fae-86dd-aec2fc2ead6e
305+
Reply 2023-05-23 11:04:49.863 received from actor at index 2 with ID 4720f646-baaa-4fae-86dd-aec2fc2ead6e
306306
```
307307

308308
For more details on Dapr SpringBoot integration, please refer to [Dapr Spring Boot](https://github.com/dapr/java-sdk/blob/master/sdk-tests/src/test/java/io/dapr/it/actors/services/springboot/DaprApplication.java) Application implementation.

examples/src/main/java/io/dapr/examples/bindings/http/README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ Execute the following command to run the Input Binding example:
130130
<!-- STEP
131131
name: Run input binding
132132
expected_stdout_lines:
133-
- '== APP == Received message through binding: {"message":"Message #0"}'
134-
- '== APP == Received message through binding: "Message #1"'
135-
- '== APP == Received message through binding: {"message":"Message #2"}'
136-
- '== APP == Received message through binding: "Message #3"'
133+
- 'Received message through binding: {"message":"Message #0"}'
134+
- 'Received message through binding: "Message #1"'
135+
- 'Received message through binding: {"message":"Message #2"}'
136+
- 'Received message through binding: "Message #3"'
137137
background: true
138138
sleep: 10
139139
-->
@@ -200,10 +200,10 @@ Execute the following command to run the Output Binding example:
200200
<!-- STEP
201201
name: Run output binding
202202
expected_stdout_lines:
203-
- '== APP == sending a class with message: Message #0'
204-
- '== APP == sending a plain string: Message #1'
205-
- '== APP == sending a class with message: Message #2'
206-
- '== APP == sending a plain string: Message #3'
203+
- 'sending a class with message: Message #0'
204+
- 'sending a plain string: Message #1'
205+
- 'sending a class with message: Message #2'
206+
- 'sending a plain string: Message #3'
207207
background: true
208208
sleep: 30
209209
-->
@@ -217,27 +217,27 @@ dapr run --resources-path ./components/bindings --app-id outputbinding -- java -
217217
Once running, the OutputBindingExample should print the output as follows:
218218

219219
```txt
220-
== APP == sending a class with message: Message #0
220+
sending a class with message: Message #0
221221
222-
== APP == sending a plain string: Message #1
222+
sending a plain string: Message #1
223223
224-
== APP == sending a class with message: Message #2
224+
sending a class with message: Message #2
225225
226-
== APP == sending a plain string: Message #3
226+
sending a plain string: Message #3
227227
```
228228

229229
Events have been sent.
230230

231231
Once running, the InputBindingExample should print the output as follows:
232232

233233
```txt
234-
== APP == Received message through binding: {"message":"Message #0"}
234+
Received message through binding: {"message":"Message #0"}
235235
236-
== APP == Received message through binding: "Message #1"
236+
Received message through binding: "Message #1"
237237
238-
== APP == Received message through binding: {"message":"Message #2"}
238+
Received message through binding: {"message":"Message #2"}
239239
240-
== APP == Received message through binding: "Message #3"
240+
Received message through binding: "Message #3"
241241
```
242242

243243
Events have been retrieved from the binding.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ Use the following command to run this example-
144144
<!-- STEP
145145
name: Run ConfigurationClient example
146146
expected_stdout_lines:
147-
- "== APP == Using Dapr client..."
148-
- "== APP == *******trying to retrieve configurations for a list of keys********"
149-
- "== APP == val1 : key ->myconfig1"
150-
- "== APP == val2 : key ->myconfig2"
151-
- "== APP == val3 : key ->myconfig3"
152-
- "== APP == Subscribing to key: myconfig1"
153-
- "== APP == subscription ID :"
154-
- "== APP == subscribing to key myconfig1 is successful"
147+
- "Using Dapr client..."
148+
- "*******trying to retrieve configurations for a list of keys********"
149+
- "val1 : key ->myconfig1"
150+
- "val2 : key ->myconfig2"
151+
- "val3 : key ->myconfig3"
152+
- "Subscribing to key: myconfig1"
153+
- "subscription ID :"
154+
- "subscribing to key myconfig1 is successful"
155155
background: true
156156
output_match_mode: substring
157157
sleep: 10
@@ -165,14 +165,14 @@ dapr run --resources-path ./components/configuration --app-id configgrpc --log-l
165165

166166
### Sample output
167167
```
168-
== APP == Using Dapr client...
169-
== APP == *******trying to retrieve configurations for a list of keys********
170-
== APP == val1 : key ->myconfig1
171-
== APP == val2 : key ->myconfig2
172-
== APP == val3 : key ->myconfig3
173-
== APP == Subscribing to key: myconfig1
174-
== APP == subscription ID : 82bb8e24-f69d-477a-9126-5ffaf995f498
175-
== APP == subscribing to key myconfig1 is successful
168+
Using Dapr client...
169+
*******trying to retrieve configurations for a list of keys********
170+
val1 : key ->myconfig1
171+
val2 : key ->myconfig2
172+
val3 : key ->myconfig3
173+
Subscribing to key: myconfig1
174+
subscription ID : 82bb8e24-f69d-477a-9126-5ffaf995f498
175+
subscribing to key myconfig1 is successful
176176
177177
178178
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Use the following command to run this example-
102102
<!-- STEP
103103
name: Run Demo Conversation Client example
104104
expected_stdout_lines:
105-
- "== APP == Conversation output: Hello How are you? This is the my number <ISBN>"
105+
- "Conversation output: Hello How are you? This is the my number <ISBN>"
106106
background: true
107107
output_match_mode: substring
108108
sleep: 10
@@ -116,7 +116,7 @@ dapr run --resources-path ./components/conversation --app-id myapp --app-port 80
116116

117117
### Sample output
118118
```
119-
== APP == Conversation output: Hello How are you? This is the my number <ISBN>
119+
Conversation output: Hello How are you? This is the my number <ISBN>
120120
```
121121
### Cleanup
122122

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ mkdir -p ./components/crypto/keys && openssl genrsa -out ./components/crypto/key
110110
<!-- STEP
111111
name: Run Crypto Example
112112
expected_stdout_lines:
113-
- "== APP == SUCCESS: The decrypted message matches the original."
113+
- "SUCCESS: The decrypted message matches the original."
114114
background: true
115115
output_match_mode: substring
116116
sleep: 30

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public class Client {
6464
<!-- STEP
6565
name: Run exception example
6666
expected_stdout_lines:
67-
- '== APP == Error code: INVALID_ARGUMENT'
68-
- '== APP == Error message: INVALID_ARGUMENT: pubsub unknown_pubsub is not found'
69-
- '== APP == Reason: DAPR_PUBSUB_NOT_FOUND'
70-
- '== APP == Error payload size: 116'
67+
- 'Error code: INVALID_ARGUMENT'
68+
- 'Error message: INVALID_ARGUMENT: pubsub unknown_pubsub is not found'
69+
- 'Reason: DAPR_PUBSUB_NOT_FOUND'
70+
- 'Error payload size: 116'
7171
background: true
7272
sleep: 5
7373
-->
@@ -81,13 +81,13 @@ dapr run --app-id exception-example -- java -jar target/dapr-java-sdk-examples-e
8181
Once running, the State Client Example should print the output as follows:
8282

8383
```txt
84-
== APP == Error code: ERR_PUBSUB_NOT_FOUND
84+
Error code: ERR_PUBSUB_NOT_FOUND
8585
86-
== APP == Error message: ERR_PUBSUB_NOT_FOUND: pubsub unknown_pubsub is not found
86+
Error message: ERR_PUBSUB_NOT_FOUND: pubsub unknown_pubsub is not found
8787
88-
== APP == Reason: DAPR_PUBSUB_NOT_FOUND
88+
Reason: DAPR_PUBSUB_NOT_FOUND
8989
90-
== APP == Error payload size: 116
90+
Error payload size: 116
9191
...
9292
9393
```

examples/src/main/java/io/dapr/examples/invoke/grpc/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Now run the service code:
7777

7878
<!-- STEP
7979
name: Run demo service
80-
expected_stdout_lines:
81-
- '== APP == INFO: greet to World'
80+
expected_stderr_lines:
81+
- 'INFO: greet to World'
8282
background: true
8383
sleep: 1
8484
-->
@@ -123,9 +123,9 @@ Finally, open a new command line terminal and run the client code to send some m
123123

124124
<!-- STEP
125125
name: Run demo client
126-
expected_stdout_lines:
127-
- '== APP == INFO: Will try to greet World ...'
128-
- '== APP == INFO: Greeting: Hello World'
126+
expected_stderr_lines:
127+
- 'INFO: Will try to greet World ...'
128+
- 'INFO: Greeting: Hello World'
129129
background: true
130130
sleep: 10
131131
-->

examples/src/main/java/io/dapr/examples/invoke/http/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ Use the following command to execute the demo service example:
104104
<!-- STEP
105105
name: Run demo service
106106
expected_stdout_lines:
107-
- '== APP == Server: "message one"'
108-
- '== APP == Server: "message two"'
107+
- 'Server: "message one"'
108+
- 'Server: "message two"'
109109
background: true
110110
sleep: 5
111111
-->
@@ -152,9 +152,9 @@ Execute the follow script in order to run the InvokeClient example, passing two
152152
<!-- STEP
153153
name: Run demo client
154154
expected_stdout_lines:
155-
- '== APP == "message one" received'
156-
- '== APP == "message two" received'
157-
- '== APP == Done'
155+
- '"message one" received'
156+
- '"message two" received'
157+
- 'Done'
158158
background: true
159159
sleep: 5
160160
-->
@@ -168,11 +168,11 @@ dapr run --app-id invokeclient -- java -jar target/dapr-java-sdk-examples-exec.j
168168
Finally, the console for `invokeclient` should output:
169169

170170
```text
171-
== APP == "message one" received
171+
"message one" received
172172
173-
== APP == "message two" received
173+
"message two" received
174174
175-
== APP == Done
175+
Done
176176
177177
```
178178

0 commit comments

Comments
 (0)