From bb56b8d8a815699b1750d1fc116ab6b68dbe1ac6 Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Tue, 29 Apr 2025 06:27:02 -0700 Subject: [PATCH 01/12] Update CONTRIBUTING.md Signed-off-by: Siri Varma Vegiraju --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4009213b11..c094f92fa1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,6 +51,11 @@ Before you file an issue, make sure you've checked the following: This section describes the guidelines for contributing code / docs to Dapr. +### Things to consider when adding new API to SDK + +1. All the new API's go under [dapr-sdk maven package](https://github.com/dapr/java-sdk/tree/master/sdk) +2. Make sure there is an example talking about how to use the API along with a README. [Example](https://github.com/dapr/java-sdk/pull/1235/files#diff-69ed756c4c01fd5fa884aac030dccb8f3f4d4fefa0dc330862d55a6f87b34a14) + ### Pull Requests All contributions come through pull requests. To submit a proposed change, we recommend following this workflow: @@ -64,6 +69,7 @@ All contributions come through pull requests. To submit a proposed change, we re 6. Commit and open a PR 7. Wait for the CI process to finish and make sure all checks are green 8. A maintainer of the project will be assigned, and you can expect a review within a few days +9. All the files have the Copyright header. ### Configure the code style with checkstyle From 949ed4a91bad380a0db120c9ad49ca86faba3108 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Mon, 5 May 2025 07:32:15 -0700 Subject: [PATCH 02/12] Fix things Signed-off-by: sirivarma --- pom.xml | 126 ++++++++++++++++++++++++++++++++++++++++++++++ sdk-tests/pom.xml | 37 -------------- 2 files changed, 126 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 51f5070027..0a45fa1870 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,11 @@ 3.4.3 1.7.0 3.27.3 + 1.69.0 + 3.25.5 + 1.41.0 + 1.5.16 + 3.9.1 @@ -230,6 +235,127 @@ spring-boot-testcontainers ${springboot.version} + + org.testcontainers + toxiproxy + ${testcontainers.version} + + + org.testcontainers + mysql + ${testcontainers.version} + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + javax.annotation + javax.annotation-api + 1.3.2 + + + org.apache.commons + commons-lang3 + 3.9 + + + ch.qos.logback + logback-core + ${logback-core.version} + + + commons-cli + commons-cli + 1.9.0 + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + commons-io + commons-io + 2.14.0 + + + io.opentelemetry + opentelemetry-sdk + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-api + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-context + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-trace + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-sdk-metrics + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-exporter-common + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-exporter-logging + ${opentelemetry.version} + + + io.opentelemetry + opentelemetry-exporter-zipkin + ${opentelemetry.version} + + + + io.zipkin.reporter2 + zipkin-reporter + 3.4.0 + + + io.zipkin.reporter2 + zipkin-sender-urlconnection + 3.4.0 + + + io.dapr + dapr-sdk-actors + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-springboot + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-workflows + ${dapr.sdk.alpha.version} + diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index ef79b94d93..a736e39c20 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -26,13 +26,6 @@ 0.15.0-SNAPSHOT ${project.build.directory}/generated-sources ${project.basedir}/proto - 1.69.0 - 3.25.5 - 1.41.0 - 3.4.3 - 1.5.16 - 3.9.1 - 1.20.0 @@ -67,117 +60,95 @@ commons-cli commons-cli - 1.9.0 io.grpc grpc-protobuf - ${grpc.version} io.grpc grpc-stub - ${grpc.version} io.grpc grpc-api - ${grpc.version} commons-io commons-io - 2.14.0 io.opentelemetry opentelemetry-sdk - ${opentelemetry.version} io.opentelemetry opentelemetry-api - ${opentelemetry.version} io.opentelemetry opentelemetry-context - ${opentelemetry.version} io.opentelemetry opentelemetry-sdk-common - ${opentelemetry.version} io.opentelemetry opentelemetry-sdk-trace - ${opentelemetry.version} io.opentelemetry opentelemetry-sdk-metrics - ${opentelemetry.version} io.opentelemetry opentelemetry-exporter-common - ${opentelemetry.version} io.opentelemetry opentelemetry-exporter-logging - ${opentelemetry.version} io.opentelemetry opentelemetry-exporter-zipkin - ${opentelemetry.version} io.zipkin.reporter2 zipkin-reporter - 3.4.0 io.zipkin.reporter2 zipkin-sender-urlconnection - 3.4.0 io.dapr dapr-sdk - ${dapr.sdk.version} test io.dapr dapr-sdk-actors - ${dapr.sdk.version} test io.dapr dapr-sdk-springboot - ${dapr.sdk.version} test io.dapr dapr-sdk-workflows - ${dapr.sdk.alpha.version} test io.dapr.spring dapr-spring-boot-starter - ${dapr.sdk.alpha.version} io.dapr.spring dapr-spring-boot-starter-test - ${dapr.sdk.alpha.version} test @@ -191,7 +162,6 @@ org.wiremock wiremock-standalone - ${wiremock.version} test @@ -207,37 +177,31 @@ org.apache.commons commons-lang3 - 3.9 test ch.qos.logback logback-core - ${logback-core.version} test org.testcontainers postgresql - ${testcontainers-test.version} test org.testcontainers mysql - ${testcontainers-test.version} test jakarta.annotation jakarta.annotation-api - 2.1.1 compile javax.annotation javax.annotation-api - 1.3.2 compile @@ -258,7 +222,6 @@ org.testcontainers toxiproxy - ${testcontainers-test.version} test From 92028e3a594463be2042566e95b20837093f8aa4 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Mon, 5 May 2025 08:08:14 -0700 Subject: [PATCH 03/12] Fix things? Signed-off-by: sirivarma --- examples/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/pom.xml b/examples/pom.xml index 192c7f2f7f..e9de9dae86 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -82,6 +82,11 @@ opentelemetry-exporter-zipkin ${opentelemetry.version} + + io.opentelemetry + opentelemetry-sdk-metrics + 1.41.0 + org.junit.jupiter junit-jupiter From 02b958804280f217553c57f2159601b8f426b031 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 09:49:33 -0700 Subject: [PATCH 04/12] Fix logback version Signed-off-by: siri-varma --- dapr-spring/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 593f493d80..44c4cb224b 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -34,6 +34,7 @@ 11 1.19.8 5.10.2 + 1.4.14 @@ -70,6 +71,11 @@ junit-jupiter ${testcontainers.version} + + ch.qos.logback + logback-core + ${logback-core.version} + From 20f5ac6753ed47c0cdcde8e158a65e78fb4e78a1 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 10:01:52 -0700 Subject: [PATCH 05/12] Fix logback version Signed-off-by: siri-varma --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 0a45fa1870..f8ade24e21 100644 --- a/pom.xml +++ b/pom.xml @@ -356,6 +356,11 @@ dapr-sdk-workflows ${dapr.sdk.alpha.version} + + org.wiremock + wiremock-standalone + ${wiremock.version} + From 6d990e8e91e12885dbc299788fe075b141577a83 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 10:41:21 -0700 Subject: [PATCH 06/12] Add pom Signed-off-by: siri-varma --- CONTRIBUTING.md | 36 +++++++++++++++--------------------- examples/pom.xml | 5 +++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c094f92fa1..da48131d7c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ Thank you for your interest in Dapr! -This project welcomes contributions and suggestions. Most contributions require you to signoff on your commits via -the Developer Certificate of Origin (DCO). When you submit a pull request, a DCO-bot will automatically determine -whether you need to provide signoff for your commit. Please follow the instructions provided by DCO-bot, as pull +This project welcomes contributions and suggestions. Most contributions require you to signoff on your commits via +the Developer Certificate of Origin (DCO). When you submit a pull request, a DCO-bot will automatically determine +whether you need to provide signoff for your commit. Please follow the instructions provided by DCO-bot, as pull requests cannot be merged until the author(s) have provided signoff to fulfill the DCO requirement. You may find more information on the DCO requirements [below](#developer-certificate-of-origin-signing-your-work). @@ -34,28 +34,23 @@ There are 4 types of issues: Before you file an issue, make sure you've checked the following: 1. Is it the right repository? - - The Dapr project is distributed across multiple repositories. Check the list of [repositories](https://github.com/dapr) if you aren't sure which repo is the correct one. + - The Dapr project is distributed across multiple repositories. Check the list of [repositories](https://github.com/dapr) if you aren't sure which repo is the correct one. 1. Check for existing issues - - Before you create a new issue, please do a search in [open issues](https://github.com/dapr/java-sdk/issues) to see if the issue or feature request has already been filed. - - If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reaction-to-pull-requests-issues-and-comments). Use a reaction: - - 👍 up-vote - - 👎 down-vote + - Before you create a new issue, please do a search in [open issues](https://github.com/dapr/java-sdk/issues) to see if the issue or feature request has already been filed. + - If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reaction-to-pull-requests-issues-and-comments). Use a reaction: + - 👍 up-vote + - 👎 down-vote 1. For bugs - - Check it's not an environment issue. For example, if running on Kubernetes, make sure prerequisites are in place. (state stores, bindings, etc.) - - You have as much data as possible. This usually comes in the form of logs and/or stacktrace. If running on Kubernetes or other environment, look at the logs of the Dapr services (runtime, operator, placement service). More details on how to get logs can be found [here](https://docs.dapr.io/operations/troubleshooting/logs-troubleshooting/). + - Check it's not an environment issue. For example, if running on Kubernetes, make sure prerequisites are in place. (state stores, bindings, etc.) + - You have as much data as possible. This usually comes in the form of logs and/or stacktrace. If running on Kubernetes or other environment, look at the logs of the Dapr services (runtime, operator, placement service). More details on how to get logs can be found [here](https://docs.dapr.io/operations/troubleshooting/logs-troubleshooting/). 1. For proposals - - Many changes to the Dapr runtime may require changes to the API. In that case, the best place to discuss the potential feature is the main [Dapr repo](https://github.com/dapr/dapr). - - Other examples could include bindings, state stores or entirely new components. + - Many changes to the Dapr runtime may require changes to the API. In that case, the best place to discuss the potential feature is the main [Dapr repo](https://github.com/dapr/dapr). + - Other examples could include bindings, state stores or entirely new components. ## Contributing to Dapr This section describes the guidelines for contributing code / docs to Dapr. -### Things to consider when adding new API to SDK - -1. All the new API's go under [dapr-sdk maven package](https://github.com/dapr/java-sdk/tree/master/sdk) -2. Make sure there is an example talking about how to use the API along with a README. [Example](https://github.com/dapr/java-sdk/pull/1235/files#diff-69ed756c4c01fd5fa884aac030dccb8f3f4d4fefa0dc330862d55a6f87b34a14) - ### Pull Requests All contributions come through pull requests. To submit a proposed change, we recommend following this workflow: @@ -63,22 +58,21 @@ All contributions come through pull requests. To submit a proposed change, we re 1. Make sure there's an issue (bug or proposal) raised, which sets the expectations for the contribution you are about to make. 2. Fork the relevant repo and create a new branch 3. Create your change - - Code changes require tests + - Code changes require tests 4. Update relevant documentation for the change 5. Check the code style 6. Commit and open a PR 7. Wait for the CI process to finish and make sure all checks are green 8. A maintainer of the project will be assigned, and you can expect a review within a few days -9. All the files have the Copyright header. ### Configure the code style with checkstyle The project contains a checkstyle file (`checkstyle.xml`) that must be used for formatting the code. * IntelliJ IDEA - You can use [CheckStyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). + You can use [CheckStyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). * VSCode - You can use [Checkstyle for Java](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle). + You can use [Checkstyle for Java](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle). * Eclipse You can use [Eclipse Checkstyle Plugin](https://checkstyle.org/eclipse-cs/#!/) diff --git a/examples/pom.xml b/examples/pom.xml index e9de9dae86..216fb248e7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -82,6 +82,11 @@ opentelemetry-exporter-zipkin ${opentelemetry.version} + + io.zipkin.reporter2 + zipkin-reporter + 2.16.3 + io.opentelemetry opentelemetry-sdk-metrics From 5997f14c14537ed5e760a7b730494a6d89ddec04 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 10:43:11 -0700 Subject: [PATCH 07/12] Add pom Signed-off-by: siri-varma --- CONTRIBUTING.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da48131d7c..4009213b11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ Thank you for your interest in Dapr! -This project welcomes contributions and suggestions. Most contributions require you to signoff on your commits via -the Developer Certificate of Origin (DCO). When you submit a pull request, a DCO-bot will automatically determine -whether you need to provide signoff for your commit. Please follow the instructions provided by DCO-bot, as pull +This project welcomes contributions and suggestions. Most contributions require you to signoff on your commits via +the Developer Certificate of Origin (DCO). When you submit a pull request, a DCO-bot will automatically determine +whether you need to provide signoff for your commit. Please follow the instructions provided by DCO-bot, as pull requests cannot be merged until the author(s) have provided signoff to fulfill the DCO requirement. You may find more information on the DCO requirements [below](#developer-certificate-of-origin-signing-your-work). @@ -34,18 +34,18 @@ There are 4 types of issues: Before you file an issue, make sure you've checked the following: 1. Is it the right repository? - - The Dapr project is distributed across multiple repositories. Check the list of [repositories](https://github.com/dapr) if you aren't sure which repo is the correct one. + - The Dapr project is distributed across multiple repositories. Check the list of [repositories](https://github.com/dapr) if you aren't sure which repo is the correct one. 1. Check for existing issues - - Before you create a new issue, please do a search in [open issues](https://github.com/dapr/java-sdk/issues) to see if the issue or feature request has already been filed. - - If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reaction-to-pull-requests-issues-and-comments). Use a reaction: - - 👍 up-vote - - 👎 down-vote + - Before you create a new issue, please do a search in [open issues](https://github.com/dapr/java-sdk/issues) to see if the issue or feature request has already been filed. + - If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reaction-to-pull-requests-issues-and-comments). Use a reaction: + - 👍 up-vote + - 👎 down-vote 1. For bugs - - Check it's not an environment issue. For example, if running on Kubernetes, make sure prerequisites are in place. (state stores, bindings, etc.) - - You have as much data as possible. This usually comes in the form of logs and/or stacktrace. If running on Kubernetes or other environment, look at the logs of the Dapr services (runtime, operator, placement service). More details on how to get logs can be found [here](https://docs.dapr.io/operations/troubleshooting/logs-troubleshooting/). + - Check it's not an environment issue. For example, if running on Kubernetes, make sure prerequisites are in place. (state stores, bindings, etc.) + - You have as much data as possible. This usually comes in the form of logs and/or stacktrace. If running on Kubernetes or other environment, look at the logs of the Dapr services (runtime, operator, placement service). More details on how to get logs can be found [here](https://docs.dapr.io/operations/troubleshooting/logs-troubleshooting/). 1. For proposals - - Many changes to the Dapr runtime may require changes to the API. In that case, the best place to discuss the potential feature is the main [Dapr repo](https://github.com/dapr/dapr). - - Other examples could include bindings, state stores or entirely new components. + - Many changes to the Dapr runtime may require changes to the API. In that case, the best place to discuss the potential feature is the main [Dapr repo](https://github.com/dapr/dapr). + - Other examples could include bindings, state stores or entirely new components. ## Contributing to Dapr @@ -58,7 +58,7 @@ All contributions come through pull requests. To submit a proposed change, we re 1. Make sure there's an issue (bug or proposal) raised, which sets the expectations for the contribution you are about to make. 2. Fork the relevant repo and create a new branch 3. Create your change - - Code changes require tests + - Code changes require tests 4. Update relevant documentation for the change 5. Check the code style 6. Commit and open a PR @@ -70,9 +70,9 @@ All contributions come through pull requests. To submit a proposed change, we re The project contains a checkstyle file (`checkstyle.xml`) that must be used for formatting the code. * IntelliJ IDEA - You can use [CheckStyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). + You can use [CheckStyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea). * VSCode - You can use [Checkstyle for Java](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle). + You can use [Checkstyle for Java](https://marketplace.visualstudio.com/items?itemName=shengchen.vscode-checkstyle). * Eclipse You can use [Eclipse Checkstyle Plugin](https://checkstyle.org/eclipse-cs/#!/) From 29b9b7a76c3389c66313dedf902df420cd080b8a Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 10:17:27 -0700 Subject: [PATCH 08/12] Add properties Signed-off-by: siri-varma --- examples/pom.xml | 14 ++++++++------ pom.xml | 20 +++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index bea5e8c62d..1732769b81 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -23,6 +23,8 @@ ${java.version} false 0.14.0 + 1.41.0 + 2.16.3 @@ -82,15 +84,15 @@ opentelemetry-exporter-zipkin ${opentelemetry.version} - - io.zipkin.reporter2 - zipkin-reporter - 2.16.3 - io.opentelemetry opentelemetry-sdk-metrics - 1.41.0 + ${opentelemetry-sdk-metrics.version} + + + io.zipkin.reporter2 + zipkin-reporter + ${zipkin.version} org.junit.jupiter diff --git a/pom.xml b/pom.xml index b31c4cc923..c3db79ca58 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,12 @@ 1.41.0 1.5.16 3.9.1 + 2.1.1 + 1.3.2 + 3.9 + 1.9.0 + 2.14.0 + 3.4.0 @@ -248,17 +254,17 @@ jakarta.annotation jakarta.annotation-api - 2.1.1 + ${jakarta.annotation.version} javax.annotation javax.annotation-api - 1.3.2 + ${javax.annotation.version} org.apache.commons commons-lang3 - 3.9 + ${commons-lang.version} ch.qos.logback @@ -268,7 +274,7 @@ commons-cli commons-cli - 1.9.0 + ${commons-cli.version} io.grpc @@ -283,7 +289,7 @@ commons-io commons-io - 2.14.0 + ${commons-io.version} io.opentelemetry @@ -334,12 +340,12 @@ io.zipkin.reporter2 zipkin-reporter - 3.4.0 + ${zipkin.version} io.zipkin.reporter2 zipkin-sender-urlconnection - 3.4.0 + ${zipkin.version} io.dapr From 67957ede8f65f83fac7da248fdb10cb91cf1ee20 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 14:40:58 -0700 Subject: [PATCH 09/12] Added test scope Signed-off-by: siri-varma --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index c3db79ca58..087316678e 100644 --- a/pom.xml +++ b/pom.xml @@ -240,16 +240,19 @@ org.springframework.boot spring-boot-testcontainers ${springboot.version} + test org.testcontainers toxiproxy ${testcontainers.version} + test org.testcontainers mysql ${testcontainers.version} + test jakarta.annotation From 3a4140793f300a616e4c4dd5853be0ba99f00865 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 17:09:37 -0700 Subject: [PATCH 10/12] MArk as test Signed-off-by: siri-varma --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 087316678e..c0c67a89d4 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,6 @@ org.springframework.boot spring-boot-testcontainers ${springboot.version} - test org.testcontainers From 0489740c48716747c9a31f1b74e7b104bddb75ec Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Mon, 19 May 2025 17:49:54 -0700 Subject: [PATCH 11/12] Update pom.xml Signed-off-by: Siri Varma Vegiraju --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0c67a89d4..2e3161f27a 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ + --> From 644243ff405753af70c8fc5d012271648df86e4f Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Mon, 19 May 2025 21:09:28 -0700 Subject: [PATCH 12/12] Update pom.xml Signed-off-by: Siri Varma Vegiraju --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e3161f27a..c0c67a89d4 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ + -->