Merge remote-tracking branch 'upstream/master' into cherry_pick_1_11

Signed-off-by: Artur Souza <asouza.pro@gmail.com>

.github/workflows/validate.yml

@@ -100,10 +100,6 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
-      - name: Install Local mongo database using docker-compose
-        run: |
-          docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo
-          docker ps
       - name: Clean up files
         run: ./mvnw clean
       - name: Build sdk
@@ -146,14 +142,10 @@ jobs:
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
-      - name: Validate Configuration gRPC API example
-        working-directory: ./examples
-        run: |
-            mm.py ./src/main/java/io/dapr/examples/configuration/grpc/README.md
-      - name: Validate Configuration HTTP API example
+      - name: Validate Configuration API example
         working-directory: ./examples
         run: |
-            mm.py ./src/main/java/io/dapr/examples/configuration/http/README.md
+            mm.py ./src/main/java/io/dapr/examples/configuration/README.md
       - name: Validate actors example
         working-directory: ./examples
         run: |

README.md

@@ -105,6 +105,7 @@ Try the following examples to learn more about Dapr's Java SDK:
 * [Binding with input over Http](./examples/src/main/java/io/dapr/examples/bindings/http)
 * [Actors](./examples/src/main/java/io/dapr/examples/actors/)
 * [Secrets management](./examples/src/main/java/io/dapr/examples/secrets)
+* [Configuration](./examples/src/main/java/io/dapr/examples/configuration)
 * [Distributed tracing with OpenTelemetry SDK](./examples/src/main/java/io/dapr/examples/tracing)
 * [Exception handling](./examples/src/main/java/io/dapr/examples/exception)
 * [Unit testing](./examples/src/main/java/io/dapr/examples/unittesting)

examples/src/main/java/io/dapr/examples/OpenTelemetryInterceptor.java

@@ -16,15 +16,15 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.util.Collections;
 
 @Component

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

@@ -54,13 +54,13 @@ Run `dapr init` to initialize Dapr in Self-Hosted Mode if it's not already initi
 
 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.
 
-1. Run the container locally:
+1. Run the Kafka locally:
 
 <!-- STEP
 name: Setup kafka container
 expected_stderr_lines:
   - 'Creating network "http_default" with the default driver'
-sleep: 5
+sleep: 20
 -->
 
 ```bash

examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper:7.4.4

examples/src/main/java/io/dapr/examples/configuration/grpc/ConfigurationClient.java → examples/src/main/java/io/dapr/examples/configuration/ConfigurationClient.java

@@ -11,7 +11,7 @@
 limitations under the License.
 */
 
-package io.dapr.examples.configuration.grpc;
+package io.dapr.examples.configuration;
 
 import io.dapr.client.DaprClient;
 import io.dapr.client.DaprClientBuilder;

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

@@ -158,7 +158,7 @@ sleep: 10
 -->
 
 ```bash
-dapr run --components-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.grpc.ConfigurationClient
+dapr run --components-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.ConfigurationClient
 ```
 
 <!-- END_STEP -->