Agent context storage wrapper should not override other wrappers

[laurit]

Resolves #7344

[oleborne]

Thanks @laurit for the fix. I was about to make the same proposal.

However this leaves indeed the possibility for the wrapper to break the agent by actually replacing the underlying ContextStorage. Such a wrapper would break the javaagent.

If the code owners are ok with this possible issue, I would recommend to also update the Javadoc of ContextStorageWrappersInstrumentation to explicitly state that Wrappers are still allowed: only providers are bypassed.

[laurit]

However this leaves indeed the possibility for the wrapper to break the agent by actually replacing the underlying ContextStorage. Such a wrapper would break the javaagent.

In my opinion this is not a big issue. If user has built such a wrapper then user can also modify it if there is desire to run with javaagent. If such a wrapper is used by a framework then agent can try to instrument it.

[oleborne]

If user has built such a wrapper then user can also modify it if there is desire to run with javaagent.

Totally agree, hence my remark about updating the Javadoc to 1. warn people about the possibility and 2. clarify how to fix it should you be the author of such a wrapper.