Skip to content

fix for unix socket memcache config #1357

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 14, 2021
Merged

fix for unix socket memcache config #1357

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73bc520
fix for unix socket memcache config
vikipha Oct 12, 2021
7209500
Merge branch 'master' into unix-socket-memcache-fix
basepi Oct 13, 2021
0e0799a
Merge branch 'master' into unix-socket-memcache-fix
basepi Oct 14, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion elasticapm/instrumentation/packages/python_memcached.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import socket

from elasticapm.instrumentation.packages.base import AbstractInstrumentedModule
from elasticapm.traces import capture_span
Expand Down Expand Up @@ -66,7 +67,11 @@ def call(self, module, method, wrapped, instance, args, kwargs):
name = self.get_wrapped_name(wrapped, instance, method)
address, port = None, None
if instance.servers:
address, port = instance.servers[0].address
first_server = instance.servers[0]
if first_server.family == socket.AF_UNIX:
address = first_server.address
else:
address, port = first_server.address
destination = {
"address": address,
"port": port,
Expand Down