[exporter/elasticsearch] Deprecate retry::max_requests in favor of retry::max_retries #35571
Conversation
This file contains 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
carsonip
commented
Oct 3, 2024
crobert-1
reviewed
Oct 3, 2024
crobert-1
approved these changes
Oct 4, 2024
| if cfg.Mapping.Dedup != nil { | ||
| logger.Warn("dedup is deprecated, and is always enabled") | ||
| } | ||
| if cfg.Mapping.Dedot && cfg.MappingMode() != MappingECS || !cfg.Mapping.Dedot && cfg.MappingMode() == MappingECS { | ||
| logger.Warn("dedot has been deprecated: in the future, dedotting will always be performed in ECS mode only") | ||
| } | ||
| if cfg.Retry.MaxRequests != 0 { | ||
| if cfg.Retry.MaxRetries != 0 { | ||
| return errors.New("should specify at most one of retry::max_requests and retry::max_retries") |
There was a problem hiding this comment.
This must be checked in the Config::Validate() method, so that the validate command checks it.
carsonip
commented
Oct 17, 2024
| @@ -50,27 +50,34 @@ type bulkIndexerSession interface { | |||
| Flush(context.Context) error | |||
| } | |||
|
|
|||
| const defaultMaxRetries = 2 | |||
There was a problem hiding this comment.
[to reviewer] moving default out of default config, otherwise we cannot detect max_requests !=0 and max_retries != 0 due to default config being initialized first.
andrzej-stencel
approved these changes
Oct 17, 2024
| @@ -280,6 +280,9 @@ func (cfg *Config) Validate() error { | |||
| if cfg.Retry.MaxRetries < 0 { | |||
| return errors.New("retry::max_retries should be non-negative") | |||
| } | |||
| if cfg.Retry.MaxRequests > 0 && cfg.Retry.MaxRetries > 0 { | |||
There was a problem hiding this comment.
Suggested change
| if cfg.Retry.MaxRequests > 0 && cfg.Retry.MaxRetries > 0 { | |
| if cfg.Retry.MaxRequests != 0 && cfg.Retry.MaxRetries != 0 { |
There was a problem hiding this comment.
🤦 I did exactly that but forgot to push
sbylica-splunk
pushed a commit
to sbylica-splunk/opentelemetry-collector-contrib
that referenced
this pull request
Dec 17, 2024
…try::max_retries (open-telemetry#35571) **Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> The new retry::max_retries will be exactly retry::max_requests - 1, but it will be much more intuitive to the end user. Deprecate retry::max_requests. **Link to tracking Issue:** <Issue number if applicable> Fixes open-telemetry#32344 **Testing:** <Describe what testing was performed and which tests were added.> **Documentation:** <Describe the documentation added.>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description:
The new retry::max_retries will be exactly retry::max_requests - 1, but it will be much more intuitive to the end user. Deprecate retry::max_requests.
Link to tracking Issue:
Fixes #32344
Testing:
Documentation: