Merge branch 'master' into bulk-subscriber-grpc

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
       run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
     - name: Set up Go ${{ env.GOVER }}
       if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ env.GOVER }}
     - name: Checkout Dapr CLI repo to override dapr command.
@@ -126,26 +126,26 @@ jobs:
       id: integration_tests
       run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -f sdk-tests/pom.xml verify
     - name: Upload test report for sdk
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: report-dapr-java-sdk
+        name: report-dapr-java-sdk-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk/target/jacoco-report/
     - name: Upload test report for sdk-actors
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: report-dapr-java-sdk-actors
+        name: report-dapr-java-sdk-actors-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-actors/target/jacoco-report/
     - name: Upload failsafe test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: failsafe-report-sdk-tests
+        name: failsafe-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/failsafe-reports
     - name: Upload surefire test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v4
       with:
-        name: surefire-report-sdk-tests
+        name: surefire-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/surefire-reports
 
   publish:

.github/workflows/validate.yml

@@ -53,7 +53,7 @@ jobs:
         run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
       - name: Set up Go ${{ env.GOVER }}
         if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GOVER }}
       - name: Checkout Dapr CLI repo to override dapr command.

sdk-tests/src/test/java/io/dapr/it/actors/ActorStateIT.java

@@ -167,6 +167,9 @@ public void writeReadState(DaprApiProtocol daprClientProtocol, DaprApiProtocol s
     proxyBuilder = new ActorProxyBuilder(actorType, ActorProxy.class, newActorClient());
     ActorProxy newProxy = proxyBuilder.build(actorId);
 
+    // wating for actor to be activated
+    Thread.sleep(2000);  
+
     callWithRetry(() -> {
       logger.debug("Invoking readMessage where data is not cached ... ");
       String result = newProxy.invokeMethod("readMessage", String.class).block();

sdk-workflows/src/main/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilder.java

@@ -19,14 +19,26 @@
 import io.dapr.workflows.internal.ApiTokenClientInterceptor;
 import io.grpc.ClientInterceptor;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 public class WorkflowRuntimeBuilder {
   private static volatile WorkflowRuntime instance;
   private DurableTaskGrpcWorkerBuilder builder;
+  private Logger logger;
+  private Set<String> workflows = new HashSet<String>();
+  private Set<String> activities = new HashSet<String>();
   private static ClientInterceptor WORKFLOW_INTERCEPTOR = new ApiTokenClientInterceptor();
 
+  /**
+   * Constructs the WorkflowRuntimeBuilder.
+   */
   public WorkflowRuntimeBuilder() {
     this.builder = new DurableTaskGrpcWorkerBuilder().grpcChannel(
                           NetworkUtils.buildGrpcManagedChannel(WORKFLOW_INTERCEPTOR));
+    this.logger = Logger.getLogger(WorkflowRuntimeBuilder.class.getName());
   }
 
   /**
@@ -42,6 +54,7 @@ public WorkflowRuntime build() {
         }
       }
     }
+    this.logger.log(Level.INFO, "Successfully built dapr workflow runtime");
     return instance;
   }
 
@@ -56,7 +69,8 @@ public <T extends Workflow> WorkflowRuntimeBuilder registerWorkflow(Class<T> cla
     this.builder = this.builder.addOrchestration(
         new OrchestratorWrapper<>(clazz)
     );
-
+    this.logger.log(Level.INFO, "Registered Workflow: " +  clazz.getSimpleName());
+    this.workflows.add(clazz.getSimpleName());
     return this;
   }
 
@@ -70,5 +84,8 @@ public <T extends WorkflowActivity> void registerActivity(Class<T> clazz) {
     this.builder = this.builder.addActivity(
         new ActivityWrapper<>(clazz)
     );
+    this.logger.log(Level.INFO, "Registered Activity: " +  clazz.getSimpleName());
+    this.activities.add(clazz.getSimpleName());
   }
-}
+
+}

sdk-workflows/src/test/java/io/dapr/workflows/runtime/WorkflowRuntimeBuilderTest.java

@@ -5,8 +5,15 @@
 import io.dapr.workflows.WorkflowStub;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.logging.Logger;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
 public class WorkflowRuntimeBuilderTest {
   public static class TestWorkflow extends Workflow {
     @Override
@@ -37,4 +44,43 @@ public void registerValidWorkflowActivityClass() {
   public void buildTest() {
     assertDoesNotThrow(() -> new WorkflowRuntimeBuilder().build());
   }
+
+  @Test
+  public void loggingOutputTest() {
+    // Set the output stream for log capturing
+    ByteArrayOutputStream outStreamCapture = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(outStreamCapture));
+
+    LogCaptureHandler testLoggerHandler = new LogCaptureHandler();
+    Logger testLogger = Logger.getLogger(WorkflowRuntimeBuilder.class.getName());
+
+    testLogger.addHandler(testLoggerHandler);
+
+    // indexOf will return -1 if the string is not found.
+    assertDoesNotThrow(() -> new WorkflowRuntimeBuilder().registerWorkflow(TestWorkflow.class));
+    assertNotEquals(-1, testLoggerHandler.capturedLog.indexOf("Registered Workflow: TestWorkflow"));
+    assertDoesNotThrow(() -> new WorkflowRuntimeBuilder().registerActivity(TestActivity.class));
+    assertNotEquals(-1, testLoggerHandler.capturedLog.indexOf("Registered Activity: TestActivity"));
+
+    WorkflowRuntimeBuilder wfRuntime = new WorkflowRuntimeBuilder();
+
+    wfRuntime.build();
+  }
+
+  private static class LogCaptureHandler extends Handler {
+    private StringBuilder capturedLog = new StringBuilder();
+
+    @Override
+    public void publish(LogRecord record) {
+      capturedLog.append(record.getMessage()).append(System.lineSeparator());
+    }
+
+    @Override
+    public void flush(){
+    }
+
+    @Override
+    public void close() throws SecurityException {
+    }
+  }
 }