modifications to app insights query

Author: khushishah513

src/containerapp/azext_containerapp/_validators.py

@@ -318,7 +318,7 @@ def validate_revision_and_get_name(cmd, resource_group_name, container_app_name,
         if not provided_revision_name:
             logger.debug("No revision name provided for multiple revision mode container app")
             raise ValidationError("Revision name is required when active revision mode is not 'single'.")
-        return provided_revision_name
+        return provided_revision_name, active_revision_mode
     if not provided_revision_name:
         logger.debug("No revision name provided - attempting to determine latest revision")
         revision_name = safe_get(containerapp_def, "properties", "latestRevisionName")
@@ -331,9 +331,9 @@ def validate_revision_and_get_name(cmd, resource_group_name, container_app_name,
         if not revision_name or revision_name is None:
             logger.debug("Could not determine any revision name from container app properties")
             raise ValidationError("Could not determine the latest revision name. Please provide --revision.")
-        return revision_name
+        return revision_name, active_revision_mode
     logger.debug("Using provided revision name: '%s'", provided_revision_name)
-    return provided_revision_name
+    return provided_revision_name, active_revision_mode
 
 
 def validate_functionapp_kind(cmd, resource_group_name, container_app_name):

src/containerapp/azext_containerapp/containerapp_function_keys_decorator.py

@@ -58,7 +58,7 @@ def validate_common_arguments(self):
         )
 
         # Validate revision and get the appropriate revision name
-        revision_name = validate_revision_and_get_name(
+        revision_name, _ = validate_revision_and_get_name(
             cmd=self.cmd,
             resource_group_name=resource_group_name,
             container_app_name=name,

src/containerapp/azext_containerapp/containerapp_functions_decorator.py

@@ -73,7 +73,7 @@ def validate_common_arguments(self):
         )
 
         # Validate revision and get the appropriate revision name
-        revision_name = validate_revision_and_get_name(
+        revision_name, _ = validate_revision_and_get_name(
             cmd=self.cmd,
             resource_group_name=resource_group_name,
             container_app_name=name,
@@ -186,23 +186,17 @@ def validate_arguments(self):
         )
 
         revision_name = self.get_argument_revision_name()
-        revision_name = validate_revision_and_get_name(
+        revision_name, active_revision_mode = validate_revision_and_get_name(
             cmd=self.cmd,
             resource_group_name=self.get_argument_resource_group_name(),
             container_app_name=self.get_argument_container_app_name(),
             provided_revision_name=revision_name
         )
 
-        min_replicas = get_min_replicas_from_revision(
-            cmd=self.cmd,
-            resource_group_name=self.get_argument_resource_group_name(),
-            container_app_name=self.get_argument_container_app_name(),
-            revision_name=revision_name
-        )
-        if min_replicas is not None and min_replicas == 0:
-            raise CLIError(f"The revision '{revision_name}' has minimum replicas set to 0. Ensure that there is at least one replica to fetch invocation details. To update minimum replica: Run 'az containerapp update --name {self.get_argument_container_app_name()} --resource-group {self.get_argument_resource_group_name()} --min-replica 1'")
         # Update the revision name with the validated value
         self.set_argument_revision_name(revision_name)
+        # Store active revision mode for use in query building
+        self.active_revision_mode = active_revision_mode
         self.validate_function_name_requirement()
 
     def _get_app_insights_id(self, resource_group_name, container_app_name, revision_name):
@@ -277,15 +271,24 @@ def get_summary(self):
             # Fetch the app insights resource app id
             app_id = self._get_app_insights_id(resource_group_name, container_app_name, revision_name)
 
-            # Use application insights query to get function invocations summary
-            invocation_summary_query = (
-                f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
-                f"| where timestamp >= ago({timespan}) "
-                f"| where cloud_RoleName =~ '{container_app_name}' "
-                f"| where cloud_RoleInstance contains '{revision_name}' "
-                f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
-                f"| summarize SuccessCount = coalesce(countif(success == true), 0), ErrorCount = coalesce(countif(success == false), 0)"
-            )
+            # Build query based on active revision mode
+            if self.active_revision_mode.lower() == "single":
+                invocation_summary_query = (
+                    f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
+                    f"| where timestamp >= ago({timespan}) "
+                    f"| where cloud_RoleName =~ '{container_app_name}' "
+                    f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
+                    f"| summarize SuccessCount = coalesce(countif(success == true), 0), ErrorCount = coalesce(countif(success == false), 0)"
+                )
+            else:
+                invocation_summary_query = (
+                    f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
+                    f"| where timestamp >= ago({timespan}) "
+                    f"| where cloud_RoleName =~ '{container_app_name}' "
+                    f"| where cloud_RoleInstance contains '{revision_name}' "
+                    f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
+                    f"| summarize SuccessCount = coalesce(countif(success == true), 0), ErrorCount = coalesce(countif(success == false), 0)"
+                )
 
             result = self._execute_app_insights_query(app_id, invocation_summary_query, "getLast30DaySummary")
 
@@ -309,18 +312,30 @@ def get_traces(self):
             # Fetch the app insights resource app id
             app_id = self._get_app_insights_id(resource_group_name, container_app_name, revision_name)
 
-            # Use application insights query to get function invocations traces
-            invocation_traces_query = (
-                f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
-                f"| project timestamp, id, operation_Name, success, resultCode, duration, operation_Id, functionNameFromCustomDimension, "
-                f"cloud_RoleName, cloud_RoleInstance, invocationId=coalesce(tostring(customDimensions['InvocationId']), tostring(customDimensions['faas.invocation_id'])) "
-                f"| where timestamp > ago({timespan}) "
-                f"| where cloud_RoleName =~ '{container_app_name}' "
-                f"| where cloud_RoleInstance contains '{revision_name}' "
-                f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
-                f"| order by timestamp desc | take {limit} "
-                f"| project timestamp, success, resultCode, durationInMilliSeconds=duration, invocationId, operationId=operation_Id, operationName=operation_Name, functionNameFromCustomDimension "
-            )
+            # Build query based on active revision mode
+            if self.active_revision_mode.lower() == "single":
+                invocation_traces_query = (
+                    f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
+                    f"| project timestamp, id, operation_Name, success, resultCode, duration, operation_Id, functionNameFromCustomDimension, "
+                    f"cloud_RoleName, cloud_RoleInstance, invocationId=coalesce(tostring(customDimensions['InvocationId']), tostring(customDimensions['faas.invocation_id'])) "
+                    f"| where timestamp > ago({timespan}) "
+                    f"| where cloud_RoleName =~ '{container_app_name}' "
+                    f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
+                    f"| order by timestamp desc | take {limit} "
+                    f"| project timestamp, success, resultCode, durationInMilliSeconds=duration, invocationId, operationId=operation_Id, operationName=operation_Name, functionNameFromCustomDimension "
+                )
+            else:
+                invocation_traces_query = (
+                    f"requests | extend functionNameFromCustomDimension = tostring(customDimensions['faas.name']) "
+                    f"| project timestamp, id, operation_Name, success, resultCode, duration, operation_Id, functionNameFromCustomDimension, "
+                    f"cloud_RoleName, cloud_RoleInstance, invocationId=coalesce(tostring(customDimensions['InvocationId']), tostring(customDimensions['faas.invocation_id'])) "
+                    f"| where timestamp > ago({timespan}) "
+                    f"| where cloud_RoleName =~ '{container_app_name}' "
+                    f"| where cloud_RoleInstance contains '{revision_name}' "
+                    f"| where operation_Name =~ '{function_name}' or functionNameFromCustomDimension =~ '{function_name}' "
+                    f"| order by timestamp desc | take {limit} "
+                    f"| project timestamp, success, resultCode, durationInMilliSeconds=duration, invocationId, operationId=operation_Id, operationName=operation_Name, functionNameFromCustomDimension "
+                )
 
             result = self._execute_app_insights_query(app_id, invocation_traces_query, "getInvocationTraces")