Skip to content
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

.../input/entityanalytics/provider/okta: Handle 429s, concurrent limits #42094

Merged
merged 6 commits into from
Dec 19, 2024

Conversation

chrisberkhout
Copy link
Contributor

@chrisberkhout chrisberkhout commented Dec 17, 2024

Proposed commit message

.../input/entityanalytics/provider/okta: Handle 429s, concurrent limits

- Retry requests that get a 429 response, up to a maximum number of
  retries.
- If the concurrent rate limit[1] is exceeded, reset to the default
  initial rate, rather than to zero.

[1] https://developer.okta.com/docs/reference/rl-best-practices/#example-rate-limit-header-with-concurrent-rate-limit

Discussion

Hiding whitespace changes will greatly improve the readability of the diff for x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta.go. It's mostly indentation changes.

For the concurrent rate limit, the previous behavior was to reset to a rate of zero, which would cause an error because the next wait would exceed the maximum wait time.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@chrisberkhout chrisberkhout self-assigned this Dec 17, 2024
@chrisberkhout chrisberkhout requested a review from a team as a code owner December 17, 2024 19:29
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 17, 2024
Copy link
Contributor

mergify bot commented Dec 17, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @chrisberkhout? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Dec 17, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 17, 2024
@chrisberkhout chrisberkhout added backport-skip Skip notification from the automated backport with mergify and removed backport-8.x Automated backport to the 8.x branch with mergify labels Dec 17, 2024
@chrisberkhout chrisberkhout force-pushed the ea-okta-fault-tolerance branch from 97a7acf to 35940af Compare December 17, 2024 19:37
Copy link
Contributor

@efd6 efd6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits only

return nil, nil, fmt.Errorf("maximum retries (%d) finished without success", maxRetries)
}
if retryCount > 0 {
log.Warnf("retrying... (%d/%d)", retryCount, maxRetries)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prefer log._w over log._f.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
ctx := context.Background()
log := logp.L()
e := r.endpoint(endpoint)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linter is correct here, this is an ineffassign.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line is actually unnecessary. Removed.

"github.com/elastic/elastic-agent-libs/logp"
"golang.org/x/time/rate"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs goimports or manual separation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was less automatic than I expected. Fixed.

@chrisberkhout chrisberkhout requested a review from efd6 December 18, 2024 11:26
@chrisberkhout chrisberkhout force-pushed the ea-okta-fault-tolerance branch from 650a97c to 6597840 Compare December 18, 2024 12:46
@chrisberkhout chrisberkhout force-pushed the ea-okta-fault-tolerance branch from 6597840 to 1eb9a34 Compare December 19, 2024 10:24
@chrisberkhout chrisberkhout merged commit d9537d0 into elastic:main Dec 19, 2024
20 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify enhancement Team:Security-Service Integrations Security Service Integrations Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants