Skip to content

Fix the issue with retries not happening correctly for Activities and Workflows #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

siri-varma
Copy link
Contributor

Description

Same PR as this #1343 but for the release branch

Issue reference

We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.

Please reference the issue this PR will close: #[issue number]

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

  • Code compiles correctly
  • Created/updated tests
  • Extended the documentation

@siri-varma siri-varma requested review from a team as code owners May 15, 2025 22:49
mcruzdev and others added 25 commits May 15, 2025 15:52
Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* Use Java Bean for connection details and add more tests

Signed-off-by: Artur Ciocanu <[email protected]>

* Simplify mock setup

Signed-off-by: Artur Ciocanu <[email protected]>

* Adding even more tests for test coverage

Signed-off-by: Artur Ciocanu <[email protected]>

---------

Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.0 to 5.4.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](codecov/codecov-action@v5.4.0...v5.4.2)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cassie Coyle <[email protected]>
Co-authored-by: Dapr Bot <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* Fix URL building logic

Signed-off-by: Artur Ciocanu <[email protected]>

* Add test for query params

Signed-off-by: Artur Ciocanu <[email protected]>

* Fix the assertion in the test

Signed-off-by: Artur Ciocanu <[email protected]>

* Adjust the tests

Signed-off-by: Artur Ciocanu <[email protected]>

* Remove uneeded changes from IT test

Signed-off-by: Artur Ciocanu <[email protected]>

* Revert some unintended changes

Signed-off-by: Artur Ciocanu <[email protected]>

* Simplify the testing a little bit

Signed-off-by: Artur Ciocanu <[email protected]>

* Adjust the test to use ServerRequest

Signed-off-by: Artur Ciocanu <[email protected]>

* Test removing things from method invoke controller

Signed-off-by: Artur Ciocanu <[email protected]>

* Add query param encoding test

Signed-off-by: Artur Ciocanu <[email protected]>

* Revert some unintended changes

Signed-off-by: Artur Ciocanu <[email protected]>

* Some tiny styles

Signed-off-by: Artur Ciocanu <[email protected]>

---------

Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* Conversation first commit

Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* Add unit tests

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* change ai to conv

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* Move to single module

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* Remove module

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* Add Integration tests

Signed-off-by: siri-varma <[email protected]>

* Update sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprConversationIT.java

Co-authored-by: Cassie Coyle <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: siri-varma <[email protected]>

* Fix things

Signed-off-by: siri-varma <[email protected]>

* Address comments

Signed-off-by: siri-varma <[email protected]>

* Import tag

Signed-off-by: siri-varma <[email protected]>

* Address comments

Signed-off-by: siri-varma <[email protected]>

* Make common config

Signed-off-by: siri-varma <[email protected]>

* Address comments

Signed-off-by: siri-varma <[email protected]>

* fix constant

Signed-off-by: siri-varma <[email protected]>

* fix constant

Signed-off-by: siri-varma <[email protected]>

* fix constant

Signed-off-by: siri-varma <[email protected]>

* fix s

Signed-off-by: siri-varma <[email protected]>

* Fix things

Signed-off-by: siri-varma <[email protected]>

* Fix things

Signed-off-by: siri-varma <[email protected]>

* Fix things

Signed-off-by: siri-varma <[email protected]>

* Make common config

Signed-off-by: siri-varma <[email protected]>

* Update README.md

Signed-off-by: Siri Varma Vegiraju <[email protected]>

* Update README.md

Signed-off-by: Siri Varma Vegiraju <[email protected]>

---------

Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* Add doc for jobs

Signed-off-by: siri-varma <[email protected]>

* Add docs for Jobs

Signed-off-by: siri-varma <[email protected]>

* Apply suggestions from code review

Co-authored-by: Cassie Coyle <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>

---------

Signed-off-by: siri-varma <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Co-authored-by: artur-ciocanu <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* microsoft durabletask-java -> dapr durabletask-java

Signed-off-by: Cassandra Coyle <[email protected]>

* update another ref

Signed-off-by: Cassandra Coyle <[email protected]>

* 1.5.2 release

Signed-off-by: Cassandra Coyle <[email protected]>

* fix import order

Signed-off-by: Cassandra Coyle <[email protected]>

* Sdk new changes

Signed-off-by: siri-varma <[email protected]>

* Refine workflows

Signed-off-by: siri-varma <[email protected]>

* add ;

Signed-off-by: Cassandra Coyle <[email protected]>

* rm try

Signed-off-by: Cassandra Coyle <[email protected]>

---------

Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Co-authored-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Artur Ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Signed-off-by: sirivarma <[email protected]>
* update okio

Signed-off-by: Cassandra Coyle <[email protected]>

* rm unused dep

Signed-off-by: Cassandra Coyle <[email protected]>

---------

Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: sirivarma <[email protected]>
…apr#1361)

* feat: Support for GRPC ssl

Signed-off-by: Javier Aliaga <[email protected]>

* add tests

Signed-off-by: Cassandra Coyle <[email protected]>

* fix CI

Signed-off-by: Cassandra Coyle <[email protected]>

* add back else if

Signed-off-by: Cassandra Coyle <[email protected]>

* channel cleanup

Signed-off-by: Cassandra Coyle <[email protected]>

* add root ca support

Signed-off-by: Cassandra Coyle <[email protected]>

* checkstyles

Signed-off-by: Cassandra Coyle <[email protected]>

* add insecure

Signed-off-by: Cassandra Coyle <[email protected]>

* fix checkstyles

Signed-off-by: Cassandra Coyle <[email protected]>

* use InsecureTrustManagerFactory

Signed-off-by: Cassandra Coyle <[email protected]>

* fix test

Signed-off-by: Cassandra Coyle <[email protected]>

---------

Signed-off-by: Javier Aliaga <[email protected]>
Signed-off-by: Cassandra Coyle <[email protected]>
Co-authored-by: Javier Aliaga <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: sirivarma <[email protected]>
@siri-varma siri-varma force-pushed the users/svegiraju/releasbranch-fix-npe branch from 0fe3150 to f79b21c Compare May 15, 2025 22:52
@cicoyle
Copy link
Contributor

cicoyle commented May 15, 2025

it might be easier if you run this locally and create a new branch:

git fetch upstream
git checkout -b release-1.15-fix-npe upstream/release-1.15
git push origin release-1.15-fix-npe

Looks like git history got a bit wonky with this PR

@cicoyle
Copy link
Contributor

cicoyle commented May 15, 2025

thank you for the duediligence here with opening it 🙏🏻

@cicoyle
Copy link
Contributor

cicoyle commented May 15, 2025

it might be easier to just cherrypick it after I merge it bc then you can cherrypick a single commit. lets wait for CI on your other PR here then - that is the best approach I think

@cicoyle
Copy link
Contributor

cicoyle commented May 15, 2025

opened it here

@cicoyle cicoyle closed this May 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants