Capture pymemcache host & port

newrelic/hooks/datastore_pymemcache.py

@@ -37,7 +37,25 @@
 )
 
 
+def capture_host(self, *args, **kwargs):
+    if hasattr(self, "server") and self.server and len(self.server) >= 2:
+        return self.server[0]
+
+
+def capture_port(self, *args, **kwargs):
+    if hasattr(self, "server") and self.server and len(self.server) >= 2:
+        return self.server[1]
+
+
 def instrument_pymemcache_client(module):
     for name in _memcache_client_methods:
         if hasattr(module.Client, name):
-            wrap_datastore_trace(module, "Client.%s" % name, product="Memcached", target=None, operation=name)
+            wrap_datastore_trace(
+                module,
+                "Client.%s" % name,
+                product="Memcached",
+                target=None,
+                operation=name,
+                host=capture_host,
+                port_path_or_id=capture_port,
+            )

tests/datastore_pymemcache/test_memcache.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
 import pymemcache.client
 from testing_support.db_settings import memcached_settings
 from testing_support.validators.validate_transaction_metrics import (
@@ -45,6 +43,7 @@
     ("Datastore/operation/Memcached/set", 1),
     ("Datastore/operation/Memcached/get", 1),
     ("Datastore/operation/Memcached/delete", 1),
+    ("Datastore/instance/Memcached/%s/%s" % (MEMCACHED_HOST, MEMCACHED_PORT), 3),
 ]
 
 
@@ -82,6 +81,7 @@ def test_bt_set_get_delete():
     ("Datastore/operation/Memcached/set", 1),
     ("Datastore/operation/Memcached/get", 1),
     ("Datastore/operation/Memcached/delete", 1),
+    ("Datastore/instance/Memcached/%s/%s" % (MEMCACHED_HOST, MEMCACHED_PORT), 3),
 ]