fix: Merging dev changes to main branch (#773)

* feat: Implementation of Configurable Logging Control via Flag (#756)

* Implementation of Configurable Logging Control via Flag

* bicep updated

* updated bicep

* updated custom bicep

* Fix typo in CustomizingAzdParameters.md (#772)

* Update src/App/app.py

fixed blank string issue

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Prajwal-Microsoft <[email protected]>
Co-authored-by: Thanusree-Microsoft <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 4 people

docs/CustomizingAzdParameters.md

@@ -3,7 +3,7 @@
 By default this template will use the environment name as the prefix to prevent naming collisions within Azure. The parameters below show the default values. You only need to run the statements below if you need to change the values. 
 
 
-> To override any of the parameters, run `azd env set <PARAMETER_NAME> <VALUE>` before running `azd up`. On the first azd command, it will prompt you for the environment name. Be sure to choose 3-20 charaters alphanumeric unique name. 
+> To override any of the parameters, run `azd env set <PARAMETER_NAME> <VALUE>` before running `azd up`. On the first azd command, it will prompt you for the environment name. Be sure to choose 3-20 characters alphanumeric unique name. 
 
 ## Parameters
 

infra/main.bicep

@@ -1122,6 +1122,9 @@ module webSite 'modules/web-sites.bicep' = {
           AZURE_SEARCH_STRICTNESS: azureSearchStrictness
           AZURE_OPENAI_EMBEDDING_NAME: embeddingModel
           AZURE_OPENAI_EMBEDDING_ENDPOINT : aiFoundryAiServices.outputs.endpoint
+          AZURE_BASIC_LOGGING_LEVEL: 'INFO'
+          AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
+          AZURE_LOGGING_PACKAGES: ''
           SQLDB_SERVER: sqlServerFqdn
           SQLDB_DATABASE: sqlDbName
           USE_INTERNAL_STREAM: useInternalStream

infra/main.json

@@ -1126,6 +1126,9 @@ module webSite 'modules/web-sites.bicep' = {
           AZURE_SEARCH_STRICTNESS: azureSearchStrictness
           AZURE_OPENAI_EMBEDDING_NAME: embeddingModel
           AZURE_OPENAI_EMBEDDING_ENDPOINT : aiFoundryAiServices.outputs.endpoint
+          AZURE_BASIC_LOGGING_LEVEL: 'INFO'
+          AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
+          AZURE_LOGGING_PACKAGES: ''
           SQLDB_SERVER: sqlServerFqdn
           SQLDB_DATABASE: sqlDbName
           USE_INTERNAL_STREAM: useInternalStream

infra/main_custom.bicep

@@ -12,6 +12,11 @@ AZURE_OPENAI_ENDPOINT=
 AZURE_OPENAI_EMBEDDING_NAME="text-embedding-ada-002"
 AZURE_OPENAI_EMBEDDING_ENDPOINT=
 
+# Logging settings
+AZURE_BASIC_LOGGING_LEVEL="INFO"
+AZURE_PACKAGE_LOGGING_LEVEL="WARNING"
+# AZURE_LOGGING_PACKAGES="azure.core.pipeline.policies.http_logging_policy,azure.identity.aio._internal,azure.monitor.opentelemetry.exporter.export._base"
+
 # User Interface
 UI_TITLE=
 UI_LOGO=

src/App/.env.sample

@@ -56,18 +56,23 @@
     )
 
 # Configure logging
-logging.basicConfig(level=logging.INFO)
+basic_level = getattr(
+    logging, config.AZURE_BASIC_LOGGING_LEVEL.upper(), logging.INFO
+)
+logging.basicConfig(level=basic_level)
 
-# Suppress INFO logs from 'azure.core.pipeline.policies.http_logging_policy'
-logging.getLogger("azure.core.pipeline.policies.http_logging_policy").setLevel(
-    logging.WARNING
+# Configure Azure package logging levels
+azure_packages_env = os.environ.get("AZURE_LOGGING_PACKAGES")
+azure_packages = (
+    [pkg.strip() for pkg in azure_packages_env.split(',') if pkg.strip()]
+    if azure_packages_env else []
 )
-logging.getLogger("azure.identity.aio._internal").setLevel(logging.WARNING)
 
-# Suppress info logs from OpenTelemetry exporter
-logging.getLogger("azure.monitor.opentelemetry.exporter.export._base").setLevel(
-    logging.WARNING
+package_level = getattr(
+    logging, config.AZURE_PACKAGE_LOGGING_LEVEL.upper(), logging.WARNING
 )
+for package in azure_packages:
+    logging.getLogger(package).setLevel(package_level)
 
 
 def create_app():

src/App/app.py

@@ -35,6 +35,14 @@ def __init__(self):
             "APPLICATIONINSIGHTS_CONNECTION_STRING"
         )
 
+        # Azure Logging Configuration
+        self.AZURE_BASIC_LOGGING_LEVEL = os.environ.get(
+            "AZURE_BASIC_LOGGING_LEVEL", "INFO"
+        )
+        self.AZURE_PACKAGE_LOGGING_LEVEL = os.environ.get(
+            "AZURE_PACKAGE_LOGGING_LEVEL", "WARNING"
+        )
+
         self.DEBUG = os.environ.get("DEBUG", "false")
 
         # Current minimum Azure OpenAI version supported