Update category for telemetry model and shape used in deployment and finetune.

Author: liudmylaru

ads/aqua/deployment.py

@@ -396,34 +396,24 @@ def create(
             self.telemetry.record_event_async(
                 category="aqua/custom/deployment", action="create", detail=model_name
             )
-            # tracks the shape used for deploying the custom models
-            self.telemetry.record_event_async(
-                category="aqua/custom/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
             # tracks the shape used for deploying the custom models by name
             self.telemetry.record_event_async(
-                category=f"aqua/custom/{model_name}/deployment/create",
+                category=f"aqua/custom/deployment/create",
                 action="shape",
                 detail=instance_shape,
+                value=model_name
             )
         else:
             # tracks unique deployments that were created in the user compartment
             self.telemetry.record_event_async(
                 category="aqua/service/deployment", action="create", detail=model_name
             )
-            # tracks the shape used for deploying the service models
-            self.telemetry.record_event_async(
-                category="aqua/service/deployment/create",
-                action="shape",
-                detail=instance_shape,
-            )
             # tracks the shape used for deploying the service models by name
             self.telemetry.record_event_async(
-                category=f"aqua/service/{model_name}/deployment/create",
+                category="aqua/service/deployment/create",
                 action="shape",
                 detail=instance_shape,
+                value=model_name
             )
 
         return AquaDeployment.from_oci_model_deployment(

ads/aqua/finetune.py

@@ -461,8 +461,10 @@ def create(
             {"ocid": ft_job.id[-6:]} if ft_job and len(ft_job.id) > 6 else {}
         )
         self.telemetry.record_event_async(
-            category=f"aqua/service/{source.display_name}/finetune/create/shape/",
-            action=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
+            category="aqua/service/finetune/create",
+            action="shape",
+            detail=f"{create_fine_tuning_details.shape_name}x{create_fine_tuning_details.replica}",
+            value=source.display_name,
             **telemetry_kwargs,
         )
         # tracks unique fine-tuned models that were created in the user compartment