Merge branch 'main' into brendan/shared-rate-card

Author: brendanhsentry

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.22.0
+
+### New Features ✨
+
+- Add a batched endpoint for taskbroker status updates by @evanh in [#283](https://github.com/getsentry/sentry-protos/pull/283)
+
 ## 0.21.0
 
 ### New Features ✨

Cargo.lock

@@ -1 +1 @@
-0.21.0
+0.22.0

VERSION

@@ -14,16 +14,16 @@ message RetryState {
   // Current attempt number
   uint32 attempts = 1;
 
-  // After this number of attempts, the task is either discarded or deadlettered.
+  // After this number of attempts, the activation is either discarded or deadlettered.
   uint32 max_attempts = 2;
 
   // The action to take after the max_attempts is exceeded.
   OnAttemptsExceeded on_attempts_exceeded = 3;
 
-  // Whether a task should be executed at most once.
+  // Whether an activation should be executed at most once.
   optional bool at_most_once = 4;
 
-  // Duration in seconds that a task must wait to begin execution after it is retried.
+  // Duration in seconds that an activation must wait to begin execution after it is retried.
   optional uint64 delay_on_retry = 5;
 }
 
@@ -36,17 +36,17 @@ enum TaskActivationStatus {
   TASK_ACTIVATION_STATUS_COMPLETE = 5;
 }
 
-// Task message that is stored in Kafka and shared over RPC.
+// Activation message that is stored in Kafka and shared over RPC.
 message TaskActivation {
-  // A GUID for the task. Used to update tasks
+  // A GUID for the activation. Used to update activations
   string id = 1;
 
-  // The task namespace. Applications can contain multiple namespaces.
+  // The activation namespace. Applications can contain multiple namespaces.
   // While namespaces within an application must be unique, different
   // applications can have overlapping namespace values.
   string namespace = 2;
 
-  // The name of the task. This name is resolved within the worker
+  // The name of the activation. This name is resolved within the worker
   string taskname = 3;
 
   // DEPRECATED: Use parameters_bytes instead.
@@ -58,25 +58,25 @@ message TaskActivation {
   // Mutually exclusive with `parameters`.
   bytes parameters_bytes = 13;
 
-  // A map of headers for the task.
+  // A map of headers for the activation.
   map<string, string> headers = 5;
 
-  // The timestamp a task was stored in Kafka
+  // The timestamp an activation was stored in Kafka
   google.protobuf.Timestamp received_at = 6;
 
   // Retry state
   RetryState retry_state = 7;
 
-  // The duration in seconds that a worker has to complete task execution.
+  // The duration in seconds that a worker has to complete activation execution.
   // When an activation is moved from pending -> processing a result is expected
   // in this many seconds.
   uint64 processing_deadline_duration = 8;
 
-  // The duration in seconds that a task has to start execution.
+  // The duration in seconds that an activation has to start execution.
   // After received_at + expires has passed an activation is expired and will not be executed.
   optional uint64 expires = 9;
 
-  // The duration in seconds that a task must wait to begin execution after it is emitted.
+  // The duration in seconds that an activation must wait to begin execution after it is emitted.
   // After received_at + delay has passed, the activation will become pending.
   optional uint64 delay = 11;
 
@@ -91,11 +91,14 @@ message TaskActivation {
 // RPC messages and services
 ////////////////////////////
 service ConsumerService {
-  // Fetch a new task activation to process.
+  // Fetch a new activation to process.
   rpc GetTask(GetTaskRequest) returns (GetTaskResponse) {}
 
-  // Update the state of a task with execution results.
+  // Update the state of an activation with execution results.
   rpc SetTaskStatus(SetTaskStatusRequest) returns (SetTaskStatusResponse) {}
+
+  // Update the status of multiple activations
+  rpc SetBatchActivationStatus(SetBatchActivationStatusRequest) returns (SetBatchActivationStatusResponse) {}
 }
 
 message GetTaskRequest {
@@ -106,7 +109,7 @@ message GetTaskRequest {
 }
 
 message GetTaskResponse {
-  // If there are no tasks available, this will be empty
+  // If there are no activations available, this will be empty
   optional TaskActivation task = 1;
 }
 
@@ -122,29 +125,36 @@ message SetTaskStatusRequest {
 
   TaskActivationStatus status = 2;
 
-  // If fetch_next is provided, receive a new task in the response
+  // If fetch_next is provided, receive a new activation in the response
   optional FetchNextTask fetch_next_task = 3;
 
-  // Maximum number of attempts for this task (including the initial attempt).
+  // Maximum number of attempts for this activation (including the initial attempt).
   // When status is RETRY and this field is set, the broker will update
   // the activation's retry_state with this value. This allows workers
   // to communicate the retry policy for tasks from raw topics that
   // don't have retry_state embedded in the message.
   optional uint32 max_attempts = 4;
 
-  // Duration in seconds to wait before retrying the task.
+  // Duration in seconds to wait before retrying the activation.
   // When status is RETRY and this field is set, the broker will update
   // the activation's retry_state.delay_on_retry with this value.
   optional uint64 delay_on_retry = 5;
 }
 
 message SetTaskStatusResponse {
-  // The next task the worker should execute. Requires fetch_next to be set on the request.
+  // The next activation the worker should execute. Requires fetch_next to be set on the request.
   optional TaskActivation task = 1;
 }
 
+message SetBatchActivationStatusRequest {
+  // The status updates the broker should execute
+  repeated SetTaskStatusRequest updates = 1;
+}
+
+message SetBatchActivationStatusResponse {}
+
 service WorkerService {
-  // Provide the worker with a task to execute.
+  // Provide the worker with an activation to execute.
   rpc PushTask(PushTaskRequest) returns (PushTaskResponse) {}
 }
 

proto/sentry_protos/taskbroker/v1/taskbroker.proto

@@ -1,6 +1,6 @@
 [package]
 name = "sentry_protos"
-version = "0.21.0"
+version = "0.22.0"
 edition = "2021"
 readme = "README.md"
 description = "Rust bindings for sentry-protos"