Add TLS support for Memcached client#3585
Merged
joe-elliott merged 5 commits intografana:mainfrom Apr 19, 2024
Merged
Conversation
sonisr
changed the title
sonisr
requested review from
annanay25,
electron0zero,
ie-pham,
joe-elliott,
knylander-grafana,
mapno,
mdisibio,
stoewer,
yvrhdn and
zalegrala
as code owners
joe-elliott
reviewed
Apr 17, 2024
|
|
||
| conn, err := cb.Execute(func() (interface{}, error) { | ||
| return net.DialTimeout(network, address, timeout) | ||
| return c.DialTimeout(network, address, timeout) |
Collaborator
There was a problem hiding this comment.
it seems like this DialTimeout method is available here as c.Client.DialTimeout is there a reason to store it directly on the object?
Contributor
Author
There was a problem hiding this comment.
I imagine you could use c.Client.DialTimeout in lieu of storing it directly on the object.
Personally, not so sure if there's any benefits of using one over the other here.
There doesn't seem to be any adverse effects from storing it directly on the object in Loki. Though, it could possibly differ in Tempo.
joe-elliott
reviewed
Apr 17, 2024
Collaborator
joe-elliott
left a comment
joe-elliott
left a comment
There was a problem hiding this comment.
Thanks for the work! One small question but generally this looks good!
sonisr
changed the title
joe-elliott
approved these changes
Apr 19, 2024
Collaborator
|
Awesome feature addition! Thank you. |
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
2 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.
What this PR does:
This is just a copy of grafana/loki#12318 (comment) but for Tempo.
Which issue(s) this PR fixes:
Fixes #3564
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]