Add telemetry data for usage of deployment web instances/memory/disk/log_rate (#4454)

* Add telemetry data for usage of deployment web instances/memory/disk/log_rate

* Add telemetry data for usage of deployment web

Fix rollback telemetry additions

* Add telemetry data for usage of deployment web

Fix Rubocop errors

* Add telemetry data for usage of deployment web

Update spec

* Add telemetry data for usage of deployment

Update to kick off the build

Author: nookala

app/actions/deployment_create.rb

@@ -25,7 +25,7 @@ def create(app:, user_audit_info:, message:)
 
           if target_state.rollback_target_revision
             revision = RevisionResolver.rollback_app_revision(app, target_state.rollback_target_revision, user_audit_info)
-            log_rollback_event(app.guid, user_audit_info.user_guid, target_state.rollback_target_revision.guid, message.strategy, message.max_in_flight, message.canary_steps)
+            log_rollback_event(app.guid, user_audit_info.user_guid, target_state.rollback_target_revision.guid, message)
           else
             revision = RevisionResolver.update_app_revision(app, user_audit_info)
           end
@@ -270,7 +270,7 @@ def starting_process_instances(deployment, desired_instances)
         [deployment.max_in_flight, starting_process_count].min
       end
 
-      def log_rollback_event(app_guid, user_id, revision_id, strategy, max_in_flight, canary_steps)
+      def log_rollback_event(app_guid, user_id, revision_id, message)
         TelemetryLogger.v3_emit(
           'rolled-back-app',
           {
@@ -279,9 +279,13 @@ def log_rollback_event(app_guid, user_id, revision_id, strategy, max_in_flight,
             'revision-id' => revision_id
           },
           {
-            'strategy' => strategy,
-            'max-in-flight' => max_in_flight,
-            'canary-steps' => canary_steps
+            'strategy' => message.strategy,
+            'max-in-flight' => message.max_in_flight,
+            'canary-steps' => message.canary_steps,
+            'instances' => message.web_instances,
+            'memory' => message.memory_in_mb,
+            'disk' => message.disk_in_mb,
+            'log-rate' => message.log_rate_limit_in_bytes_per_second
           }
         )
       end

app/controllers/v3/deployments_controller.rb

@@ -61,7 +61,11 @@ def create
         {
           'strategy' => deployment.strategy,
           'max-in-flight' => deployment.max_in_flight,
-          'canary-steps' => deployment.canary_steps
+          'canary-steps' => deployment.canary_steps,
+          'instances' => deployment.web_instances,
+          'memory' => deployment.memory_in_mb,
+          'disk' => deployment.disk_in_mb,
+          'log-rate' => deployment.log_rate_limit_in_bytes_per_second
         }
       )
     rescue DeploymentCreate::Error => e

spec/request/deployments_spec.rb

@@ -582,6 +582,10 @@
           strategy: 'canary',
           options: {
             max_in_flight: 10,
+            web_instances: 5,
+            memory_in_mb: 1024,
+            disk_in_mb: 1024,
+            log_rate_limit_in_bytes_per_second: -1,
             canary: {
               steps: [{ instance_weight: 1 }, { instance_weight: 2 }]
             }
@@ -603,6 +607,10 @@
           strategy: 'canary',
           options: {
             max_in_flight: 10,
+            web_instances: 6,
+            memory_in_mb: 1024,
+            disk_in_mb: 1024,
+            log_rate_limit_in_bytes_per_second: -1,
             canary: {
               steps: [{ instance_weight: 1 }, { instance_weight: 2 }]
             }
@@ -627,6 +635,10 @@
               'strategy' => 'canary',
               'max-in-flight' => 10,
               'canary-steps' => [{ 'instance_weight' => 1 }, { 'instance_weight' => 2 }],
+              'instances' => 5,
+              'memory' => 1024,
+              'disk' => 1024,
+              'log-rate' => -1,
               'app-id' => OpenSSL::Digest::SHA256.hexdigest(app_model.guid),
               'user-id' => OpenSSL::Digest::SHA256.hexdigest(user.guid)
             }
@@ -649,6 +661,10 @@
               'strategy' => 'canary',
               'max-in-flight' => 10,
               'canary-steps' => [{ 'instance_weight' => 1 }, { 'instance_weight' => 2 }],
+              'instances' => 6,
+              'memory' => 1024,
+              'disk' => 1024,
+              'log-rate' => -1,
               'app-id' => OpenSSL::Digest::SHA256.hexdigest(app_model.guid),
               'user-id' => OpenSSL::Digest::SHA256.hexdigest(user.guid),
               'revision-id' => OpenSSL::Digest::SHA256.hexdigest(revision.guid)