Remove dependencies/sec from performance counters for Azure (#922)

Author: lzchen

contrib/opencensus-ext-azure/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Remove dependency rate from standard metrics
+  ([#903](https://github.com/census-instrumentation/opencensus-python/pull/903))
+
 ## 1.0.3
 Released 2020-06-17
 

contrib/opencensus-ext-azure/README.rst

@@ -178,10 +178,10 @@ The **Azure Monitor Metrics Exporter** allows you to export metrics to `Azure Mo
     if __name__ == "__main__":
         main()
 
-Standard Metrics
-################
+Performance counters
+####################
 
-The exporter also includes a set of standard metrics that are exported to Azure Monitor by default.
+The exporter also includes a set of performance counters that are exported to Azure Monitor by default.
 
 .. code:: python
 
@@ -191,7 +191,7 @@ The exporter also includes a set of standard metrics that are exported to Azure
     from opencensus.ext.azure import metrics_exporter
 
     def main():
-        # All you need is the next line. You can disable standard metrics by
+        # All you need is the next line. You can disable performance counters by
         # passing in enable_standard_metrics=False into the constructor of
         # new_metrics_exporter() 
         _exporter = metrics_exporter.new_metrics_exporter(connection_string='InstrumentationKey=<your-instrumentation-key-here>')
@@ -205,13 +205,12 @@ The exporter also includes a set of standard metrics that are exported to Azure
     if __name__ == "__main__":
         main()
 
-Below is a list of standard metrics that are currently available:
+Below is a list of performance counters that are currently available:
 
 - Available Memory (bytes)
 - CPU Processor Time (percentage)
 - Incoming Request Rate (per second)
 - Incoming Request Average Execution Time (milliseconds)
-- Outgoing Request Rate (per second)
 - Process CPU Usage (percentage)
 - Process Private Bytes (bytes)
 

contrib/opencensus-ext-azure/opencensus/ext/azure/metrics_exporter/standard_metrics/__init__.py

@@ -15,9 +15,6 @@
 from opencensus.ext.azure.metrics_exporter.standard_metrics.cpu import (
     ProcessorTimeMetric,
 )
-from opencensus.ext.azure.metrics_exporter.standard_metrics.http_dependency import (  # noqa E501
-    DependencyRateMetric,
-)
 from opencensus.ext.azure.metrics_exporter.standard_metrics.http_requests import (  # noqa E501
     RequestsAvgExecutionMetric,
     RequestsRateMetric,
@@ -34,7 +31,6 @@
 
 # List of standard metrics to track
 STANDARD_METRICS = [AvailableMemoryMetric,
-                    DependencyRateMetric,
                     ProcessCPUMetric,
                     ProcessMemoryMetric,
                     ProcessorTimeMetric,

contrib/opencensus-ext-azure/opencensus/ext/azure/metrics_exporter/standard_metrics/http_dependency.py

@@ -20,7 +20,6 @@
 import requests
 
 from opencensus.ext.azure.metrics_exporter import standard_metrics
-from opencensus.trace import execution_context
 
 if sys.version_info < (3,):
     from BaseHTTPServer import HTTPServer
@@ -33,10 +32,8 @@
 
 class TestStandardMetrics(unittest.TestCase):
     def setUp(self):
-        standard_metrics.http_dependency.dependency_map.clear()
         standard_metrics.http_requests.requests_map.clear()
         requests.Session.request = ORIGINAL_FUNCTION
-        standard_metrics.http_dependency.ORIGINAL_REQUEST = ORIGINAL_FUNCTION
         standard_metrics.http_requests.ORIGINAL_CONSTRUCTOR = ORIGINAL_CONS
 
     @mock.patch('opencensus.ext.azure.metrics_exporter'
@@ -50,12 +47,12 @@ def test_producer_get_metrics(self):
         producer = standard_metrics.AzureStandardMetricsProducer()
         metrics = producer.get_metrics()
 
-        self.assertEqual(len(metrics), 7)
+        self.assertEqual(len(metrics), 6)
 
     def test_register_metrics(self):
         registry = standard_metrics.register_metrics()
 
-        self.assertEqual(len(registry.get_metrics()), 7)
+        self.assertEqual(len(registry.get_metrics()), 6)
 
     def test_get_available_memory_metric(self):
         metric = standard_metrics.AvailableMemoryMetric()
@@ -144,58 +141,6 @@ def test_get_process_cpu_usage_exception(self, logger_mock):
 
             logger_mock.exception.assert_called()
 
-    def test_dependency_patch(self):
-        map = standard_metrics.http_dependency.dependency_map
-        standard_metrics.http_dependency.ORIGINAL_REQUEST = lambda x: None
-        session = requests.Session()
-        execution_context.set_is_exporter(False)
-        result = standard_metrics.http_dependency.dependency_patch(session)
-
-        self.assertEqual(map['count'], 1)
-        self.assertIsNone(result)
-
-    def test_dependency_patch_exporter_thread(self):
-        map = standard_metrics.http_dependency.dependency_map
-        standard_metrics.http_dependency.ORIGINAL_REQUEST = lambda x: None
-        session = mock.Mock()
-        execution_context.set_is_exporter(True)
-        result = standard_metrics.http_dependency.dependency_patch(session)
-
-        self.assertIsNone(map.get('count'))
-        self.assertIsNone(result)
-
-    def test_get_dependency_rate_metric(self):
-        metric = standard_metrics.DependencyRateMetric()
-        gauge = metric()
-
-        self.assertEqual(gauge.descriptor.name,
-                         '\\ApplicationInsights\\Dependency Calls/Sec')
-
-    def test_get_dependency_rate_first_time(self):
-        rate = standard_metrics.DependencyRateMetric.get_value()
-
-        self.assertEqual(rate, 0)
-
-    @mock.patch('opencensus.ext.azure.metrics_exporter'
-                '.standard_metrics.http_dependency.time')
-    def test_get_dependency_rate(self, time_mock):
-        time_mock.time.return_value = 100
-        standard_metrics.http_dependency.dependency_map['last_time'] = 98
-        standard_metrics.http_dependency.dependency_map['count'] = 4
-        rate = standard_metrics.DependencyRateMetric.get_value()
-
-        self.assertEqual(rate, 2)
-
-    @mock.patch('opencensus.ext.azure.metrics_exporter'
-                '.standard_metrics.http_dependency.time')
-    def test_get_dependency_rate_error(self, time_mock):
-        time_mock.time.return_value = 100
-        standard_metrics.http_dependency.dependency_map['last_result'] = 5
-        standard_metrics.http_dependency.dependency_map['last_time'] = 100
-        result = standard_metrics.DependencyRateMetric.get_value()
-
-        self.assertEqual(result, 5)
-
     def test_request_patch(self):
         map = standard_metrics.http_requests.requests_map
         func = mock.Mock()