diff --git a/oslo_metrics/metrics/oslo_messaging.py b/oslo_metrics/metrics/oslo_messaging.py
index 22f9f54478af423d2c5fc86d6eb692c67871b1b9..5b575819457b482b154cea0923a945f7345d98a8 100644
--- a/oslo_metrics/metrics/oslo_messaging.py
+++ b/oslo_metrics/metrics/oslo_messaging.py
@@ -21,7 +21,7 @@ rpc_server_common_labels = [
 ]
 rpc_client_common_labels = [
     'call_type', 'exchange', 'topic', 'namespace', 'version',
-    'server', 'fanout', 'process'
+    'server', 'fanout', 'process', 'method', 'timeout'
 ]
 
 rpc_processing_seconds_buckets = [
diff --git a/oslo_metrics/tests/test_message_process.py b/oslo_metrics/tests/test_message_process.py
index c25aebe9b97da4d1ded06e01df325d81a606cda6..4c49203bdc3ece52c9d719df6c65b7e1e1f741e3 100644
--- a/oslo_metrics/tests/test_message_process.py
+++ b/oslo_metrics/tests/test_message_process.py
@@ -69,11 +69,13 @@ class TestProcessMessage(base.BaseTestCase):
     "call_type": "call",
     "exchange": "foo",
     "topic": "bar",
+    "method": "get",
     "server": "foobar",
     "namespace": "ns",
     "version": "v2",
     "process": "done",
-    "fanout": "foo"
+    "fanout": "foo",
+    "timeout": 10
   }
 }""".encode()