Repository navigation
feat: Allow passing X-Actor-Request-ID via charge() method #1162
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
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,7 @@ const chargeOptionsSchema = z.strictObject({ | |
| eventName: z.string(), | ||
| count: z.number().default(1), | ||
| idempotencyKey: z.string().optional(), | ||
| apifyRequestId: z.string().optional(), | ||
| ...timeoutOptionsShape, | ||
| }); | ||
| const waitForFinishOptionsSchema = z.strictObject({ waitSecs: z.number().optional(), ...timeoutOptionsShape }); | ||
|
|
@@ -353,6 +354,7 @@ export class RunClient extends ResourceClient { | |
| count, | ||
| idempotencyKey: providedIdempotencyKey, | ||
| timeoutSecs = 'short', | ||
| apifyRequestId: requestId, | ||
| signal, | ||
| } = parseArgument(options, chargeOptionsSchema, 'RunChargeOptions'); | ||
|
|
||
|
|
@@ -366,6 +368,7 @@ export class RunClient extends ResourceClient { | |
| data: { | ||
| eventName, | ||
| count, | ||
| requestId, | ||
| }, | ||
| headers: { | ||
| [RUN_CHARGE_IDEMPOTENCY_HEADER]: idempotencyKey, | ||
|
|
@@ -724,6 +727,11 @@ export interface RunChargeOptions extends TimeoutOptions { | |
| count?: number; | ||
| /** Defaults to runId-eventName-timestamp */ | ||
| idempotencyKey?: string; | ||
|
janbuchar marked this conversation as resolved.
Resolved
|
||
| /** | ||
| * ID of the request being served by a multi-tenant Standby run, taken from the `X-Apify-Request-ID` header of the incoming request. | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe the header name is
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems trustworthy, thanks |
||
| * Maps the charge to the account of the caller who made that request instead of the account that started the run. | ||
| */ | ||
| apifyRequestId?: string; | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would
requestIdby itself be clear enough? @patrikbraborec @tobiceThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, without context, I would be little bit confused. But what are the alternatives?
apifyServerRequestId?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
requestId— exactly what we pass in the JSON request body of the charge endpointapifyRequestId— current state of the PRapifyServerRequestId— what you just suggestedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would vote for consistency. The
chargeendpoint accepts arequestId, so let's have it in the client API as well.If it's confusing, it's too late to change that on the API anyway 😄