Skip to content
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

[DO NOT SQUASH] Merge release-1.12 into master #7017

Merged
merged 11 commits into from
Oct 12, 2023

Conversation

ItalyPaleAle
Copy link
Contributor

DO NOT MERGE SQUASH

Merges release-1.12 into master and fixes the merge conflicts with actors.

Note: DCO is expected to fail on a merge PR.

artursouza and others added 9 commits September 29, 2023 10:21
…o connection. (dapr#6977)

* [release-1.12] Ensure sentry certificate expiry metric is served when provided (dapr#6973)

* Ensure sentry certificate expiry metric is served when provided

Signed-off-by: joshvanl <me@joshvanl.dev>

* Fix spelling of test func `Expiry`

Signed-off-by: joshvanl <me@joshvanl.dev>

* Give metric test case a more appropriate name

Signed-off-by: joshvanl <me@joshvanl.dev>

* Linting

Signed-off-by: joshvanl <me@joshvanl.dev>

---------

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

* [release-1.12] Fix race condition in app health and actors/workflow initialization (dapr#6972)

* Fix race condition in app health and actors/workflow initialization

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Adds integration test to prove actors respond before initilization is complete

Co-Authored-By: joshvanl <me@joshvanl.dev>
Signed-off-by: joshvanl <me@joshvanl.dev>

---------

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: joshvanl <me@joshvanl.dev>
Co-authored-by: joshvanl <me@joshvanl.dev>
Co-authored-by: Artur Souza <asouza.pro@gmail.com>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>

* Fix issue where gRPC app channel cannot recover from no connection.

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

* [1.12] Adds integration test for slow app startup with service
invocation

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

* Keep default gRPC backoff setting.

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

* Fix slowapp invocation test to compensate for race between test and runtime health checks.

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

* [1.12] integration: Change daprd default log level to info (dapr#6980)

Using debug as the default log level for daprd is not ideal as it
is quite noisy, and causes issues on slow CI runners which are not able
to handle the volume of IO. Should improve the stability of the
integration tests on slow CI runners.

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

* Fix lint.

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

* Update tests/integration/suite/daprd/serviceinvocation/grpc/slowappstartup.go

Co-authored-by: Josh van Leeuwen <me@joshvanl.dev>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>

---------

Signed-off-by: joshvanl <me@joshvanl.dev>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Co-authored-by: Josh van Leeuwen <me@joshvanl.dev>
Co-authored-by: Alessandro (Ale) Segala <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: joshvanl <me@joshvanl.dev>
…ontext deadline

Signed-off-by: joshvanl <me@joshvanl.dev>
Signed-off-by: joshvanl <me@joshvanl.dev>
…ontext

[1.12] Fix invoke remote stream from closing stream before EOF
Signed-off-by: Elena Kolevska <elena@kolevska.com>
Co-authored-by: Artur Souza <asouza.pro@gmail.com>
…timer (dapr#6968)

* [1.12] Fix: make sure actors is locally hosted before executing reminder or timer

Rebase of dapr#6960 into release-1.12

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Run WF E2E tests with debug logging

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Handle errors

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Remove logs showing failures during shutdown

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* 💄

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fix Java SDK validation. (dapr#6989)

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

* Fixes for internal actors

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Add integration test to confirm dapr#6968

Shows actor double activation when reminders are firing during a rebalancing

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fixed unit tests

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Address review feedback pt 1

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Updated per review feedback pt 2

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

---------

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Co-authored-by: Artur Souza <asouza.pro@gmail.com>
* WIP: Preserve TypeURL in gRPC->gRPC service invocation

Fixes dapr#7012

Also fixes: in gRPC->gRPC/HTTP service invocation, data in the first chunk is included twice

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fixed retrying with sidecars that don't support streaming

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Added test

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fix responses too

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* 💄

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fixed retries with resiliency

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

* Fixed unit test

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

---------

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
…e-1.12

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Attention: 52 lines in your changes are missing coverage. Please review.

Comparison is base (5ac2f3d) 64.97% compared to head (648ac48) 64.86%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7017      +/-   ##
==========================================
- Coverage   64.97%   64.86%   -0.11%     
==========================================
  Files         230      231       +1     
  Lines       20780    20840      +60     
==========================================
+ Hits        13501    13518      +17     
- Misses       6149     6186      +37     
- Partials     1130     1136       +6     
Files Coverage Δ
pkg/actors/internal/reminder.go 72.63% <ø> (ø)
pkg/channel/grpc/grpc_channel.go 75.00% <100.00%> (+2.58%) ⬆️
pkg/runtime/config.go 29.64% <100.00%> (-0.36%) ⬇️
pkg/actors/internal/config.go 0.00% <0.00%> (ø)
pkg/actors/internal/placement_service.go 0.00% <0.00%> (ø)
pkg/actors/reminders/reminders.go 62.41% <0.00%> (ø)
pkg/messaging/v1/invoke_method_request.go 84.46% <87.50%> (+0.79%) ⬆️
pkg/messaging/direct_messaging.go 55.63% <83.33%> (+0.95%) ⬆️
pkg/messaging/v1/invoke_method_response.go 69.41% <71.42%> (-1.32%) ⬇️
pkg/grpc/manager/manager.go 7.14% <0.00%> (-0.31%) ⬇️
... and 4 more

... and 5 files with indirect coverage changes

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

mukundansundar and others added 2 commits October 11, 2023 15:34
* add release notes for v1.12.0

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>

* update to release notes

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>

* update to release notes

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>

* update to release notes

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>

---------

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>
@ItalyPaleAle ItalyPaleAle marked this pull request as ready for review October 11, 2023 22:36
@ItalyPaleAle ItalyPaleAle requested review from a team as code owners October 11, 2023 22:36
@mukundansundar mukundansundar merged commit c4284d3 into dapr:master Oct 12, 2023
20 of 22 checks passed
@JoshVanL JoshVanL added this to the v1.13 milestone Feb 12, 2024
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.

None yet

5 participants