Add missing APM entitlements #123462
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ | |
| import org.elasticsearch.entitlement.runtime.policy.entitlements.OutboundNetworkEntitlement; | ||
| import org.elasticsearch.entitlement.runtime.policy.entitlements.ReadStoreAttributesEntitlement; | ||
| import org.elasticsearch.entitlement.runtime.policy.entitlements.SetHttpsConnectionPropertiesEntitlement; | ||
| import org.elasticsearch.entitlement.runtime.policy.entitlements.WriteSystemPropertiesEntitlement; | ||
|
|
||
| import java.lang.instrument.Instrumentation; | ||
| import java.lang.reflect.Constructor; | ||
|
|
@@ -263,11 +264,14 @@ private static PolicyManager createPolicyManager() { | |
| var serverPolicy = new Policy("server", serverScopes); | ||
| // agents run without a module, so this is a special hack for the apm agent | ||
| // this should be removed once https://github.com/elastic/elasticsearch/issues/109335 is completed | ||
| // See also modules/apm/src/main/plugin-metadata/entitlement-policy.yaml | ||
| List<Entitlement> agentEntitlements = List.of( | ||
| new CreateClassLoaderEntitlement(), | ||
| new ManageThreadsEntitlement(), | ||
| new SetHttpsConnectionPropertiesEntitlement(), | ||
| new OutboundNetworkEntitlement(), | ||
| new WriteSystemPropertiesEntitlement(Set.of("AsyncProfiler.safemode")), | ||
| new LoadNativeLibrariesEntitlement(), | ||
| new FilesEntitlement( | ||
| List.of( | ||
| FileData.ofPath(Path.of("/co/elastic/apm/agent/"), READ), | ||
|
||
|
|
||
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
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.
As @rjernst pointed out, we don't need this anymore: the APM Agent is loaded before entitlements are turned on, so native loading happens before that and an entitlement is not needed. I'll remove this.