Upmerge from 1.15 into 1.16 #4856

marcduiker · 2025-09-03T10:09:35Z

Thank you for helping make the Dapr documentation better!

Please follow this checklist before submitting:

Commits are signed with Developer Certificate of Origin (DCO - learn more)
Read the contribution guide
Commands include options for Linux, MacOS, and Windows within codetabs
New file and folder names are globally unique
Page references use shortcodes instead of markdown or URL links
Images use HTML style and have alternative text
Places where multiple code/command options are given have codetabs

In addition, please fill out the following to help reviewers understand this pull request:

Description

Upmerge 1.15 into 1.16

Issue reference

fix todo Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>

"todo" in conversation overview

…o python sdk Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Also marks all `v1.12.x` releases to not-supported. We only support N-2 versions, where N is the latest version. Signed-off-by: joshvanl <me@joshvanl.dev>

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Revert back to built-in Docsy template that includes GA script

instalation -> installation Signed-off-by: Jake Engelberg <152900222+jake-engelberg@users.noreply.github.com>

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

dapr / PVC uninstall specifics, about how a manual deletion of PVCs is required to define a new volume. Signed-off-by: Jake Engelberg <152900222+jake-engelberg@users.noreply.github.com>

Remove specific port number, replace with placeholder

Add missing sample argument for Dapr sidecar app port config sample Signed-off-by: Jonel Dominic Tapang <joneldominictapang.dev@gmail.com> Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>

* update patch version to latest Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com> * update shortcode Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com> --------- Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Signed-off-by: msfussell <markfussell@gmail.com>

…tion options (dapr#4573) Signed-off-by: Anton Troshin <anton@diagrid.io> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Update the Python docs

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

Added .NET streaming subscription example to pubsub page

Python SDK workflow updates

"Scop" fixed to "Scope" Signed-off-by: James Pegg <jamescpegg@gmail.com>

* Update self-hosted-with-docker.md - make scheduler running Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr> * Update self-hosted-with-docker.md - --scheduler-host-address Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr> * Update self-hosted-with-docker.md - Use smaller container images for placement and scheduler Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr> --------- Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr>

Update to .NET 8 runtime Signed-off-by: Alice Gibbons <alice@diagrid.io>

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

…t` on Windows (dapr#4602) Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Co-authored-by: Mark Fussell <markfussell@gmail.com>

* Update workflow pattern diagrams Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Update workflow diagrams to new style Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Update diagrams Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> * Update workflow k8s diagram Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> --------- Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Signed-off-by: Arhell <arhell333@gmail.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Updates license to Apache 2.0 Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

This PR adds Dash0 to the list of supported OTEL observability tools. Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Signed-off-by: nelson.parente <nelson_parente@live.com.pt>

* add 1.15.7 Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * Adds `1.15.8` to releases Signed-off-by: joshvanl <me@joshvanl.dev> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: joshvanl <me@joshvanl.dev> Co-authored-by: Josh van Leeuwen <me@joshvanl.dev>

…replaced with workflow (dapr#4726) * dropped query capability from state store supported capabilities and replaced with workflow Signed-off-by: Oliver Tomlinson <oliverjamestomlinson@gmail.com> * fixed some inaccuracies in supported state store capaiblities Signed-off-by: Oliver Tomlinson <oliverjamestomlinson@gmail.com> --------- Signed-off-by: Oliver Tomlinson <oliverjamestomlinson@gmail.com> Co-authored-by: Yaron Schneider <schneider.yaron@live.com>

* Docs for `--scheduler-override-broadcast-host-port` Signed-off-by: Albert Callarisa <albert@diagrid.io> * Apply suggestions Signed-off-by: Albert Callarisa <albert@diagrid.io> --------- Signed-off-by: Albert Callarisa <albert@diagrid.io> Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>

@alicejgibbons

* Add Dynatrace OpenTelemetry Collector integration guide - Comprehensive setup instructions for Dynatrace OTEL Collector - Dapr tracing configuration with proper endpoint setup - OneAgent exclusion guidance to prevent sidecar conflicts - Troubleshooting section with common issues and solutions - Links to sample implementations and resources Fixes dapr#3887 Signed-off-by: MyMirelHub <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Apply suggestion from @alicejgibbons Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Update daprdocs/content/en/operations/observability/tracing/otel-collector/open-telemetry-collector-dynatrace.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> * Enhance documentation for Dynatrace OpenTelemetry Collector setup with additional notes and clarifications Signed-off-by: MyMirelHub <15373565+MyMirelHub@users.noreply.github.com> * Fix formatting and indentation in Dynatrace OpenTelemetry Collector setup documentation Signed-off-by: MyMirelHub <15373565+MyMirelHub@users.noreply.github.com> --------- Signed-off-by: MyMirelHub <15373565+MyMirelHub@users.noreply.github.com> Signed-off-by: Mirel Isaj <15373565+MyMirelHub@users.noreply.github.com> Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com>

* Add Azure workload identity federation doc. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Shortcodes. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * De-localize Microsoft links. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Remove references to pod identities. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Add system and user managed identity comparison. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Add a second reference to the sample app. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Apply suggestions from code review Co-authored-by: Mark Fussell <markfussell@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Portability note. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Relocate some content to main azure auth guide and reflow. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Make another mention of Dapr guides within the main doc. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Reflow authenticating azure some more. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Reflow authenticating azure some more. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> --------- Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> Co-authored-by: Mark Fussell <markfussell@gmail.com>

* Add a note on how to disable the placement service. Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Update daprdocs/content/en/concepts/dapr-services/placement.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Update daprdocs/content/en/concepts/dapr-services/placement.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Update daprdocs/content/en/concepts/dapr-services/placement.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Update daprdocs/content/en/concepts/dapr-services/placement.md Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Grammar fixup Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> * Update daprdocs/content/en/concepts/dapr-services/placement.md Co-authored-by: Mark Fussell <markfussell@gmail.com> Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> --------- Signed-off-by: Alexander Trauzzi <acj@trauzzi.me> Co-authored-by: Alice Gibbons <alicejgibbons@gmail.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

* add note about java 1.15 compat with dapr 1.15 Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * add dapr 1.15.9 + java 1.15.0 to all dapr 1.15.x versions Signed-off-by: Cassandra Coyle <cassie@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io>

Signed-off-by: Wendelin Niesl <wendelin.niesl@gmail.com>

…r#4720) Signed-off-by: Adam Stewart <adam.stewart73@gmail.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>

* Add dash0 tracing how-to Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com> * remove unneeded link Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com> * add Dash0 to next steps list Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com> --------- Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com>

Signed-off-by: FraserMarlow <github@frasermarlow.com>

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Revert to commit e3efbad to remove docs specific to 1.16

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

msfussell

LGTM

hhunter-ms and others added 30 commits February 27, 2025 14:08

Update conversation-overview.md

4f32042

fix todo Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>

Merge pull request dapr#4559 from dapr/hhunter-ms-patch-6

3688a1d

"todo" in conversation overview

update python examples for workflow; update conversation quickstart t…

b74c247

…o python sdk Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Updates latest version to 1.15.1 (dapr#4562)

0992cd4

Also marks all `v1.12.x` releases to not-supported. We only support N-2 versions, where N is the latest version. Signed-off-by: joshvanl <me@joshvanl.dev>

Revert back to built-in template that includes GA

fb53445

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Merge pull request dapr#4564 from marcduiker/v1.15

287cfd7

Revert back to built-in Docsy template that includes GA script

spelling-fix: kubernetes-persisting-scheduler.md (dapr#4566)

7c40430

instalation -> installation Signed-off-by: Jake Engelberg <152900222+jake-engelberg@users.noreply.github.com>

remove 3500, only use as an example in API docs

19f812c

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Update kubernetes-persisting-scheduler.md (dapr#4568)

178e0c8

dapr / PVC uninstall specifics, about how a manual deletion of PVCs is required to define a new volume. Signed-off-by: Jake Engelberg <152900222+jake-engelberg@users.noreply.github.com>

Merge branch 'v1.15' into issue_4519

ac358cb

Merge pull request dapr#4567 from hhunter-ms/issue_4519

b7b273d

Remove specific port number, replace with placeholder

Update sidecar.md (dapr#4570)

12b2f17

Add missing sample argument for Dapr sidecar app port config sample Signed-off-by: Jonel Dominic Tapang <joneldominictapang.dev@gmail.com> Co-authored-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>

Update v1.15.1 --> v1.15.2 (dapr#4571)

f4848ae

* update patch version to latest Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com> * update shortcode Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com> --------- Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

update keys to items for consistency (dapr#4565)

0682cd0

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

update the docs

418ef7f

Signed-off-by: msfussell <markfussell@gmail.com>

Update multi-app template and arguments annotations for new configura…

fb8764b

…tion options (dapr#4573) Signed-off-by: Anton Troshin <anton@diagrid.io> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Merge branch 'v1.15' into pythondocs

449fb9a

Merge pull request dapr#4576 from msfussell/pythondocs

b24527e

Update the Python docs

update author and manage workflow how-tos

60d5332

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Merge branch 'v1.15' into issue_4410

8cbd37a

Added .NET streaming subscription example to pubsub page

6e990e4

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

Added double quotes around .NET in the tabs markup

2be7c99

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

Merge pull request dapr#4583 from WhitWaldo/net-streaming-subs

dd0fd38

Added .NET streaming subscription example to pubsub page

Merge branch 'v1.15' into issue_4410

79d0320

Merge pull request dapr#4563 from hhunter-ms/issue_4410

f612ab7

Python SDK workflow updates

Fixed spelling mistake in secret-scope.md (dapr#4593)

8a29b39

"Scop" fixed to "Scope" Signed-off-by: James Pegg <jamescpegg@gmail.com>

Update actors-quickstart.md (dapr#4601)

b421483

Update to .NET 8 runtime Signed-off-by: Alice Gibbons <alice@diagrid.io>

Upped stalebot period from 5 to 30 days (dapr#4610)

196cf3d

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

Added troubleshooting step to resolve port conflicts during `dapr ini…

5435bd4

…t` on Windows (dapr#4602) Signed-off-by: Whit Waldo <whit.waldo@innovian.net> Co-authored-by: Mark Fussell <markfussell@gmail.com>

marcduiker and others added 23 commits June 25, 2025 18:05

update developing-applications folder links (dapr#4705)

36bb99a

Signed-off-by: Arhell <arhell333@gmail.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Update LICENSE (dapr#4712)

9ccd3f7

Updates license to Apache 2.0 Signed-off-by: Yaron Schneider <schneider.yaron@live.com>

Update submodule refs (dapr#4715)

d3b8b7d

Add Dash0 to tracing-overview.md (dapr#4713)

f5cbb64

This PR adds Dash0 to the list of supported OTEL observability tools. Signed-off-by: Kasper Borg Nissen <kasper.nissen@dash0.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

docs: update gcp firestore docs (dapr#4723)

fe13a1a

Signed-off-by: nelson.parente <nelson_parente@live.com.pt>

Fix for issue - AWS SQS binding spec - endpoint dapr#4698 (dapr#4718)

2f72cfd

Fix typo in net command (dapr#4774)

6cc0a96

Signed-off-by: Wendelin Niesl <wendelin.niesl@gmail.com>

Add disableEntityManagement option to azure blob binding ref doc (dap…

e82a4d3

…r#4720) Signed-off-by: Adam Stewart <adam.stewart73@gmail.com> Co-authored-by: Mark Fussell <markfussell@gmail.com>

Updating SDK docs (dapr#4777)

239dfef

Co-authored-by: Marc Duiker <marcduiker@users.noreply.github.com>

Adding the Reo.Dev footer code (dapr#4823)

6280034

Signed-off-by: FraserMarlow <github@frasermarlow.com>

Revert to commit e3efbad to remove docs specific to 1.16

7127643

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Merge pull request dapr#4848 from marcduiker/revert-dotnet-docs-ref-115

df0712d

Revert to commit e3efbad to remove docs specific to 1.16

Add kapa.ai script (dapr#4853)

d248b76

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Merge remote-tracking branch 'origin/v1.15' into upmerge-09-03

87fef04

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

marcduiker requested review from a team as code owners September 3, 2025 10:09

marcduiker added 2 commits September 3, 2025 10:09

Fix duplicated lines

692ee52

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

Fix yaml syntax

c593c77

Signed-off-by: Marc Duiker <marcduiker@users.noreply.github.com>

msfussell approved these changes Sep 3, 2025

View reviewed changes

marcduiker merged commit 662ee93 into dapr:v1.16 Sep 3, 2025
4 checks passed

marcduiker deleted the upmerge-09-03 branch September 3, 2025 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upmerge from 1.15 into 1.16 #4856

Upmerge from 1.15 into 1.16 #4856

Uh oh!

marcduiker commented Sep 3, 2025

Uh oh!

msfussell left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

37 participants

Upmerge from 1.15 into 1.16 #4856

Upmerge from 1.15 into 1.16 #4856

Uh oh!

Conversation

marcduiker commented Sep 3, 2025

Description

Issue reference

Uh oh!

msfussell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

37 participants