[salesforce] Re-expose Request Timeout (resource.timeout) for all data streams - #19717
Merged
stefans-elastic merged 2 commits intoJun 23, 2026
Merged
Conversation
…a streams The Request Timeout setting was dropped in the v0.15.0 revamp (elastic#9629) when the integration moved from the httpjson input to the dedicated salesforce Filebeat input. Since then there was no way to override the input's default 30s HTTP client timeout, so large EventLogFile downloads (notably Apex logs) could fail with "context deadline exceeded" with no available remedy. Re-expose it as a `resource_timeout` variable (default 30s, in Advanced options) across all four data streams (apex, login, logout, setupaudittrail), wiring it to `resource.timeout` in each stream template. Update the troubleshooting docs to reflect the current error signature and bump the package version to 1.8.0. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
✅ Elastic Docs Style Checker (Vale)No issues found on modified lines! The Vale linter checks documentation changes against the Elastic Docs style guide. To use Vale locally or report issues, refer to Elastic style guide for Vale. |
stefans-elastic
added
Team:Obs-InfraObs
Contributor
|
✅ All changelog entries have the correct PR link. |
Contributor
🚀 Benchmarks reportTo see the full report comment with |
💚 Build Succeeded
|
shmsr
approved these changes
Jun 23, 2026
Contributor
|
Queued — the merge queue status continues in this comment ↓. |
Contributor
Merge Queue Status
Waiting for
All conditions
|
Contributor
|
Package salesforce - 1.8.0 containing this change is available at https://epr.elastic.co/package/salesforce/1.8.0/ |
andrewkroh
added
the
documentation
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Proposed commit message
The
Request Timeoutsetting was dropped in the v0.15.0 revamp (#9629), whenthe integration moved from the
httpjsoninput to the dedicatedsalesforceFilebeat input. Since then there has been no way to override the input's
default
30sHTTP client timeout, so largeEventLogFiledownloads (notablyApex logs) can fail with
context deadline exceededand no available remedy.This PR re-exposes it as a
resource_timeoutvariable (default30s, underAdvanced options) for all four data streams (
apex,login,logout,setupaudittrail), wiring it toresource.timeoutin each stream template.The variable is emitted conditionally, so existing policies keep the input's
built-in default and there is no behavior change on upgrade.
The troubleshooting docs are updated to reflect the current error signature,
and the package version is bumped to
1.8.0.Checklist
changelog.ymlfile.How to test this PR locally
elastic-package buildandelastic-package lintinpackages/salesforce.elastic-package test system --data-streams apex(passes with the default30s, and with an explicitresource_timeoutvalue such as120sadded to the test config).Request Timeout(Advanced options) on a data stream and confirmresource.timeoutis rendered into the compiled agent policy. Setting it to a very small value (e.g.1ms) makes the input fail withcontext deadline exceeded; restoring it (e.g.30s) recovers the unit — confirming the setting is honored.