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 elasticsearch7 #2514

Merged
merged 2 commits into from
Mar 7, 2021
Merged

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Mar 5, 2021

Tweak elasticsearch test and instrumentation a bit so it would work for versions starting from 6.5

Copy link
Member

@mateuszrzeszutek mateuszrzeszutek left a comment

Choose a reason for hiding this comment

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

LGTM 👍
Just wondering, what about the elasticsearch-rest-6.4 instrumentation?
It has this suspicious TODO, maybe similar test there changes will make it work?

  // TODO: The tests are incompatible with 7.x.  The instrumentation may be as well.
  latestDepTestImplementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: '6.+'

@laurit
Copy link
Contributor Author

laurit commented Mar 5, 2021

I did look at it and while tests can be made to work the instrumentation also needs a bit of work because of elastic/elasticsearch@a7046e0 Previously request methods ended up in performRequestAsyncNoCatch now sync and async methods need to be instrumented separately.

Copy link
Contributor

@anuraaga anuraaga left a comment

Choose a reason for hiding this comment

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

Luckily this is gone from 8.x+ so won't need more maintenance (probably)

takesArgument(
0,
namedOneOf(
"org.elasticsearch.action.Action",
Copy link
Contributor

Choose a reason for hiding this comment

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

This sort of change happened on minor version 6.5? Geez

@iNikem iNikem merged commit 7df5579 into open-telemetry:main Mar 7, 2021
@laurit laurit deleted the elasticsearch7 branch March 7, 2021 14:32
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