Skip to content

Commit 0c320d6

Browse files
CopilotAbdul-Microsoft
Copilot
and
Abdul-Microsoft
authored
Merge origin/dev into feature/update-bicep-avm-versions-40544
Co-authored-by: Abdul-Microsoft <192570837+Abdul-Microsoft@users.noreply.github.com>
2 parents f2c8bf8 + cd9493f commit 0c320d6

42 files changed

Lines changed: 7792 additions & 5285 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/LocalDevelopmentSetup.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,6 @@ Enable detailed logging by setting these environment variables in your `.env` fi
780780

781781
```bash
782782
APP_LOGGING_LEVEL=DEBUG
783-
APP_LOGGING_ENABLE=True
784783
```
785784

786785
## Related Documentation

‎infra/main.bicep‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,14 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.22.1' = {
10021002
name: 'AZURE_LOGGING_PACKAGES'
10031003
value: ''
10041004
}
1005+
{
1006+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1007+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1008+
}
1009+
{
1010+
name: 'OTEL_SERVICE_NAME'
1011+
value: 'ContentProcessor'
1012+
}
10051013
]
10061014
}
10071015
]
@@ -1062,6 +1070,14 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
10621070
name: 'AZURE_LOGGING_PACKAGES'
10631071
value: ''
10641072
}
1073+
{
1074+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1075+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1076+
}
1077+
{
1078+
name: 'OTEL_SERVICE_NAME'
1079+
value: 'ContentProcessorAPI'
1080+
}
10651081
]
10661082
probes: [
10671083
// Liveness Probe - Checks if the app is still running
@@ -1267,6 +1283,14 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
12671283
name: 'AZURE_LOGGING_PACKAGES'
12681284
value: ''
12691285
}
1286+
{
1287+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1288+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1289+
}
1290+
{
1291+
name: 'OTEL_SERVICE_NAME'
1292+
value: 'ContentProcessorWorkflow'
1293+
}
12701294
]
12711295
}
12721296
]
@@ -1639,6 +1663,14 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
16391663
name: 'AZURE_LOGGING_PACKAGES'
16401664
value: ''
16411665
}
1666+
{
1667+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1668+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1669+
}
1670+
{
1671+
name: 'OTEL_SERVICE_NAME'
1672+
value: 'ContentProcessor'
1673+
}
16421674
]
16431675
}
16441676
]
@@ -1714,6 +1746,14 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
17141746
name: 'AZURE_LOGGING_PACKAGES'
17151747
value: ''
17161748
}
1749+
{
1750+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1751+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1752+
}
1753+
{
1754+
name: 'OTEL_SERVICE_NAME'
1755+
value: 'ContentProcessorAPI'
1756+
}
17171757
]
17181758
probes: [
17191759
// Liveness Probe - Checks if the app is still running
@@ -1840,6 +1880,14 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22
18401880
name: 'AZURE_LOGGING_PACKAGES'
18411881
value: ''
18421882
}
1883+
{
1884+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1885+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1886+
}
1887+
{
1888+
name: 'OTEL_SERVICE_NAME'
1889+
value: 'ContentProcessorWorkflow'
1890+
}
18431891
]
18441892
}
18451893
]

‎infra/main.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47780,6 +47780,14 @@
4778047780
{
4778147781
"name": "AZURE_LOGGING_PACKAGES",
4778247782
"value": ""
47783+
},
47784+
{
47785+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
47786+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
47787+
},
47788+
{
47789+
"name": "OTEL_SERVICE_NAME",
47790+
"value": "ContentProcessor"
4778347791
}
4778447792
]
4778547793
}
@@ -49333,6 +49341,7 @@
4933349341
}
4933449342
},
4933549343
"dependsOn": [
49344+
"applicationInsights",
4933649345
"avmContainerAppEnv",
4933749346
"avmContainerRegistryReader"
4933849347
]
@@ -49405,6 +49414,14 @@
4940549414
{
4940649415
"name": "AZURE_LOGGING_PACKAGES",
4940749416
"value": ""
49417+
},
49418+
{
49419+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
49420+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
49421+
},
49422+
{
49423+
"name": "OTEL_SERVICE_NAME",
49424+
"value": "ContentProcessorAPI"
4940849425
}
4940949426
],
4941049427
"probes": [
@@ -51019,6 +51036,7 @@
5101951036
}
5102051037
},
5102151038
"dependsOn": [
51039+
"applicationInsights",
5102251040
"avmContainerAppEnv",
5102351041
"avmContainerRegistryReader"
5102451042
]
@@ -52739,6 +52757,14 @@
5273952757
{
5274052758
"name": "AZURE_LOGGING_PACKAGES",
5274152759
"value": ""
52760+
},
52761+
{
52762+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
52763+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
52764+
},
52765+
{
52766+
"name": "OTEL_SERVICE_NAME",
52767+
"value": "ContentProcessorWorkflow"
5274252768
}
5274352769
]
5274452770
}
@@ -54289,6 +54315,7 @@
5428954315
}
5429054316
},
5429154317
"dependsOn": [
54318+
"applicationInsights",
5429254319
"avmContainerAppEnv",
5429354320
"avmContainerRegistryReader"
5429454321
]
@@ -65019,6 +65046,14 @@
6501965046
{
6502065047
"name": "AZURE_LOGGING_PACKAGES",
6502165048
"value": ""
65049+
},
65050+
{
65051+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
65052+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
65053+
},
65054+
{
65055+
"name": "OTEL_SERVICE_NAME",
65056+
"value": "ContentProcessor"
6502265057
}
6502365058
]
6502465059
}
@@ -66570,6 +66605,7 @@
6657066605
}
6657166606
},
6657266607
"dependsOn": [
66608+
"applicationInsights",
6657366609
"avmAppConfig",
6657466610
"avmContainerAppEnv",
6657566611
"avmContainerRegistryReader",
@@ -66645,6 +66681,14 @@
6664566681
{
6664666682
"name": "AZURE_LOGGING_PACKAGES",
6664766683
"value": ""
66684+
},
66685+
{
66686+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
66687+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
66688+
},
66689+
{
66690+
"name": "OTEL_SERVICE_NAME",
66691+
"value": "ContentProcessorAPI"
6664866692
}
6664966693
],
6665066694
"probes": [
@@ -68259,6 +68303,7 @@
6825968303
}
6826068304
},
6826168305
"dependsOn": [
68306+
"applicationInsights",
6826268307
"avmAppConfig",
6826368308
"avmContainerAppEnv",
6826468309
"avmContainerRegistryReader",
@@ -68333,6 +68378,14 @@
6833368378
{
6833468379
"name": "AZURE_LOGGING_PACKAGES",
6833568380
"value": ""
68381+
},
68382+
{
68383+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
68384+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
68385+
},
68386+
{
68387+
"name": "OTEL_SERVICE_NAME",
68388+
"value": "ContentProcessorWorkflow"
6833668389
}
6833768390
]
6833868391
}
@@ -69883,6 +69936,7 @@
6988369936
}
6988469937
},
6988569938
"dependsOn": [
69939+
"applicationInsights",
6988669940
"avmAppConfig",
6988769941
"avmContainerAppEnv",
6988869942
"avmContainerRegistryReader"

‎infra/main_custom.bicep‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,14 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.22.1' = {
10101010
name: 'AZURE_LOGGING_PACKAGES'
10111011
value: ''
10121012
}
1013+
{
1014+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1015+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1016+
}
1017+
{
1018+
name: 'OTEL_SERVICE_NAME'
1019+
value: 'ContentProcessor'
1020+
}
10131021
]
10141022
}
10151023
]
@@ -1075,6 +1083,14 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
10751083
name: 'AZURE_LOGGING_PACKAGES'
10761084
value: ''
10771085
}
1086+
{
1087+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1088+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1089+
}
1090+
{
1091+
name: 'OTEL_SERVICE_NAME'
1092+
value: 'ContentProcessorAPI'
1093+
}
10781094
]
10791095
probes: [
10801096
// Liveness Probe - Checks if the app is still running
@@ -1290,6 +1306,14 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
12901306
name: 'AZURE_LOGGING_PACKAGES'
12911307
value: ''
12921308
}
1309+
{
1310+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1311+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1312+
}
1313+
{
1314+
name: 'OTEL_SERVICE_NAME'
1315+
value: 'ContentProcessorWorkflow'
1316+
}
12931317
]
12941318
}
12951319
]
@@ -1667,6 +1691,14 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
16671691
name: 'AZURE_LOGGING_PACKAGES'
16681692
value: ''
16691693
}
1694+
{
1695+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1696+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1697+
}
1698+
{
1699+
name: 'OTEL_SERVICE_NAME'
1700+
value: 'ContentProcessor'
1701+
}
16701702
]
16711703
}
16721704
]
@@ -1747,6 +1779,14 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
17471779
name: 'AZURE_LOGGING_PACKAGES'
17481780
value: ''
17491781
}
1782+
{
1783+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1784+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1785+
}
1786+
{
1787+
name: 'OTEL_SERVICE_NAME'
1788+
value: 'ContentProcessorAPI'
1789+
}
17501790
]
17511791
probes: [
17521792
// Liveness Probe - Checks if the app is still running
@@ -1878,6 +1918,14 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22
18781918
name: 'AZURE_LOGGING_PACKAGES'
18791919
value: ''
18801920
}
1921+
{
1922+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1923+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1924+
}
1925+
{
1926+
name: 'OTEL_SERVICE_NAME'
1927+
value: 'ContentProcessorWorkflow'
1928+
}
18811929
]
18821930
}
18831931
]

‎src/ContentProcessor/pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ dependencies = [
99
"azure-ai-inference==1.0.0b9",
1010
"azure-appconfiguration==1.8.0",
1111
"azure-identity==1.26.0b1",
12+
"azure-monitor-opentelemetry==1.8.7",
1213
"azure-storage-blob==12.29.0b1",
1314
"azure-storage-queue==12.16.0b1",
1415
"certifi==2026.2.25",
1516
"charset-normalizer==3.4.6",
16-
"opentelemetry-api==1.39.1",
17+
"opentelemetry-api==1.40.0",
1718
"pandas==3.0.2",
1819
"pdf2image==1.17.0",
1920
"poppler-utils==0.1.0",

‎src/ContentProcessor/requirements.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ azure-ai-inference==1.0.0b9
33
azure-appconfiguration==1.8.0
44
azure-core==1.39.0
55
azure-identity==1.26.0b1
6+
azure-monitor-events-extension==0.1.0
7+
azure-monitor-opentelemetry==1.6.10
68
azure-storage-blob==12.29.0b1
79
azure-storage-queue==12.16.0b1
810
certifi==2026.2.25

‎src/ContentProcessor/src/libs/application/application_configuration.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class AppConfiguration(_configuration_base):
7474
app_cosmos_database: str
7575
app_cosmos_container_process: str
7676
app_cosmos_container_schema: str
77+
applicationinsights_connection_string: str = ""
7778

7879
@field_validator("app_process_steps", mode="before")
7980
@classmethod

0 commit comments

Comments
 (0)