adding clusterfuzz version label

Signed-off-by: Javan lacerda <javanlacerda@google.com>

Author: javanlacerda

src/clusterfuzz/_internal/metrics/monitoring_metrics.py

@@ -397,5 +397,6 @@
         monitor.StringField('release'),
         monitor.BooleanField('deploy_zip'),
         monitor.BooleanField('deploy_app_engine'),
-        monitor.BooleanField('deploy_kubernetes')
+        monitor.BooleanField('deploy_kubernetes'),
+        monitor.StringField('clusterfuzz_version')
     ])

src/local/butler/deploy.py

@@ -22,6 +22,7 @@
 import sys
 import tempfile
 import time
+from typing import Any
 
 import pytz
 
@@ -31,9 +32,8 @@
 from local.butler import package
 from src.clusterfuzz._internal.base import utils
 from src.clusterfuzz._internal.config import local_config
+from src.clusterfuzz._internal.metrics import monitoring_metrics
 from src.clusterfuzz._internal.system import environment
-from clusterfuzz._internal.metrics import monitoring_metrics
-from typing import Any, Dict
 
 EXPECTED_BOT_COUNT_PERCENT = 0.8
 
@@ -91,6 +91,7 @@ def _additional_app_env_vars(project):
       'REDIS_HOST': _get_redis_ip(project),
   }
 
+
 # TODO: Add structured log
 def _deploy_app_prod(project,
                      deployment_bucket,
@@ -113,20 +114,22 @@ def _deploy_app_prod(project,
 
     for service in services:
       _delete_old_versions(project, service, VERSION_DELETE_WINDOW_MINUTES)
-  releases = [release]
-  releases += constants.ADDITIONAL_RELEASES if release == 'prod' else []
+
   if package_zip_paths:
     for package_zip_path in package_zip_paths:
       _deploy_zip(
           deployment_bucket, package_zip_path, test_deployment=test_deployment)
 
+    releases = [release]
+    releases += constants.ADDITIONAL_RELEASES if release == 'prod' else []
     for rel in releases:
-        _deploy_manifest(
+      _deploy_manifest(
           deployment_bucket,
           constants.PACKAGE_TARGET_MANIFEST_PATH,
           test_deployment=test_deployment,
           release=rel)
 
+
 def _deploy_app_staging(project, yaml_paths):
   """Deploy app in staging."""
   services = _get_services(yaml_paths)
@@ -431,11 +434,12 @@ def _prod_deployment_helper(config_dir,
       'deploy_app_engine': deploy_appengine,
       'deploy_kubernetes': deploy_k8s,
       'success': True,
-      'release': release
-    }
-  
+      'release': release,
+      'clusterfuzz_version': utils.current_source_version()
+  }
+
   try:
-    deployments_success = _deploy_app_prod(
+    _deploy_app_prod(
         project,
         deployment_bucket,
         yaml_paths,
@@ -451,15 +455,16 @@ def _prod_deployment_helper(config_dir,
     if deploy_k8s:
       _deploy_terraform(config_dir)
       _deploy_k8s(config_dir)
-    
-    print(f'Production deployment finished. {labels}, {deployments_success}')
+
+    print(f'Production deployment finished. {labels}')
     labels.update({'success': True})
     monitoring_metrics.PRODUCTION_DEPLOYMENT.increment(labels)
   except Exception as ex:
     labels.update({'success': False})
     monitoring_metrics.PRODUCTION_DEPLOYMENT.increment(labels)
     raise ex
 
+
 def _deploy_terraform(config_dir):
   """Deploys GKE cluster via terraform."""
   terraform_dir = os.path.join(config_dir, 'terraform')