Skip to content

Fix the issue with retries not happening correctly for Activities and… #1374

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

Merged
merged 1 commit into from
May 16, 2025

Conversation

cicoyle
Copy link
Contributor

@cicoyle cicoyle commented May 15, 2025

… Workflows (dapr#1343)

* Add coverage for some properties (dapr#1297)

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

* Make the DAPR version being used consistent across all tests (dapr#1299)

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

* Separate Dapr constants from IT container constants (dapr#1315)

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 (dapr#1317)

* 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]>

* Update CONTRIBUTING.md

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

* Bump codecov/codecov-action from 5.4.0 to 5.4.2 (dapr#1318)

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 (dapr#1320)

* 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]>

* Generate updated javadocs for 1.14.1

Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: sirivarma <[email protected]>

* Add Conversation AI to Java SDK (dapr#1235)

* 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 docs for usage of Jobs SDK (dapr#1323)

* 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]>

* Use dapr/durabletask-java (dapr#1336)

* 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]>

* Update master version to 1.16.0-SNAPSHOT

Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: sirivarma <[email protected]>

* Fix NPE

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

* Fix NPE

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

* Fix NPE

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

* Fix NPE

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

* Fix NPE

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

* Fix NPE

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

* Fix things

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

* Renaming and exposing connection details (dapr#1341)

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

* [Master] Fix Vulnerabilities (dapr#1354)

* 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]>

* Feat Add TLS & mTLS support for gRPC with root CA and insecure mode (dapr#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]>

* Address comments

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

* Fix things

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

* Fix things

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

---------

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Artur Ciocanu <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: Javier Aliaga <[email protected]>
Co-authored-by: Matheus Cruz <[email protected]>
Co-authored-by: artur-ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Cassie Coyle <[email protected]>
Co-authored-by: Javier Aliaga <[email protected]>
@siri-varma
Copy link
Contributor

Thank you for taking care of this @cicoyle

@cicoyle cicoyle merged commit 868082c into dapr:release-1.15 May 16, 2025
9 checks passed
Copy link

codecov bot commented May 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-1.15@8031d28). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff               @@
##             release-1.15    #1374   +/-   ##
===============================================
  Coverage                ?   77.54%           
  Complexity              ?     1774           
===============================================
  Files                   ?      204           
  Lines                   ?     5446           
  Branches                ?      598           
===============================================
  Hits                    ?     4223           
  Misses                  ?      904           
  Partials                ?      319           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

siri-varma added a commit to siri-varma/java-sdk that referenced this pull request Aug 12, 2025
… Workflows (dapr#1343) (dapr#1374)

* Add coverage for some properties (dapr#1297)

* Make the DAPR version being used consistent across all tests (dapr#1299)

* Separate Dapr constants from IT container constants (dapr#1315)

* Use Java Bean for connection details and add more tests (dapr#1317)

* Use Java Bean for connection details and add more tests

* Simplify mock setup

* Adding even more tests for test coverage

---------

* Update CONTRIBUTING.md

* Bump codecov/codecov-action from 5.4.0 to 5.4.2 (dapr#1318)

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
...

* Fix URL building logic (dapr#1320)

* Fix URL building logic

* Add test for query params

* Fix the assertion in the test

* Adjust the tests

* Remove uneeded changes from IT test

* Revert some unintended changes

* Simplify the testing a little bit

* Adjust the test to use ServerRequest

* Test removing things from method invoke controller

* Add query param encoding test

* Revert some unintended changes

* Some tiny styles

---------

* Generate updated javadocs for 1.14.1

* Add Conversation AI to Java SDK (dapr#1235)

* Conversation first commit

* Add unit tests

* change ai to conv

* Move to single module

* Remove module

* Add Integration tests

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

* Fix things

* Address comments

* Import tag

* Address comments

* Make common config

* Address comments

* fix constant

* fix constant

* fix constant

* fix s

* Fix things

* Fix things

* Fix things

* Make common config

* Update README.md

* Update README.md

---------

* Add docs for usage of Jobs SDK (dapr#1323)

* Add doc for jobs

* Add docs for Jobs

* Apply suggestions from code review

---------

* Use dapr/durabletask-java (dapr#1336)

* microsoft durabletask-java -> dapr durabletask-java

* update another ref

* 1.5.2 release

* fix import order

* Sdk new changes

* Refine workflows

* add ;

* rm try

---------

* Update master version to 1.16.0-SNAPSHOT

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix things

* Renaming and exposing connection details (dapr#1341)

* [Master] Fix Vulnerabilities (dapr#1354)

* update okio

* rm unused dep

---------

* Feat Add TLS & mTLS support for gRPC with root CA and insecure mode (dapr#1361)

* feat: Support for GRPC ssl

* add tests

* fix CI

* add back else if

* channel cleanup

* add root ca support

* checkstyles

* add insecure

* fix checkstyles

* use InsecureTrustManagerFactory

* fix test

---------

* Address comments

* Fix things

* Fix things

---------

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Artur Ciocanu <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: Javier Aliaga <[email protected]>
Co-authored-by: Siri Varma Vegiraju <[email protected]>
Co-authored-by: Matheus Cruz <[email protected]>
Co-authored-by: artur-ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Javier Aliaga <[email protected]>
Signed-off-by: siri-varma <[email protected]>
siri-varma added a commit to siri-varma/java-sdk that referenced this pull request Aug 12, 2025
… Workflows (dapr#1343) (dapr#1374)

* Add coverage for some properties (dapr#1297)

* Make the DAPR version being used consistent across all tests (dapr#1299)

* Separate Dapr constants from IT container constants (dapr#1315)

* Use Java Bean for connection details and add more tests (dapr#1317)

* Use Java Bean for connection details and add more tests

* Simplify mock setup

* Adding even more tests for test coverage

---------

* Update CONTRIBUTING.md

* Bump codecov/codecov-action from 5.4.0 to 5.4.2 (dapr#1318)

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
...

* Fix URL building logic (dapr#1320)

* Fix URL building logic

* Add test for query params

* Fix the assertion in the test

* Adjust the tests

* Remove uneeded changes from IT test

* Revert some unintended changes

* Simplify the testing a little bit

* Adjust the test to use ServerRequest

* Test removing things from method invoke controller

* Add query param encoding test

* Revert some unintended changes

* Some tiny styles

---------

* Generate updated javadocs for 1.14.1

* Add Conversation AI to Java SDK (dapr#1235)

* Conversation first commit

* Add unit tests

* change ai to conv

* Move to single module

* Remove module

* Add Integration tests

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

* Fix things

* Address comments

* Import tag

* Address comments

* Make common config

* Address comments

* fix constant

* fix constant

* fix constant

* fix s

* Fix things

* Fix things

* Fix things

* Make common config

* Update README.md

* Update README.md

---------

* Add docs for usage of Jobs SDK (dapr#1323)

* Add doc for jobs

* Add docs for Jobs

* Apply suggestions from code review

---------

* Use dapr/durabletask-java (dapr#1336)

* microsoft durabletask-java -> dapr durabletask-java

* update another ref

* 1.5.2 release

* fix import order

* Sdk new changes

* Refine workflows

* add ;

* rm try

---------

* Update master version to 1.16.0-SNAPSHOT

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix NPE

* Fix things

* Renaming and exposing connection details (dapr#1341)

* [Master] Fix Vulnerabilities (dapr#1354)

* update okio

* rm unused dep

---------

* Feat Add TLS & mTLS support for gRPC with root CA and insecure mode (dapr#1361)

* feat: Support for GRPC ssl

* add tests

* fix CI

* add back else if

* channel cleanup

* add root ca support

* checkstyles

* add insecure

* fix checkstyles

* use InsecureTrustManagerFactory

* fix test

---------

* Address comments

* Fix things

* Fix things

---------

Signed-off-by: sirivarma <[email protected]>
Signed-off-by: Artur Ciocanu <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Dapr Bot <[email protected]>
Signed-off-by: Siri Varma Vegiraju <[email protected]>
Signed-off-by: siri-varma <[email protected]>
Signed-off-by: Cassandra Coyle <[email protected]>
Signed-off-by: Javier Aliaga <[email protected]>
Co-authored-by: Siri Varma Vegiraju <[email protected]>
Co-authored-by: Matheus Cruz <[email protected]>
Co-authored-by: artur-ciocanu <[email protected]>
Co-authored-by: Artur Ciocanu <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Dapr Bot <[email protected]>
Co-authored-by: Javier Aliaga <[email protected]>
Signed-off-by: siri-varma <[email protected]>
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.

3 participants