From 1fbff6a56a39c5b7e478744db22f4be2f4522835 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Fri, 12 Jul 2024 15:18:48 -0500 Subject: [PATCH 01/11] update dapr runtime + cli to latest rc Signed-off-by: Cassandra Coyle --- .github/workflows/validate.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 897e9bfa0..3bcbb07c5 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -37,8 +37,8 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} - DAPR_CLI_VER: 1.13.0-rc.1 - DAPR_RUNTIME_VER: 1.13.0-rc.5 + DAPR_CLI_VER: 1.14.0-rc.3 + DAPR_RUNTIME_VER: 1.14.0-rc.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/pom.xml b/pom.xml index 60e1922ff..37ad79c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 1.59.0 3.17.3 - https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.14.0-rc.2/dapr/proto 0.12.0-SNAPSHOT 1.6.2 3.1.1 From 64dd8c567493245256d80145c724980863e3fb61 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Fri, 12 Jul 2024 15:40:08 -0500 Subject: [PATCH 02/11] update install url version Signed-off-by: Cassandra Coyle --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 3bcbb07c5..dc210cf63 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -39,7 +39,7 @@ jobs: JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.14.0-rc.3 DAPR_RUNTIME_VER: 1.14.0-rc.2 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/1.14.0-rc.3/install/install.sh DAPR_CLI_REF: DAPR_REF: steps: From a13014705d119046b8e4e3be94a03355163dc616 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Fri, 12 Jul 2024 16:36:18 -0500 Subject: [PATCH 03/11] add back v Signed-off-by: Cassandra Coyle --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index dc210cf63..6625674a3 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -39,7 +39,7 @@ jobs: JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.14.0-rc.3 DAPR_RUNTIME_VER: 1.14.0-rc.2 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/1.14.0-rc.3/install/install.sh + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh DAPR_CLI_REF: DAPR_REF: steps: From 1648466b7bdb5faf37c84f7391d04f6b766862cc Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Tue, 16 Jul 2024 11:53:07 -0500 Subject: [PATCH 04/11] trying things for pom.xml Signed-off-by: Cassandra Coyle --- pom.xml | 9 +++++---- sdk-autogen/pom.xml | 37 +++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 37ad79c1e..c830f7b50 100644 --- a/pom.xml +++ b/pom.xml @@ -14,11 +14,12 @@ UTF-8 - 1.59.0 - 3.17.3 + 1.64.0 + 3.25.0 + protoc https://raw.githubusercontent.com/dapr/dapr/v1.14.0-rc.2/dapr/proto 0.12.0-SNAPSHOT - 1.6.2 + 1.7.1 3.1.1 1.8 2.7 @@ -46,7 +47,7 @@ https://oss.sonatype.org/content/repositories/snapshots - localDocsDirecty + localDocsDirectory file:${maven.multiModuleProjectDirectory}/docs/ diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index a7f778815..4a69ace6d 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -20,7 +20,9 @@ ${project.build.directory}/generated-sources ${project.build.directory}/proto false - 1.59.0 + 1.64.0 + protoc + 3.25.0 @@ -62,29 +64,29 @@ 1.6.0 - getCommonProto + getDaprProto initialize wget true - ${dapr.proto.baseurl}/common/v1/common.proto - common.proto - ${protobuf.input.directory}/dapr/proto/common/v1 + ${dapr.proto.baseurl}/runtime/v1/dapr.proto + dapr.proto + ${protobuf.input.directory}/dapr/proto/runtime/v1 - getDaprProto + getCommonProto initialize wget true - ${dapr.proto.baseurl}/runtime/v1/dapr.proto - dapr.proto - ${protobuf.input.directory} + ${dapr.proto.baseurl}/common/v1/common.proto + common.proto + ${protobuf.input.directory}/dapr/proto/common/v1 @@ -97,11 +99,23 @@ true ${dapr.proto.baseurl}/runtime/v1/appcallback.proto appcallback.proto - ${protobuf.input.directory} + ${protobuf.input.directory}/dapr/proto/runtime/v1 + + kr.motd.maven + os-maven-plugin + 1.7.0 + + + + detect + + + + com.github.os72 protoc-jar-maven-plugin @@ -113,11 +127,14 @@ run + protoc ${protobuf.version} + com.google.protobuf:protoc:3.21.1 inputs direct true + ${protobuf.input.directory}/dapr/proto/runtime/v1 ${protobuf.input.directory}/dapr/proto/common/v1 ${protobuf.input.directory} From ac9c7fd6bed890ad33b2dcc3e6f241f144f3d0cb Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Tue, 16 Jul 2024 17:47:42 -0300 Subject: [PATCH 05/11] Fix sdk-autogen proto code gen Signed-off-by: Artur Souza --- sdk-autogen/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 4a69ace6d..4272128c5 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -134,10 +134,11 @@ direct true - ${protobuf.input.directory}/dapr/proto/runtime/v1 - ${protobuf.input.directory}/dapr/proto/common/v1 ${protobuf.input.directory} + + ${protobuf.input.directory} + java From 5eec273f78d67c861cc7c3c14ffa19bffe033680 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Tue, 16 Jul 2024 18:17:43 -0300 Subject: [PATCH 06/11] Use 1.14.0-rc.3 CLI for build.yaml Signed-off-by: Artur Souza --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2453275c0..86db33231 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,9 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} - DAPR_CLI_VER: 1.13.0-rc.1 + DAPR_CLI_VER: 1.13.0-rc.3 DAPR_RUNTIME_VER: 1.13.0-rc.2 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.3/install/install.sh DAPR_CLI_REF: DAPR_REF: TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64 From e912b1283e9052c1ab311beb50fbacf88031705a Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Tue, 16 Jul 2024 18:51:54 -0300 Subject: [PATCH 07/11] debug scheduler connection. Signed-off-by: Artur Souza --- .github/workflows/validate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 6625674a3..08ccf7a3b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -100,6 +100,8 @@ jobs: echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV pip3 install setuptools wheel pip3 install mechanical-markdown + - name: Verify scheduler is listening on port. + run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006 - name: Clean up files run: ./mvnw clean - name: Build sdk From b8b0e8737d3914651d3e06089229ee9c72c85525 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Mon, 22 Jul 2024 18:47:13 -0300 Subject: [PATCH 08/11] Update CLI to rc6 and runtime to rc4 Signed-off-by: Artur Souza --- .github/workflows/build.yml | 6 +++--- .github/workflows/validate.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86db33231..46d097350 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,9 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} - DAPR_CLI_VER: 1.13.0-rc.3 - DAPR_RUNTIME_VER: 1.13.0-rc.2 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.3/install/install.sh + DAPR_CLI_VER: 1.14.0-rc.6 + DAPR_RUNTIME_VER: 1.14.0-rc.4 + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh DAPR_CLI_REF: DAPR_REF: TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 08ccf7a3b..b8df34e6f 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -37,8 +37,8 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} - DAPR_CLI_VER: 1.14.0-rc.3 - DAPR_RUNTIME_VER: 1.14.0-rc.2 + DAPR_CLI_VER: 1.14.0-rc.6 + DAPR_RUNTIME_VER: 1.14.0-rc.4 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh DAPR_CLI_REF: DAPR_REF: From fe4b51a4939c88bc9b6f838e92ffa0739b5af882 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Tue, 23 Jul 2024 14:11:56 -0300 Subject: [PATCH 09/11] Update gRPC and proto dependency in sdk-tests too. Signed-off-by: Artur Souza --- sdk-tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 0567b615a..013fe9378 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -18,8 +18,8 @@ 1.12.0-SNAPSHOT ${project.build.directory}/generated-sources ${project.basedir}/proto - 1.59.0 - 3.17.3 + 1.64.0 + 3.25.0 1.39.0 3.0.13 From f9ffdebb3e068f15d7aa561132060361876b216c Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Sat, 27 Jul 2024 17:45:51 -0300 Subject: [PATCH 10/11] Update to runtime RC6 Signed-off-by: Artur Souza --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46d097350..12c5f8e57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.14.0-rc.6 - DAPR_RUNTIME_VER: 1.14.0-rc.4 + DAPR_RUNTIME_VER: 1.14.0-rc.6 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b8df34e6f..ffe5a7168 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -38,7 +38,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.14.0-rc.6 - DAPR_RUNTIME_VER: 1.14.0-rc.4 + DAPR_RUNTIME_VER: 1.14.0-rc.6 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh DAPR_CLI_REF: DAPR_REF: From 307c95eaba8447f4e07db66137b88a528fd15934 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Sun, 28 Jul 2024 09:32:28 -0300 Subject: [PATCH 11/11] Update error message expectations in 1.15 Signed-off-by: Artur Souza --- .../java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java index 5eac1b2a7..a4d9dd835 100644 --- a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java @@ -30,7 +30,6 @@ public class MethodInvokeIT extends BaseIT { private static final int TIMEOUT_MS = 100; private static final ResiliencyOptions RESILIENCY_OPTIONS = new ResiliencyOptions() .setTimeout(Duration.ofMillis(TIMEOUT_MS)); - private static final String EXCEPTION_MARKER = "DEADLINE_EXCEEDED: deadline exceeded after"; /** * Run of a Dapr application. @@ -92,7 +91,8 @@ public void testInvokeTimeout() throws Exception { String message = assertThrows(StatusRuntimeException.class, () -> stub.sleep(req)).getMessage(); long delay = System.currentTimeMillis() - started; assertTrue(delay >= TIMEOUT_MS, "Delay: " + delay + " is not greater than timeout: " + TIMEOUT_MS); - assertTrue(message.startsWith(EXCEPTION_MARKER), "Message: " + message + " does not start with: " + EXCEPTION_MARKER); + assertTrue(message.contains("DEADLINE_EXCEEDED")); + assertTrue(message.contains("CallOptions deadline exceeded after")); } } @@ -112,7 +112,8 @@ public void testInvokeException() throws Exception { // If this test fails, there might be a regression in runtime (like we had in 1.10.0). // The expectations below are as per 1.9 release and (later on) hotfixed in 1.10. assertEquals(Status.UNKNOWN.getCode(), exception.getStatus().getCode()); - assertEquals("", exception.getStatus().getDescription()); + // The error message below is added starting in Dapr 1.15.0 + assertEquals("Application error processing RPC", exception.getStatus().getDescription()); } }