make it possible to include a user-id label in all requests. (#4)

Author: ruvr

watcher/watcher.py

@@ -65,9 +65,9 @@ def __init__(self, app, config, logger=logging.getLogger(__name__)):
         self.is_include_target_domain_id_in_metric = common.string_to_bool(
             self.wsgi_config.get('include_target_domain_id_in_metric', 'True')
         )
-        # whether to include the initiator user id for authentication request in the metrics
-        self.is_include_authentication_initiator_user_id_in_metric = common.string_to_bool(
-            self.wsgi_config.get('include_authentication_initiator_user_id_in_metric', 'True')
+        # whether to include the initiator user id in the metrics
+        self.is_include_initiator_user_id_in_metric = common.string_to_bool(
+            self.wsgi_config.get('include_initiator_user_id_in_metric', 'False')
         )
 
         config_file_path = config.get('config_file', None)
@@ -189,8 +189,8 @@ def __call__(self, environ, start_response):
                 "target_project_id:{0}".format(target_project_id)
             )
 
-        # if authentication request: include initiator user id
-        if cadf_action == taxonomy.ACTION_AUTHENTICATE and self.is_include_authentication_initiator_user_id_in_metric:
+        # include initiator user id
+        if self.is_include_initiator_user_id_in_metric:
             labels.append(
                 "initiator_user_id:{0}".format(initiator_user_id)
             )