Skip to content

Commit

Permalink
Merge branch 'v1.14' into maintainer-comment-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
WhitWaldo authored Dec 6, 2024
2 parents 7a0bd59 + 79a5b94 commit bce80bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ description: "Learn how to control how many requests and events can invoke your

Typically, in distributed computing, you may only want to allow for a given number of requests to execute concurrently. Using Dapr's `app-max-concurrency`, you can control how many requests and events can invoke your application simultaneously.

Default `app-max-concurreny` is set to `-1`, meaning no concurrency.
Default `app-max-concurreny` is set to `-1`, meaning no concurrency limit is enforced.

## Different approaches

While this guide focuses on `app-max-concurrency`, you can also limit request rate per second using the **`middleware.http.ratelimit`** middleware. However, it's important to understand the difference between the two approaches:

- `middleware.http.ratelimit`: Time bound and limits the number of requests per second
- `app-max-concurrency`: Specifies the number of concurrent requests (and events) at any point of time.
- `app-max-concurrency`: Specifies the max number of concurrent requests (and events) at any point of time.

See [Rate limit middleware]({{< ref middleware-rate-limit.md >}}) for more information about that approach.

Expand Down Expand Up @@ -46,7 +46,7 @@ To set concurrency limits with the Dapr CLI for running on your local dev machin
dapr run --app-max-concurrency 1 --app-port 5000 python ./app.py
```

The above example effectively turns your app into a single concurrent service.
The above example effectively turns your app into a sequential processing service.

{{% /codetab %}}

Expand Down
2 changes: 1 addition & 1 deletion daprdocs/content/en/reference/api/pubsub_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ other | warning is logged and all messages to be retried

## Message envelope

Dapr pub/sub adheres to version 1.0 of CloudEvents.
Dapr pub/sub adheres to [version 1.0 of CloudEvents](https://github.com/cloudevents/spec/blob/v1.0/spec.md).

## Related links

Expand Down

0 comments on commit bce80bd

Please sign in to comment.