Disable instrumentation for ES client versions with native instrumentation#3303
Merged
JonasKunz merged 5 commits intoelastic:mainfrom Sep 6, 2023
Merged
Disable instrumentation for ES client versions with native instrumentation#3303JonasKunz merged 5 commits intoelastic:mainfrom
JonasKunz merged 5 commits intoelastic:mainfrom
Conversation
…instrumentation Signed-off-by: Alexander Wert <alexander.wert@elastic.co>
Member
Author
|
TODO: we need to make dependabot stop bumping the ES client versions from 8.10+ on |
JonasKunz
requested review from
a team and
SylvainJuge
and removed request for
JonasKunz
SylvainJuge
approved these changes
Sep 6, 2023
.../src/main/java/co/elastic/apm/agent/esrestclient/ElasticsearchRestClientInstrumentation.java
Outdated
Show resolved
Hide resolved
schikin
pushed a commit
to schikin/apm-agent-java
that referenced
this pull request
Oct 11, 2023
…ation (elastic#3303) * Disable ES client instrumentation for ES client versions with native instrumentation Signed-off-by: Alexander Wert <alexander.wert@elastic.co> --------- Signed-off-by: Alexander Wert <alexander.wert@elastic.co> Co-authored-by: Jonas Kunz <jonas.kunz@elastic.co>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Fixes #3235
elastic/elasticsearch-java#652 introduced native instrumentation into the ES client.
We need to disable agent instrumentation for versions with native instrumentation.
The native instrumentation introduced the class
co.elastic.clients.transport.instrumentation.Instrumentationin the ES client. This PR adds a check for the presence of that class.