Add elasticsearch instrumentation #1525
Merged
Conversation
This file contains 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
* Change the naming of the instrumentation method from _with_tracing to _with_new_relic * Add alias for renaming the original method * Add yield to instrumented method
The template was missing the reflection of the alias method to rename the original :perform_request method
The condition previously used ::Elastic, this caused a load error for Elasticsearch 7.x
This first pass at the data segment finds dynamic values for some attributes and hard codes others. This misses any reporting on the arguments passed to perform_request We should find a way to include those arguments in the segment
cluster_name request
This commit adds the ability to capture queries and optionally obfuscate them and add some associated tests
Other datastore segments notice the queries instead of adding them as attributes this change follows that pattern
tannalynn
force-pushed
the
add_elasticsearch_instrumentation
branch
from
1f47acb to
00d2d01
Compare
use port 9200 for elastic 7 and 9250 for elastic 8
rather than checking for is ::Elastic is defined, we check for the gem version to decide which to use
changed the check to version of elasticsearch gem
tannalynn
commented
Oct 6, 2022
…ic/newrelic-ruby-agent into add_elasticsearch_instrumentation
…ic/newrelic-ruby-agent into add_elasticsearch_instrumentation
fallwith
suggested changes
Oct 13, 2022
lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb
Outdated
Show resolved
Hide resolved
…ion.rb Co-authored-by: James Bunch <[email protected]>
…ic/newrelic-ruby-agent into add_elasticsearch_instrumentation
fallwith
reviewed
Oct 14, 2022
| @segment = txn.segments[1] | ||
| end | ||
|
|
||
| # TODO! TEST METRIC GENERATION!!! |
There was a problem hiding this comment.
I think this TODO has either been satisfied or can be tracked elsewhere outside of the code now.
fallwith
previously approved these changes
Oct 14, 2022
fallwith
previously approved these changes
Oct 14, 2022
fallwith
previously approved these changes
Oct 14, 2022
…ion.rb Co-authored-by: James Bunch <[email protected]>
…namically Set Elasticsearch operation dynamically
kaylareopelle
approved these changes
Oct 14, 2022
SimpleCov Report
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before contributing, please read our contributing guidelines and code of conduct.
Overview
Adds instrumentation for the elasticsearch gem 7.0+.
Also updates the docker-compose file and the CI to run elasticsearch 7 and 8 to support our tests.
The Mongo sql obfuscator was moved to be used more generally for nosql obfuscation.
New configuration options:
instrumentation.elasticsearchelasticsearch.capture_querieselasticsearch.obfuscate_queriesSubmitter Checklist:
Testing
The agent includes a suite of unit and functional tests which should be used to
verify your changes don't break existing functionality. These tests will run with
GitHub Actions when a pull request is made. More details on running the tests locally can be found
here for our unit tests,
and here for our functional tests.
For most contributions it is strongly recommended to add additional tests which
exercise your changes.
Reviewer Checklist