Add new cpu metrics to sampler. (#140)

Author: TimPansino

newrelic/samplers/cpu_usage.py

@@ -18,7 +18,6 @@
 """
 
 import os
-import time
 
 from newrelic.common.system_info import logical_processor_count
 from newrelic.common.stopwatch import start_timer
@@ -48,14 +47,25 @@ def __call__(self):
             return
 
         new_times = os.times()
+        elapsed_time = self._timer.restart_timer()
+        elapsed_cpu_time = elapsed_time*logical_processor_count()
+
         user_time = new_times[0] - self._times[0]
+        user_utilization = user_time / elapsed_cpu_time
 
-        elapsed_time = self._timer.restart_timer()
-        utilization = user_time / (elapsed_time*logical_processor_count())
+        system_time = new_times[1] - self._times[1]
+        system_utilization = system_time / elapsed_cpu_time
+
+        total_time = sum(new_times[0:4]) - sum(self._times[0:4])
+        total_utilization = total_time / elapsed_cpu_time
 
         self._times = new_times
 
         yield ('CPU/User Time', user_time)
-        yield ('CPU/User/Utilization', utilization)
+        yield ('CPU/User/Utilization', user_utilization)
+        yield ('CPU/System Time', system_time)
+        yield ('CPU/System/Utilization', system_utilization)
+        yield ('CPU/Total Time', total_time)
+        yield ('CPU/Total/Utilization', total_utilization)
 
 cpu_usage_data_source = _CPUUsageDataSource

tests/agent_unittests/test_cpu_sampler.py

@@ -0,0 +1,41 @@
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+from newrelic.samplers.cpu_usage import cpu_usage_data_source
+
+
+@pytest.fixture
+def data_source():
+    sampler = cpu_usage_data_source(settings=())["factory"](environ=())
+    sampler.start()
+    yield sampler
+    sampler.stop()
+
+
+EXPECTED_METRICS = (
+    "CPU/User Time",
+    "CPU/User/Utilization",
+    "CPU/System Time",
+    "CPU/System/Utilization",
+    "CPU/Total Time",
+    "CPU/Total/Utilization",
+)
+
+
+def test_cpu_metrics_collection(data_source):
+    metrics_table = set(m[0] for m in (data_source() or ()))
+
+    for metric in EXPECTED_METRICS:
+        assert metric in metrics_table