Merge branch 'master' into deprecate_http

Author: artursouza

.github/workflows/build.yml

@@ -100,9 +100,10 @@ jobs:
     - name: Codecov
       uses: codecov/codecov-action@v3.1.0
     - name: Install jars
-      run: mvn install -q
+      run: mvn install  -q
     - name: Integration tests
-      run: mvn -f sdk-tests/pom.xml verify -q
+      id: integration_tests
+      run: mvn -f sdk-tests/pom.xml verify
     - name: Upload test report for sdk
       uses: actions/upload-artifact@master
       with:
@@ -113,6 +114,19 @@ jobs:
       with:
         name: report-dapr-java-sdk-actors
         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
+      with:
+        name: failsafe-report-sdk-tests
+        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
+      with:
+        name: surefire-report-sdk-tests
+        path: sdk-tests/target/surefire-reports
+
   publish:
     runs-on: ubuntu-latest
     needs: build

.github/workflows/validate.yml

@@ -28,6 +28,7 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false # Keep running if one leg fails.
       matrix:
         java: [ 11, 13, 15, 16 ]
     env:
@@ -129,10 +130,10 @@ jobs:
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/state/README.md
-      - name: Validate pubsub HTTP example
+      - name: Validate pubsub example
         working-directory: ./examples
         run: |
-          mm.py ./src/main/java/io/dapr/examples/pubsub/http/README.md
+          mm.py ./src/main/java/io/dapr/examples/pubsub/README.md
       - name: Validate bindings HTTP example
         working-directory: ./examples
         run: |

.gitignore

@@ -1,6 +1,7 @@
 # IDE generated files and directories
 *.iml
 .idea/
+.run/
 .vs/
 .vscode/
 

daprdocs/content/en/java-sdk-docs/_index.md

@@ -148,7 +148,13 @@ try (DaprClient client = (new DaprClientBuilder()).build()) {
 ```java
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.Topic;
+import io.dapr.client.domain.BulkSubscribeAppResponse;
+import io.dapr.client.domain.BulkSubscribeAppResponseEntry;
+import io.dapr.client.domain.BulkSubscribeAppResponseStatus;
+import io.dapr.client.domain.BulkSubscribeMessage;
+import io.dapr.client.domain.BulkSubscribeMessageEntry;
 import io.dapr.client.domain.CloudEvent;
+import io.dapr.springboot.annotations.BulkSubscribe;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -186,6 +192,62 @@ public class SubscriberController {
     });
   }
 
+  @BulkSubscribe()
+  @Topic(name = "testingtopicbulk", pubsubName = "${myAppProperty:messagebus}")
+  @PostMapping(path = "/testingtopicbulk")
+  public Mono<BulkSubscribeAppResponse> handleBulkMessage(
+          @RequestBody(required = false) BulkSubscribeMessage<CloudEvent<String>> bulkMessage) {
+    return Mono.fromCallable(() -> {
+      if (bulkMessage.getEntries().size() == 0) {
+        return new BulkSubscribeAppResponse(new ArrayList<BulkSubscribeAppResponseEntry>());
+      }
+
+      System.out.println("Bulk Subscriber received " + bulkMessage.getEntries().size() + " messages.");
+
+      List<BulkSubscribeAppResponseEntry> entries = new ArrayList<BulkSubscribeAppResponseEntry>();
+      for (BulkSubscribeMessageEntry<?> entry : bulkMessage.getEntries()) {
+        try {
+          System.out.printf("Bulk Subscriber message has entry ID: %s\n", entry.getEntryId());
+          CloudEvent<?> cloudEvent = (CloudEvent<?>) entry.getEvent();
+          System.out.printf("Bulk Subscriber got: %s\n", cloudEvent.getData());
+          entries.add(new BulkSubscribeAppResponseEntry(entry.getEntryId(), BulkSubscribeAppResponseStatus.SUCCESS));
+        } catch (Exception e) {
+          e.printStackTrace();
+          entries.add(new BulkSubscribeAppResponseEntry(entry.getEntryId(), BulkSubscribeAppResponseStatus.RETRY));
+        }
+      }
+      return new BulkSubscribeAppResponse(entries);
+    });
+  }
+}
+```
+
+##### Bulk Publish Messages
+> Note: API is in Alpha stage
+
+
+```java
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.client.DaprPreviewClient;
+import io.dapr.client.domain.BulkPublishResponse;
+import io.dapr.client.domain.BulkPublishResponseFailedEntry;
+import java.util.ArrayList;
+import java.util.List;
+class Solution {
+  public void publishMessages() {
+    try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
+      // Create a list of messages to publish
+      List<String> messages = new ArrayList<>();
+      for (int i = 0; i < NUM_MESSAGES; i++) {
+        String message = String.format("This is message #%d", i);
+        messages.add(message);
+        System.out.println("Going to publish message : " + message);
+      }
+
+      // Publish list of messages using the bulk publish API
+      BulkPublishResponse<String> res = client.publishEvents(PUBSUB_NAME, TOPIC_NAME, "text/plain", messages).block()
+    }
+  }
 }
 ```
 

examples/components/pubsub/redis_messagebus.yaml

@@ -10,3 +10,8 @@ spec:
     value: localhost:6379
   - name: redisPassword
     value: ""
+scopes:
+  - publisher
+  - bulk-publisher
+  - subscriber
+  - publisher-tracing

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

@@ -50,7 +50,7 @@ cd examples
 
 Before getting into the application code, follow these steps in order to set up a local instance of Kafka. This is needed for the local instances. Steps are:
 
-1. To run container locally run: 
+1. To run container locally run:
 
 <!-- STEP
 name: Setup kafka container

examples/src/main/java/io/dapr/examples/pubsub/BulkPublisher.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.examples.pubsub;
+
+import io.dapr.client.DaprClient;
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.client.DaprPreviewClient;
+import io.dapr.client.domain.BulkPublishResponse;
+import io.dapr.client.domain.BulkPublishResponseFailedEntry;
+import io.dapr.examples.OpenTelemetryConfig;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Scope;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.dapr.examples.OpenTelemetryConfig.getReactorContext;
+
+/**
+ * Message publisher.
+ * 1. Build and install jars:
+ * mvn clean install
+ * 2. cd [repo root]/examples
+ * 3. Run the program:
+ * dapr run --components-path ./components/pubsub --app-id bulk-publisher -- \
+ * java -Ddapr.grpc.port="50010" -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.BulkPublisher
+ */
+public class BulkPublisher {
+
+  private static final int NUM_MESSAGES = 10;
+
+  private static final String TOPIC_NAME = "bulkpublishtesting";
+
+  //The name of the pubsub
+  private static final String PUBSUB_NAME = "messagebus";
+
+  /**
+   * main method.
+   *
+   * @param args incoming args
+   * @throws Exception any exception
+   */
+  public static void main(String[] args) throws Exception {
+    OpenTelemetry openTelemetry = OpenTelemetryConfig.createOpenTelemetry();
+    Tracer tracer = openTelemetry.getTracer(BulkPublisher.class.getCanonicalName());
+    Span span = tracer.spanBuilder("Bulk Publisher's Main").setSpanKind(Span.Kind.CLIENT).startSpan();
+    try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
+      DaprClient c = (DaprClient) client;
+      c.waitForSidecar(10000);
+      try (Scope scope = span.makeCurrent()) {
+        System.out.println("Using preview client...");
+        List<String> messages = new ArrayList<>();
+        System.out.println("Constructing the list of messages to publish");
+        for (int i = 0; i < NUM_MESSAGES; i++) {
+          String message = String.format("This is message #%d", i);
+          messages.add(message);
+          System.out.println("Going to publish message : " + message);
+        }
+        BulkPublishResponse<?> res = client.publishEvents(PUBSUB_NAME, TOPIC_NAME, "text/plain", messages)
+            .subscriberContext(getReactorContext()).block();
+        System.out.println("Published the set of messages in a single call to Dapr");
+        if (res != null) {
+          if (res.getFailedEntries().size() > 0) {
+            // Ideally this condition will not happen in examples
+            System.out.println("Some events failed to be published");
+            for (BulkPublishResponseFailedEntry<?> entry : res.getFailedEntries()) {
+              System.out.println("EntryId : " + entry.getEntry().getEntryId()
+                  + " Error message : " + entry.getErrorMessage());
+            }
+          }
+        } else {
+          throw new Exception("null response from dapr");
+        }
+      }
+      // Close the span.
+
+      span.end();
+      // Allow plenty of time for Dapr to export all relevant spans to the tracing infra.
+      Thread.sleep(10000);
+      // Shutdown the OpenTelemetry tracer.
+      OpenTelemetrySdk.getGlobalTracerManagement().shutdown();
+
+      System.out.println("Done");
+    }
+  }
+}
+

examples/src/main/java/io/dapr/examples/pubsub/CloudEventBulkPublisher.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2023 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.examples.pubsub;
+
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.client.DaprPreviewClient;
+import io.dapr.client.domain.BulkPublishEntry;
+import io.dapr.client.domain.BulkPublishRequest;
+import io.dapr.client.domain.BulkPublishResponse;
+import io.dapr.client.domain.BulkPublishResponseFailedEntry;
+import io.dapr.client.domain.CloudEvent;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Message publisher.
+ * 1. Build and install jars:
+ * mvn clean install
+ * 2. cd [repo root]/examples
+ * 3. Run the program:
+ * dapr run --components-path ./components/pubsub --app-id publisher -- \
+ * java -Ddapr.grpc.port="50010" \
+ * -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventBulkPublisher
+ */
+public class CloudEventBulkPublisher {
+
+  private static final int NUM_MESSAGES = 10;
+
+  private static final String TOPIC_NAME = "bulkpublishtesting";
+
+  //The name of the pubsub
+  private static final String PUBSUB_NAME = "messagebus";
+
+  /**
+   * main method.
+   *
+   * @param args incoming args
+   * @throws Exception any exception
+   */
+  public static void main(String[] args) throws Exception {
+    try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient()) {
+      System.out.println("Using preview client...");
+      List<BulkPublishEntry<CloudEvent<Map<String, String>>>> entries = new ArrayList<>();
+      for (int i = 0; i < NUM_MESSAGES; i++) {
+        CloudEvent<Map<String, String>> cloudEvent = new CloudEvent<>();
+        cloudEvent.setId(UUID.randomUUID().toString());
+        cloudEvent.setType("example");
+        cloudEvent.setSpecversion("1");
+        cloudEvent.setDatacontenttype("application/json");
+        String val = String.format("This is message #%d", i);
+        cloudEvent.setData(new HashMap<>() {
+          {
+            put("dataKey", val);
+          }
+        });
+        BulkPublishEntry<CloudEvent<Map<String, String>>> entry = new BulkPublishEntry<>(
+            "" + (i + 1), cloudEvent, CloudEvent.CONTENT_TYPE, null);
+        entries.add(entry);
+      }
+      BulkPublishRequest<CloudEvent<Map<String, String>>> request = new BulkPublishRequest<>(PUBSUB_NAME, TOPIC_NAME,
+          entries);
+      BulkPublishResponse<?> res = client.publishEvents(request).block();
+      if (res != null) {
+        if (res.getFailedEntries().size() > 0) {
+          // Ideally this condition will not happen in examples
+          System.out.println("Some events failed to be published");
+          for (BulkPublishResponseFailedEntry<?> entry : res.getFailedEntries()) {
+            System.out.println("EntryId : " + entry.getEntry().getEntryId()
+                + " Error message : " + entry.getErrorMessage());
+          }
+        }
+      } else {
+        throw new Exception("null response");
+      }
+      System.out.println("Done");
+    }
+  }
+}
+

examples/src/main/java/io/dapr/examples/pubsub/http/CloudEventPublisher.java renamed to examples/src/main/java/io/dapr/examples/pubsub/CloudEventPublisher.java

@@ -11,7 +11,7 @@
 limitations under the License.
 */
 
-package io.dapr.examples.pubsub.http;
+package io.dapr.examples.pubsub;
 
 import io.dapr.client.DaprClient;
 import io.dapr.client.DaprClientBuilder;
@@ -30,7 +30,7 @@
  * 2. cd [repo root]/examples
  * 3. Run the program:
  * dapr run --components-path ./components/pubsub --app-id publisher -- \
- *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.CloudEventPublisher
+ *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventPublisher
  */
 public class CloudEventPublisher {