Add new_metric method to newrelic provider

Author: Clivern

README.md

@@ -30,6 +30,8 @@ new_relic.get_app(12345)
 new_relic.get_metrics(12345)
 # Get Metrics list with a filter (Apdex)
 new_relic.get_metrics(12345, "Apdex")
+# Get Metric Values from 2019-02-01T01:00:00+00:00 to 2019-02-14T11:03:20+00:00
+new_relic.get_metric(244202213, ["WebTransaction"], ["average_response_time"], "2019-02-01T01:00:00+00:00", "2019-02-14T11:03:20+00:00", False)
 ```
 
 Misc

pyumetric/provider/newrelic.py

@@ -33,7 +33,7 @@ def get_apps(self):
             else:
                 raise NewRelicApiException("Error, Invalid status code %d" % (request.status_code))
         except Exception as e:
-            raise NewRelicApiException(e)
+            raise NewRelicApiException(str(e))
 
     def get_app(self, app_id):
 
@@ -51,16 +51,16 @@ def get_app(self, app_id):
             else:
                 raise NewRelicApiException("Error, Invalid status code %d" % (request.status_code))
         except Exception as e:
-            raise NewRelicApiException(e)
+            raise NewRelicApiException(str(e))
 
-    def get_metrics(self, app_id, metric_name=None):
+    def get_metrics(self, app_id, name=None):
 
         if app_id is None or app_id == "":
             raise NewRelicInvalidParameterException("NewRelic application id is required!")
 
-        data = ''
-        if metric_name is not None and metric_name.strip() != "":
-            data = "name=%s" % (metric_name)
+        data = {}
+        if name is not None and name.strip() != "":
+            data["name"] = name
 
         try:
             request = requests.get(
@@ -73,17 +73,52 @@ def get_metrics(self, app_id, metric_name=None):
             else:
                 raise NewRelicApiException("Error, Invalid status code %d" % (request.status_code))
         except Exception as e:
-            raise NewRelicApiException(e)
+            raise NewRelicApiException(str(e))
 
-    def get_metric(self, app_id, metric_name):
+    def get_metric(self, app_id, names=[], values=[], start=None, end=None, summarize=False):
 
         if app_id is None or app_id == "":
             raise NewRelicInvalidParameterException("NewRelic application id is required!")
 
-        if metric_name is None or metric_name == "":
-            raise NewRelicInvalidParameterException("NewRelic metric name is required!")
+        if len(names) == 0:
+            raise NewRelicInvalidParameterException("NewRelic application metric name(s) is required!")
 
-        raise NotImplementedError("NewRelic get_metric method not implemented yet!")
+        if len(values) == 0:
+            raise NewRelicInvalidParameterException("NewRelic application metric value(s) is required!")
+
+        data = {}
+        data["names[]"] = []
+        data["values[]"] = []
+
+        for name in names:
+            data["names[]"].append(name)
+
+        for value in values:
+            data["values[]"].append(value)
+
+        if start is not None:
+            data["from"] = start
+
+        if end is not None:
+            data["to"] = end
+
+        if summarize:
+            data["summarize"] = "true"
+        else:
+            data["summarize"] = "false"
+
+        try:
+            request = requests.get(
+                self.__metric_info_endpoint.format(url=self.__api_url, version=self.__api_version, app_id=app_id),
+                headers=self.get_headers(),
+                data=data
+            )
+            if request.status_code == 200:
+                return request
+            else:
+                raise NewRelicApiException("Error, Invalid status code %d" % (request.status_code))
+        except Exception as e:
+            raise NewRelicApiException(str(e))
 
     def get_headers(self):
         if self.api_key.strip() == "":

tests/unit/provider/test_newrelic.py

@@ -58,13 +58,21 @@ def test_get_metrics_error(self, mock_get):
         self.assertRaises(NewRelicApiException, lambda: nr.get_metrics(456))
         self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metrics(""))
 
+    @patch('requests.get')
+    def test_get_metric_with_name_value(self, mock_get):
+        mock_get.return_value.status_code = 200
+        nr = NewRelic_Provider("123")
+        response = nr.get_metric(456, ["WebTransaction"], ["average_response_time"], "2019-02-01T01:00:00+00:00", "2019-02-14T11:03:20+00:00", True)
+        self.assertEqual(response.status_code, 200)
+
     @patch('requests.get')
     def test_get_metric_error(self, mock_get):
         mock_get.return_value.status_code = 500
         nr = NewRelic_Provider("123")
-        self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metric("", ""))
-        self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metric(456, ""))
-        self.assertRaises(NotImplementedError, lambda: nr.get_metric(456, "Apdex"))
+        self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metric("", ["WebTransaction"], ["average_response_time"]))
+        self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metric(456, [], ["average_response_time"]))
+        self.assertRaises(NewRelicInvalidParameterException, lambda: nr.get_metric(456, ["WebTransaction"], []))
+        self.assertRaises(NewRelicApiException, lambda: nr.get_metric(456, ["WebTransaction"], ["average_response_time"]))
 
     def test_get_headers(self):
         nr = NewRelic_Provider("123")