Skip to content

Commit d300d74

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #542 from microsoft/PSL-US-40015
feat: improve Application Insights logging and telemetry handling
2 parents 33c774d + a2998cf commit d300d74

41 files changed

Lines changed: 7769 additions & 5276 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
@@ -1005,6 +1005,14 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.19.0' = {
10051005
name: 'AZURE_LOGGING_PACKAGES'
10061006
value: ''
10071007
}
1008+
{
1009+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1010+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1011+
}
1012+
{
1013+
name: 'OTEL_SERVICE_NAME'
1014+
value: 'ContentProcessor'
1015+
}
10081016
]
10091017
}
10101018
]
@@ -1065,6 +1073,14 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.19.0' = {
10651073
name: 'AZURE_LOGGING_PACKAGES'
10661074
value: ''
10671075
}
1076+
{
1077+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1078+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1079+
}
1080+
{
1081+
name: 'OTEL_SERVICE_NAME'
1082+
value: 'ContentProcessorAPI'
1083+
}
10681084
]
10691085
probes: [
10701086
// Liveness Probe - Checks if the app is still running
@@ -1270,6 +1286,14 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.19.0' = {
12701286
name: 'AZURE_LOGGING_PACKAGES'
12711287
value: ''
12721288
}
1289+
{
1290+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1291+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1292+
}
1293+
{
1294+
name: 'OTEL_SERVICE_NAME'
1295+
value: 'ContentProcessorWorkflow'
1296+
}
12731297
]
12741298
}
12751299
]
@@ -1642,6 +1666,14 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.19.0' = {
16421666
name: 'AZURE_LOGGING_PACKAGES'
16431667
value: ''
16441668
}
1669+
{
1670+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1671+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1672+
}
1673+
{
1674+
name: 'OTEL_SERVICE_NAME'
1675+
value: 'ContentProcessor'
1676+
}
16451677
]
16461678
}
16471679
]
@@ -1717,6 +1749,14 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.19.0' =
17171749
name: 'AZURE_LOGGING_PACKAGES'
17181750
value: ''
17191751
}
1752+
{
1753+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1754+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1755+
}
1756+
{
1757+
name: 'OTEL_SERVICE_NAME'
1758+
value: 'ContentProcessorAPI'
1759+
}
17201760
]
17211761
probes: [
17221762
// Liveness Probe - Checks if the app is still running
@@ -1843,6 +1883,14 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.19
18431883
name: 'AZURE_LOGGING_PACKAGES'
18441884
value: ''
18451885
}
1886+
{
1887+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1888+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1889+
}
1890+
{
1891+
name: 'OTEL_SERVICE_NAME'
1892+
value: 'ContentProcessorWorkflow'
1893+
}
18461894
]
18471895
}
18481896
]

‎infra/main.json‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.41.2.15936",
9-
"templateHash": "5358772599129171911"
9+
"templateHash": "5718783598601616074"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -35187,8 +35187,8 @@
3518735187
"avmContainerApp_API",
3518835188
"avmContainerApp_Workflow",
3518935189
"avmManagedIdentity",
35190-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3519135190
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
35191+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3519235192
"virtualNetwork"
3519335193
]
3519435194
},
@@ -45022,9 +45022,9 @@
4502245022
},
4502345023
"dependsOn": [
4502445024
"avmAiServices_cu",
45025+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4502545026
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
4502645027
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
45027-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4502845028
"virtualNetwork"
4502945029
]
4503045030
},
@@ -46521,6 +46521,14 @@
4652146521
{
4652246522
"name": "AZURE_LOGGING_PACKAGES",
4652346523
"value": ""
46524+
},
46525+
{
46526+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
46527+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
46528+
},
46529+
{
46530+
"name": "OTEL_SERVICE_NAME",
46531+
"value": "ContentProcessor"
4652446532
}
4652546533
]
4652646534
}
@@ -48061,6 +48069,7 @@
4806148069
}
4806248070
},
4806348071
"dependsOn": [
48072+
"applicationInsights",
4806448073
"avmContainerAppEnv",
4806548074
"avmContainerRegistryReader"
4806648075
]
@@ -48133,6 +48142,14 @@
4813348142
{
4813448143
"name": "AZURE_LOGGING_PACKAGES",
4813548144
"value": ""
48145+
},
48146+
{
48147+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
48148+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
48149+
},
48150+
{
48151+
"name": "OTEL_SERVICE_NAME",
48152+
"value": "ContentProcessorAPI"
4813648153
}
4813748154
],
4813848155
"probes": [
@@ -49734,6 +49751,7 @@
4973449751
}
4973549752
},
4973649753
"dependsOn": [
49754+
"applicationInsights",
4973749755
"avmContainerAppEnv",
4973849756
"avmContainerRegistryReader"
4973949757
]
@@ -51441,6 +51459,14 @@
5144151459
{
5144251460
"name": "AZURE_LOGGING_PACKAGES",
5144351461
"value": ""
51462+
},
51463+
{
51464+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
51465+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
51466+
},
51467+
{
51468+
"name": "OTEL_SERVICE_NAME",
51469+
"value": "ContentProcessorWorkflow"
5144451470
}
5144551471
]
5144651472
}
@@ -52978,6 +53004,7 @@
5297853004
}
5297953005
},
5298053006
"dependsOn": [
53007+
"applicationInsights",
5298153008
"avmContainerAppEnv",
5298253009
"avmContainerRegistryReader"
5298353010
]
@@ -63656,6 +63683,14 @@
6365663683
{
6365763684
"name": "AZURE_LOGGING_PACKAGES",
6365863685
"value": ""
63686+
},
63687+
{
63688+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
63689+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
63690+
},
63691+
{
63692+
"name": "OTEL_SERVICE_NAME",
63693+
"value": "ContentProcessor"
6365963694
}
6366063695
]
6366163696
}
@@ -65194,6 +65229,7 @@
6519465229
}
6519565230
},
6519665231
"dependsOn": [
65232+
"applicationInsights",
6519765233
"avmAppConfig",
6519865234
"avmContainerAppEnv",
6519965235
"avmContainerRegistryReader",
@@ -65269,6 +65305,14 @@
6526965305
{
6527065306
"name": "AZURE_LOGGING_PACKAGES",
6527165307
"value": ""
65308+
},
65309+
{
65310+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
65311+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
65312+
},
65313+
{
65314+
"name": "OTEL_SERVICE_NAME",
65315+
"value": "ContentProcessorAPI"
6527265316
}
6527365317
],
6527465318
"probes": [
@@ -66870,6 +66914,7 @@
6687066914
}
6687166915
},
6687266916
"dependsOn": [
66917+
"applicationInsights",
6687366918
"avmAppConfig",
6687466919
"avmContainerAppEnv",
6687566920
"avmContainerRegistryReader",
@@ -66944,6 +66989,14 @@
6694466989
{
6694566990
"name": "AZURE_LOGGING_PACKAGES",
6694666991
"value": ""
66992+
},
66993+
{
66994+
"name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
66995+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
66996+
},
66997+
{
66998+
"name": "OTEL_SERVICE_NAME",
66999+
"value": "ContentProcessorWorkflow"
6694767000
}
6694867001
]
6694967002
}
@@ -68481,6 +68534,7 @@
6848168534
}
6848268535
},
6848368536
"dependsOn": [
68537+
"applicationInsights",
6848468538
"avmAppConfig",
6848568539
"avmContainerAppEnv",
6848668540
"avmContainerRegistryReader"
@@ -68558,6 +68612,13 @@
6855868612
},
6855968613
"value": "[reference('avmContainerRegistry').outputs.loginServer.value]"
6856068614
},
68615+
"CONTENT_UNDERSTANDING_ACCOUNT_NAME": {
68616+
"type": "string",
68617+
"metadata": {
68618+
"description": "The name of the Content Understanding AI Services account."
68619+
},
68620+
"value": "[reference('avmAiServices_cu').outputs.name.value]"
68621+
},
6856168622
"AZURE_RESOURCE_GROUP": {
6856268623
"type": "string",
6856368624
"metadata": {

‎infra/main_custom.bicep‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,14 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.19.0' = {
10131013
name: 'AZURE_LOGGING_PACKAGES'
10141014
value: ''
10151015
}
1016+
{
1017+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1018+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1019+
}
1020+
{
1021+
name: 'OTEL_SERVICE_NAME'
1022+
value: 'ContentProcessor'
1023+
}
10161024
]
10171025
}
10181026
]
@@ -1078,6 +1086,14 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.19.0' = {
10781086
name: 'AZURE_LOGGING_PACKAGES'
10791087
value: ''
10801088
}
1089+
{
1090+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1091+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1092+
}
1093+
{
1094+
name: 'OTEL_SERVICE_NAME'
1095+
value: 'ContentProcessorAPI'
1096+
}
10811097
]
10821098
probes: [
10831099
// Liveness Probe - Checks if the app is still running
@@ -1293,6 +1309,14 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.19.0' = {
12931309
name: 'AZURE_LOGGING_PACKAGES'
12941310
value: ''
12951311
}
1312+
{
1313+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1314+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1315+
}
1316+
{
1317+
name: 'OTEL_SERVICE_NAME'
1318+
value: 'ContentProcessorWorkflow'
1319+
}
12961320
]
12971321
}
12981322
]
@@ -1670,6 +1694,14 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.19.0' = {
16701694
name: 'AZURE_LOGGING_PACKAGES'
16711695
value: ''
16721696
}
1697+
{
1698+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1699+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1700+
}
1701+
{
1702+
name: 'OTEL_SERVICE_NAME'
1703+
value: 'ContentProcessor'
1704+
}
16731705
]
16741706
}
16751707
]
@@ -1750,6 +1782,14 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.19.0' =
17501782
name: 'AZURE_LOGGING_PACKAGES'
17511783
value: ''
17521784
}
1785+
{
1786+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1787+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1788+
}
1789+
{
1790+
name: 'OTEL_SERVICE_NAME'
1791+
value: 'ContentProcessorAPI'
1792+
}
17531793
]
17541794
probes: [
17551795
// Liveness Probe - Checks if the app is still running
@@ -1881,6 +1921,14 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.19
18811921
name: 'AZURE_LOGGING_PACKAGES'
18821922
value: ''
18831923
}
1924+
{
1925+
name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
1926+
value: enableMonitoring ? applicationInsights.outputs.connectionString : ''
1927+
}
1928+
{
1929+
name: 'OTEL_SERVICE_NAME'
1930+
value: 'ContentProcessorWorkflow'
1931+
}
18841932
]
18851933
}
18861934
]

‎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

0 commit comments

Comments
 (0)