Make sure to correctly preserve block for Elasticsearch::Transport::Client #421
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
shayonj
changed the title
shayonj
force-pushed
the
s/faraday-block
branch
3 times, most recently
from
a356df2
to
7585664
Compare
|
The spec failing appears to be flaky (non actionable)? |
|
@shayonj Someone released a new version of |
delner
added
bug
|
@shayonj Can you rebase this on |
…lient `Elasticsearch::Client` is a convenience wrapper for `Elasticsearch::Transport::Client`. Which provides the ability to work initialize the client with a block while allowing to configure the faraday instance directly. Now, because `Datadog::Contrib::Elasticsearch` monkey patches this behavior, and calls the parent/original `initialize` function (aliased as `initialize_without_datadog`), it however misses to pass in the block, and only sends the arguments. Which means, using the dd-trace gem in applications which initialize `Elasticsearch::Client` with block, becomes risky, as custom faraday configurations are lost. This PR fixes the issue.
|
@delner thanks! done |
delner
approved these changes
May 10, 2018
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.
Elasticsearch::Clientis a convenience wrapper forElasticsearch::Transport::Client.Which provides the ability to initialize the client with a block while allowing
to configure the faraday instance directly.
Now, because
Datadog::Contrib::Elasticsearchmonkey patches this behavior,and calls the parent/original
initializefunction (aliased asinitialize_without_datadog),it however misses to pass in the block, and only sends the arguments.
Which means, using the dd-trace gem in applications which initialize
Elasticsearch::Clientwith block becomes risky, as custom faraday configurations are lost.
This PR fixes the issue.