Merge pull request #753 from microsoft/PSL-US-35960

feat: improve Application Insights logging and telemetry handling

Author: Roopan-Microsoft

.env.sample

@@ -113,3 +113,13 @@ WORKERS=4
 # Feature flags
 AUTH_ENABLED=false
 SANITIZE_ANSWER=false
+
+# =============================================================================
+# Logging Configuration
+# =============================================================================
+# Basic logging level (DEBUG, INFO, WARNING, ERROR)
+AZURE_BASIC_LOGGING_LEVEL=INFO
+# Logging level for Azure SDK and third-party packages (DEBUG, INFO, WARNING, ERROR)
+AZURE_PACKAGE_LOGGING_LEVEL=WARNING
+# Comma-separated list of Python logger names to apply package logging level to
+AZURE_LOGGING_PACKAGES=

infra/main.bicep

@@ -351,7 +351,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.7.1' = if (en
     disableIpMasking: false
     flowType: 'Bluefield'
     workspaceResourceId: logAnalyticsWorkspaceResourceId
-    diagnosticSettings: [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
   }
 }
 
@@ -887,6 +886,12 @@ module containerInstance 'modules/container-instance.bicep' = {
       { name: 'AZURE_AI_PROJECT_ENDPOINT', value: aiFoundryAiProjectEndpoint }
       { name: 'AZURE_AI_MODEL_DEPLOYMENT_NAME', value: gptModelName }
       { name: 'AZURE_AI_IMAGE_MODEL_DEPLOYMENT', value: imageModelConfig[imageModelChoice].name }
+      // Logging Settings
+      { name: 'AZURE_BASIC_LOGGING_LEVEL', value: 'INFO' }
+      { name: 'AZURE_PACKAGE_LOGGING_LEVEL', value: 'WARNING' }
+      { name: 'AZURE_LOGGING_PACKAGES', value: '' }
+      // Application Insights
+      { name: 'APPLICATIONINSIGHTS_CONNECTION_STRING', value: enableMonitoring ? applicationInsights!.outputs.connectionString : '' }
     ]
   }
 }

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.41.2.15936",
-      "templateHash": "7762801937040004596"
+      "templateHash": "14392918201193616164"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -3570,14 +3570,7 @@
           "flowType": {
             "value": "Bluefield"
           },
-          "workspaceResourceId": "[if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), if(parameters('enableMonitoring'), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value), createObject('value', '')))]",
-          "diagnosticSettings": {
-            "value": [
-              {
-                "workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), if(parameters('enableMonitoring'), reference('logAnalyticsWorkspace').outputs.resourceId.value, ''))]"
-              }
-            ]
-          }
+          "workspaceResourceId": "[if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), if(parameters('enableMonitoring'), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value), createObject('value', '')))]"
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -33165,6 +33158,22 @@
               {
                 "name": "AZURE_AI_IMAGE_MODEL_DEPLOYMENT",
                 "value": "[variables('imageModelConfig')[parameters('imageModelChoice')].name]"
+              },
+              {
+                "name": "AZURE_BASIC_LOGGING_LEVEL",
+                "value": "INFO"
+              },
+              {
+                "name": "AZURE_PACKAGE_LOGGING_LEVEL",
+                "value": "WARNING"
+              },
+              {
+                "name": "AZURE_LOGGING_PACKAGES",
+                "value": ""
+              },
+              {
+                "name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
+                "value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
               }
             ]
           }
@@ -33356,6 +33365,7 @@
       },
       "dependsOn": [
         "aiFoundryAiServicesProject",
+        "applicationInsights",
         "userAssignedIdentity",
         "virtualNetwork"
       ]