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

Add support for elasticsearch 7 rest client #2528

Merged
merged 7 commits into from
Mar 11, 2021

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Mar 8, 2021

No description provided.

@iNikem
Copy link
Contributor

iNikem commented Mar 9, 2021

Looking at muzzle configurations for elasticsearch-rest-6.4 and elasticsearch-rest-7.0 it seems to me that the former instrumentation will be applied to version 7.0 as well. I don't think this is what we want. Can you try to add elasticsearch-rest-6.4 as testInstrumentation to elasticsearch-rest-7.0 and see what will happen?

@laurit
Copy link
Contributor Author

laurit commented Mar 9, 2021

@iNikem Thanks. Added classLoaderMatcher to ensure that instrumentation applies to correct version. 6.4 instrumentation actually can't apply to 7.0 because it patches a method that does not exist in 7.0, but 7.0 might apply to 6.4

scope.close();
if (throwable != null) {
tracer().endExceptionally(context, throwable);
}
Copy link
Member

Choose a reason for hiding this comment

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

Nit: can you add a comment like

// span ended in RestResponseListener

below?

@iNikem iNikem merged commit 14dcd14 into open-telemetry:main Mar 11, 2021
@laurit laurit deleted the elasticsearch-rest-client branch August 24, 2021 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants