From 8def219afd0b1a81017e0330990cc63c81260f82 Mon Sep 17 00:00:00 2001 From: Prashant-Microsoft Date: Tue, 25 Feb 2025 11:17:26 +0530 Subject: [PATCH] fix: updated variable name --- README.md | 4 ++-- deploy/macae-continer-oc.json | 4 ++-- deploy/macae-continer.bicep | 2 +- src/backend/.env.sample | 2 +- src/backend/app.py | 2 +- src/backend/event_utils.py | 2 +- src/backend/tests/agents/test_human.py | 4 ++-- src/backend/tests/test_app.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c84c56a7a..3da325ea8 100644 --- a/README.md +++ b/README.md @@ -177,8 +177,8 @@ To add your newly created backend image: name: 'FRONTEND_SITE_NAME' value: 'https://.azurewebsites.net' - name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY' - value: + name: 'APPLICATIONINSIGHTS_CONNECTION_STRING' + value: - Click 'Save' and deploy your new revision diff --git a/deploy/macae-continer-oc.json b/deploy/macae-continer-oc.json index f394cd911..2efe86533 100644 --- a/deploy/macae-continer-oc.json +++ b/deploy/macae-continer-oc.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.32.4.45862", - "templateHash": "13282901028774763433" + "templateHash": "14272651486454797588" } }, "parameters": { @@ -368,7 +368,7 @@ "value": "[format('https://{0}.azurewebsites.net', format(variables('uniqueNameFormat'), 'frontend'))]" }, { - "name": "APPLICATIONINSIGHTS_INSTRUMENTATION_KEY", + "name": "APPLICATIONINSIGHTS_CONNECTION_STRING", "value": "[reference('appInsights').ConnectionString]" } ] diff --git a/deploy/macae-continer.bicep b/deploy/macae-continer.bicep index 965b111d8..35ba347fb 100644 --- a/deploy/macae-continer.bicep +++ b/deploy/macae-continer.bicep @@ -280,7 +280,7 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = { value: 'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net' } { - name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY' + name: 'APPLICATIONINSIGHTS_CONNECTION_STRING' value: appInsights.properties.ConnectionString } ] diff --git a/src/backend/.env.sample b/src/backend/.env.sample index 64102ab7b..e92f73468 100644 --- a/src/backend/.env.sample +++ b/src/backend/.env.sample @@ -6,7 +6,7 @@ AZURE_OPENAI_ENDPOINT= AZURE_OPENAI_MODEL_NAME=gpt-4o AZURE_OPENAI_DEPLOYMENT_NAME=gpt-4o AZURE_OPENAI_API_VERSION=2024-08-01-preview -APPLICATIONINSIGHTS_INSTRUMENTATION_KEY= +APPLICATIONINSIGHTS_CONNECTION_STRING= BACKEND_API_URL='http://localhost:8000' FRONTEND_SITE_NAME='http://127.0.0.1:3000' \ No newline at end of file diff --git a/src/backend/app.py b/src/backend/app.py index 14d5137c7..801d8f3a7 100644 --- a/src/backend/app.py +++ b/src/backend/app.py @@ -32,7 +32,7 @@ # Check if the Application Insights Instrumentation Key is set in the environment variables -instrumentation_key = os.getenv("APPLICATIONINSIGHTS_INSTRUMENTATION_KEY") +instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING") if instrumentation_key: # Configure Application Insights if the Instrumentation Key is found configure_azure_monitor(connection_string=instrumentation_key) diff --git a/src/backend/event_utils.py b/src/backend/event_utils.py index 9b9e5bbf0..eb86a5303 100644 --- a/src/backend/event_utils.py +++ b/src/backend/event_utils.py @@ -4,7 +4,7 @@ def track_event_if_configured(event_name: str, event_data: dict): - instrumentation_key = os.getenv("APPLICATIONINSIGHTS_INSTRUMENTATION_KEY") + instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING") if instrumentation_key: track_event(event_name, event_data) else: diff --git a/src/backend/tests/agents/test_human.py b/src/backend/tests/agents/test_human.py index eb11e568d..2980e1fb6 100644 --- a/src/backend/tests/agents/test_human.py +++ b/src/backend/tests/agents/test_human.py @@ -16,7 +16,7 @@ def setup_environment_variables(): os.environ["COSMOSDB_KEY"] = "mock-key" os.environ["COSMOSDB_DATABASE"] = "mock-database" os.environ["COSMOSDB_CONTAINER"] = "mock-container" - os.environ["APPLICATIONINSIGHTS_INSTRUMENTATION_KEY"] = "mock-instrumentation-key" + os.environ["APPLICATIONINSIGHTS_CONNECTION_STRING"] = "mock-instrumentation-key" os.environ["AZURE_OPENAI_DEPLOYMENT_NAME"] = "mock-deployment-name" os.environ["AZURE_OPENAI_API_VERSION"] = "2023-01-01" os.environ["AZURE_OPENAI_ENDPOINT"] = "https://mock-openai-endpoint" @@ -46,7 +46,7 @@ def ensure_env_variables(monkeypatch): "COSMOSDB_KEY": "mock-key", "COSMOSDB_DATABASE": "mock-database", "COSMOSDB_CONTAINER": "mock-container", - "APPLICATIONINSIGHTS_INSTRUMENTATION_KEY": "mock-instrumentation-key", + "APPLICATIONINSIGHTS_CONNECTION_STRING": "mock-instrumentation-key", "AZURE_OPENAI_DEPLOYMENT_NAME": "mock-deployment-name", "AZURE_OPENAI_API_VERSION": "2023-01-01", "AZURE_OPENAI_ENDPOINT": "https://mock-openai-endpoint", diff --git a/src/backend/tests/test_app.py b/src/backend/tests/test_app.py index 04b57c7d5..0e9f0d1e6 100644 --- a/src/backend/tests/test_app.py +++ b/src/backend/tests/test_app.py @@ -15,7 +15,7 @@ os.environ["COSMOSDB_DATABASE"] = "mock-database" os.environ["COSMOSDB_CONTAINER"] = "mock-container" os.environ[ - "APPLICATIONINSIGHTS_INSTRUMENTATION_KEY" + "APPLICATIONINSIGHTS_CONNECTION_STRING" ] = "InstrumentationKey=mock-instrumentation-key;IngestionEndpoint=https://mock-ingestion-endpoint" os.environ["AZURE_OPENAI_DEPLOYMENT_NAME"] = "mock-deployment-name" os.environ["AZURE_OPENAI_API_VERSION"] = "2023-01-01"