Add AAD feature stats, fix incorrect counting of retry stats (#1093)

Author: lzchen

contrib/opencensus-ext-azure/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Fix statsbeats metric names
 ([#1089](https://github.com/census-instrumentation/opencensus-python/pull/1089))
+- Add AAD statsbeat feature, fix incorrect counting of retry
+([#1093](https://github.com/census-instrumentation/opencensus-python/pull/1093))
 
 ## 1.1.0
 Released 2021-10-05

contrib/opencensus-ext-azure/opencensus/ext/azure/common/transport.py

@@ -96,7 +96,7 @@ def _transmit(self, envelopes):
                 'Retrying due to transient client side error %s.', ex)
             if self._check_stats_collection():
                 with _requests_lock:
-                    _requests_map['exception'] = _requests_map.get('exception', 0) + 1  # noqa: E501
+                    _requests_map['retry'] = _requests_map.get('retry', 0) + 1  # noqa: E501
             # client side error (retryable)
             exception = self.options.minimum_retry_interval
         except CredentialUnavailableError as ex:

contrib/opencensus-ext-azure/opencensus/ext/azure/metrics_exporter/statsbeat_metrics/statsbeat.py

@@ -63,7 +63,7 @@ class _FEATURE_TYPES:
 class _StatsbeatFeature:
     NONE = 0
     DISK_RETRY = 1
-    AAD_HANDLING = 2
+    AAD = 2
 
 
 def _get_stats_connection_string():
@@ -191,6 +191,8 @@ def __init__(self, options):
         self._feature = _StatsbeatFeature.NONE
         if options.enable_local_storage:
             self._feature |= _StatsbeatFeature.DISK_RETRY
+        if options.credential:
+            self._feature |= _StatsbeatFeature.AAD
         self._stats_lock = threading.Lock()
         self._vm_data = {}
         self._vm_retry = True

contrib/opencensus-ext-azure/tests/test_azure_statsbeat_metrics.py

@@ -52,6 +52,7 @@
     instrumentation_key="ikey",
     enable_local_storage=True,
     endpoint="test-endpoint",
+    credential=None,
 )
 
 
@@ -61,6 +62,11 @@ def __init__(self, status_code, text):
         self.text = text
 
 
+class MockCredential(object):
+    def get_token():
+        pass
+
+
 def throw(exc_type, *args, **kwargs):
     def func(*_args, **_kwargs):
         raise exc_type(*args, **kwargs)
@@ -320,6 +326,28 @@ def test_get_feature_metric(self):
         self.assertEqual(
             properties[8].value, ext_version)  # noqa: E501
 
+    def test_get_feature_metric_wtih_aad(self):
+        aad_options = Options(
+            instrumentation_key="ikey",
+            enable_local_storage=True,
+            endpoint="test-endpoint",
+            credential=MockCredential(),
+        )
+        stats = _StatsbeatMetrics(aad_options)
+        metric = stats._get_feature_metric()
+        properties = metric._time_series[0]._label_values
+        self.assertEqual(len(properties), 9)
+        self.assertEqual(properties[0].value, _RP_NAMES[3])
+        self.assertEqual(properties[1].value, "sdk")
+        self.assertEqual(properties[2].value, "ikey")
+        self.assertEqual(properties[3].value, platform.python_version())
+        self.assertEqual(properties[4].value, _FEATURE_TYPES.FEATURE)
+        self.assertEqual(properties[5].value, 3)
+        self.assertEqual(properties[6].value, platform.system())
+        self.assertEqual(properties[7].value, "python")
+        self.assertEqual(
+            properties[8].value, ext_version)  # noqa: E501
+
     def test_get_instrumentation_metric(self):
         original_integrations = integrations._INTEGRATIONS_BIT_MASK
         integrations._INTEGRATIONS_BIT_MASK = 1024