Entitlements: More robust frame skipping #118983
Merged
Conversation
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
prdoyle
added
>non-issue
:Core/Infra/Core
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
rjernst
reviewed
Dec 18, 2024
Member
There was a problem hiding this comment.
This looks fine, though I find it a little confusing because of naming, and it seems a bit fragile to me. How do our existing entitlement IT tests work if this was incorrect? Can you at least add some comments to the requestingModule and findRequestingModule methods explaining the split and the expected outcome/behavior? Also, is there any anticipated performance hit by removing the constant skip?
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Outdated
Show resolved
Hide resolved
jdconrad
reviewed
Dec 18, 2024
Contributor
jdconrad
left a comment
jdconrad
left a comment
There was a problem hiding this comment.
I think this a good idea, but we should take it a bit further to be less lenient.
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Outdated
Show resolved
Hide resolved
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Show resolved
Hide resolved
Contributor
Author
|
For the performance hit: it was already skipping frames in the JDK, and now the entitlement runtime frames have the same overhead as the JDK frames. |
jdconrad
approved these changes
Dec 18, 2024
Contributor
jdconrad
left a comment
jdconrad
left a comment
There was a problem hiding this comment.
LGTM! Thanks for improving this.
rjernst
approved these changes
Dec 18, 2024
...nt/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java
Outdated
Show resolved
Hide resolved
libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java
Outdated
Show resolved
Hide resolved
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Dec 18, 2024
* More robust frame skipping * Cosmetic improvements for clarity * Explicit set of runtime classes * Pass entitlements runtime module to PolicyManager ctor * Use the term "entitlements module" and filter instead of dropWhile * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
Collaborator
💚 Backport successful
|
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 18, 2024
* More robust frame skipping * Cosmetic improvements for clarity * Explicit set of runtime classes * Pass entitlements runtime module to PolicyManager ctor * Use the term "entitlements module" and filter instead of dropWhile * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
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.
The existing
requestingModulelogic skips a fixed number of frames, making highly sensitive to refactoring, and also making it impossible to callrequestingModulefrom frames at two different depths.The new logic inspects the frames to skip the runtime frames, and then the JDK frames, regardless of how many there are.
Supersedes #118796 with more to come.