commit b6bb5f88d864b0830f5b8d8f7fa2a6540b15a22f
author Allen Li <ayatane@chromium.org> Mon Aug 21 15:11:57 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Aug 21 19:53:02 2017 -0700
tree 5fa44762fa7e5aeaeb442cab586bf8ee9a5d74cd
parent 63ed561828a358076c55065a43fc91cac1ec4a13

sysmon: Add FQDN metric

Useful for debugging metrics getting emitted from unknown sources.

BUG=chromium:757494
TEST=None

Change-Id: If260ea32f7fe5bbe990610c1905f080040489235
Reviewed-on: https://chromium-review.googlesource.com/624457
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>

scripts/sysmon/net_metrics_unittest.py

diff --git a/scripts/sysmon/net_metrics_unittest.py b/scripts/sysmon/net_metrics_unittest.py
index a923459..08a0918 100644
--- a/scripts/sysmon/net_metrics_unittest.py
+++ b/scripts/sysmon/net_metrics_unittest.py
@@ -33,7 +33,8 @@
   def test_collect(self):
     with mock.patch('psutil.net_io_counters', autospec=True) \
              as net_io_counters, \
-         mock.patch('psutil.net_if_stats', autospec=True) as net_if_stats:
+         mock.patch('psutil.net_if_stats', autospec=True) as net_if_stats, \
+         mock.patch('socket.getfqdn', autospec=True) as getfqdn:
       net_io_counters.return_value = {
           'lo': snetio(
               bytes_sent=17247495681, bytes_recv=172474956,
@@ -43,6 +44,7 @@
       net_if_stats.return_value = {
           'lo': snicstats(isup=True, duplex=0, speed=0, mtu=65536),
       }
+      getfqdn.return_value = 'foo.example.com'
       net_metrics.collect_net_info()
 
     setter = self.store.set
@@ -71,6 +73,8 @@
                   0, enforce_ge=mock.ANY),
         mock.call('dev/net/mtu', ('lo',), None,
                   65536, enforce_ge=mock.ANY),
+        mock.call('net/fqdn', (), None,
+                  'foo.example.com', enforce_ge=mock.ANY),
     ]
     setter.assert_has_calls(calls)
     self.assertEqual(len(setter.mock_calls), len(calls))