Skip to content

Commit 114129f

Browse files
salaboysalaboy
authored
Merge branch 'master' into 1270-app-middleware
Signed-off-by: salaboy <[email protected]>
2 parents 4ce207e + c909d26 commit 114129f

File tree

14 files changed

+410
-179
lines changed

14 files changed

+410
-179
lines changed

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ jobs:
4545
DAPR_REF:
4646
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
4747
steps:
48+
- name: Install Stable Docker
49+
id: setup_docker
50+
uses: docker/setup-docker-action@v4
51+
- name: Check Docker version
52+
run: docker version
4853
- uses: actions/checkout@v4
4954
- name: Set up OpenJDK ${{ env.JDK_VER }}
5055
uses: actions/setup-java@v4
@@ -113,13 +118,17 @@ jobs:
113118
run: ./mvnw compile -B -q
114119
- name: Unit tests
115120
run: ./mvnw test # making it temporarily verbose.
121+
env:
122+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
116123
- name: Codecov
117-
uses: codecov/codecov-action@v4.4.1
124+
uses: codecov/codecov-action@v5.4.0
118125
- name: Install jars
119126
run: ./mvnw install -q -B -DskipTests
120127
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
121128
id: integration_tests
122129
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests verify
130+
env:
131+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
123132
- name: Upload test report for sdk
124133
uses: actions/upload-artifact@v4
125134
with:

‎.github/workflows/fossa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
uses: actions/checkout@v4
3636

3737
- name: "Run FOSSA Scan"
38-
uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
38+
uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
3939
with:
4040
api-key: ${{ env.FOSSA_API_KEY }}
4141

4242
- name: "Run FOSSA Test"
43-
uses: fossas/fossa-action@v1.3.3 # Use a specific version if locking is preferred
43+
uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
4444
with:
4545
api-key: ${{ env.FOSSA_API_KEY }}
4646
run-tests: true

‎.github/workflows/validate.yml‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
with:
5050
distribution: 'temurin'
5151
java-version: ${{ env.JDK_VER }}
52+
- name: Install Stable Docker
53+
id: setup_docker
54+
uses: docker/setup-docker-action@v4
55+
- name: Check Docker version
56+
run: docker version
5257
- name: Set up Dapr CLI
5358
run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
5459
- name: Set up Go ${{ env.GOVER }}
@@ -108,63 +113,95 @@ jobs:
108113
run: ./mvnw compile -q
109114
- name: Install jars
110115
run: ./mvnw install -q
116+
env:
117+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
111118
- name: Validate invoke http example
112119
working-directory: ./examples
113120
run: |
114121
mm.py ./src/main/java/io/dapr/examples/invoke/http/README.md
122+
env:
123+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
115124
- name: Validate invoke grpc example
116125
working-directory: ./examples
117126
run: |
118127
mm.py ./src/main/java/io/dapr/examples/invoke/grpc/README.md
128+
env:
129+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
119130
- name: Validate tracing example
120131
working-directory: ./examples
121132
run: |
122133
mm.py ./src/main/java/io/dapr/examples/tracing/README.md
134+
env:
135+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
123136
- name: Validate expection handling example
124137
working-directory: ./examples
125138
run: |
126139
mm.py ./src/main/java/io/dapr/examples/exception/README.md
140+
env:
141+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
127142
- name: Validate state example
128143
working-directory: ./examples
129144
run: |
130145
mm.py ./src/main/java/io/dapr/examples/state/README.md
146+
env:
147+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
131148
- name: Validate pubsub example
132149
working-directory: ./examples
133150
run: |
134151
mm.py ./src/main/java/io/dapr/examples/pubsub/README.md
152+
env:
153+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
135154
- name: Validate bindings HTTP example
136155
working-directory: ./examples
137156
run: |
138157
mm.py ./src/main/java/io/dapr/examples/bindings/http/README.md
158+
env:
159+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
139160
- name: Validate secrets example
140161
working-directory: ./examples
141162
run: |
142163
mm.py ./src/main/java/io/dapr/examples/secrets/README.md
164+
env:
165+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
143166
- name: Validate unit testing example
144167
working-directory: ./examples
145168
run: |
146169
mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
170+
env:
171+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
147172
- name: Validate Configuration API example
148173
working-directory: ./examples
149174
run: |
150175
mm.py ./src/main/java/io/dapr/examples/configuration/README.md
176+
env:
177+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
151178
- name: Validate actors example
152179
working-directory: ./examples
153180
run: |
154181
mm.py ./src/main/java/io/dapr/examples/actors/README.md
182+
env:
183+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
155184
- name: Validate query state HTTP example
156185
working-directory: ./examples
157186
run: |
158187
mm.py ./src/main/java/io/dapr/examples/querystate/README.md
188+
env:
189+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
159190
- name: Validate workflows example
160191
working-directory: ./examples
161192
run: |
162193
mm.py ./src/main/java/io/dapr/examples/workflows/README.md
194+
env:
195+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
163196
- name: Validate streaming subscription example
164197
working-directory: ./examples
165198
run: |
166199
mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md
200+
env:
201+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
167202
- name: Validate Spring Boot examples
168203
working-directory: ./spring-boot-examples
169204
run: |
170-
mm.py README.md
205+
mm.py README.md
206+
env:
207+
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}

‎dapr-spring/pom.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<maven.compiler.source>11</maven.compiler.source>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<maven.compiler.release>11</maven.compiler.release>
35+
<testcontainers.version>1.19.8</testcontainers.version>
36+
<junit.version>5.10.2</junit.version>
3537
</properties>
3638

3739
<dependencyManagement>
@@ -43,6 +45,31 @@
4345
<type>pom</type>
4446
<scope>import</scope>
4547
</dependency>
48+
<dependency>
49+
<groupId>org.junit.jupiter</groupId>
50+
<artifactId>junit-jupiter-api</artifactId>
51+
<version>${junit.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.junit.jupiter</groupId>
55+
<artifactId>junit-jupiter-params</artifactId>
56+
<version>${junit.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.junit.jupiter</groupId>
60+
<artifactId>junit-jupiter-engine</artifactId>
61+
<version>${junit.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.junit.jupiter</groupId>
65+
<artifactId>junit-jupiter</artifactId>
66+
<version>${junit.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.testcontainers</groupId>
70+
<artifactId>junit-jupiter</artifactId>
71+
<version>${testcontainers.version}</version>
72+
</dependency>
4673
</dependencies>
4774
</dependencyManagement>
4875

@@ -73,13 +100,15 @@
73100
<dependency>
74101
<groupId>org.springframework.boot</groupId>
75102
<artifactId>spring-boot-configuration-processor</artifactId>
103+
<version>${springboot.version}</version>
76104
<optional>true</optional>
77105
</dependency>
78106

79107
<!-- Test dependencies -->
80108
<dependency>
81109
<groupId>org.springframework.boot</groupId>
82110
<artifactId>spring-boot-starter-test</artifactId>
111+
<version>${springboot.version}</version>
83112
<scope>test</scope>
84113
</dependency>
85114
<dependency>

‎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)