Skip to content

Commit 2c74eae

Browse files
Kanchan-MicrosoftKanchan-Microsoft
committed
remove enableMonitoring parameter
1 parent badfdec commit 2c74eae

3 files changed

Lines changed: 42 additions & 13 deletions

File tree

‎App/backend-api/Microsoft.GS.DPS.Host/API/ChatHost/Chat.cs‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,25 @@ public class Chat
1313
public static void AddAPIs(WebApplication app)
1414
{
1515
//RegisterAsync the chat API
16-
app.MapPost("/chat", async (ChatRequest request,
16+
app.MapPost("/chat", async (HttpContext httpContext,
17+
ChatRequest request,
1718
ChatRequestValidator validator,
1819
ChatHost chatHost,
1920
TelemetryHelper telemetryHelper,
2021
ILogger<Chat> logger) =>
2122
{
23+
// Generate unique request ID for tracking
24+
var requestId = httpContext.TraceIdentifier;
25+
telemetryHelper.SetActivityTag("requestId", requestId);
26+
2227
try
2328
{
2429
if (validator.Validate(request).IsValid == false)
2530
{
2631
telemetryHelper.TrackEvent("ChatRequestValidationFailed", new Dictionary<string, string>
2732
{
28-
{ "endpoint", "/chat" }
33+
{ "endpoint", "/chat" },
34+
{ "requestId", requestId }
2935
});
3036
return Results.BadRequest();
3137
}
@@ -35,6 +41,7 @@ public static void AddAPIs(WebApplication app)
3541
// Track successful chat request
3642
telemetryHelper.TrackEvent("ChatRequestSuccess", new Dictionary<string, string>
3743
{
44+
{ "requestId", requestId },
3845
{ "chatSessionId", result.ChatSessionId ?? "unknown" },
3946
{ "documentCount", result.DocumentIds?.Length.ToString() ?? "0" }
4047
});
@@ -49,9 +56,10 @@ public static void AddAPIs(WebApplication app)
4956
}
5057
catch (Exception ex)
5158
{
52-
logger.LogError(ex, "Error processing chat request");
59+
logger.LogError(ex, "Error processing chat request. RequestId: {RequestId}", requestId);
5360
telemetryHelper.TrackException(ex, new Dictionary<string, string>
5461
{
62+
{ "requestId", requestId },
5563
{ "endpoint", "/chat" },
5664
{ "errorType", ex.GetType().Name }
5765
});
@@ -71,13 +79,18 @@ public static void AddAPIs(WebApplication app)
7179
TelemetryHelper telemetryHelper,
7280
ILogger<Chat> logger) =>
7381
{
82+
// Generate unique request ID for tracking
83+
var requestId = ctx.TraceIdentifier;
84+
telemetryHelper.SetActivityTag("requestId", requestId);
85+
7486
try
7587
{
7688
if (validator.Validate(request).IsValid == false)
7789
{
7890
telemetryHelper.TrackEvent("ChatAsyncRequestValidationFailed", new Dictionary<string, string>
7991
{
80-
{ "endpoint", "/chatAsync" }
92+
{ "endpoint", "/chatAsync" },
93+
{ "requestId", requestId }
8194
});
8295
return Results.BadRequest();
8396
}
@@ -101,6 +114,7 @@ public static void AddAPIs(WebApplication app)
101114
// Track successful chat async request
102115
telemetryHelper.TrackEvent("ChatAsyncRequestSuccess", new Dictionary<string, string>
103116
{
117+
{ "requestId", requestId },
104118
{ "chatSessionId", result.ChatSessionId ?? "unknown" },
105119
{ "documentCount", result.DocumentIds?.Length.ToString() ?? "0" }
106120
});
@@ -121,9 +135,10 @@ public static void AddAPIs(WebApplication app)
121135
}
122136
catch (Exception ex)
123137
{
124-
logger.LogError(ex, "Error processing chat async request");
138+
logger.LogError(ex, "Error processing chat async request. RequestId: {RequestId}", requestId);
125139
telemetryHelper.TrackException(ex, new Dictionary<string, string>
126140
{
141+
{ "requestId", requestId },
127142
{ "endpoint", "/chatAsync" },
128143
{ "errorType", ex.GetType().Name }
129144
});

‎App/backend-api/Microsoft.GS.DPS.Host/API/KernelMemory/KernelMemory.cs‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ public class KernelMemory
1919
public static void AddAPIs(WebApplication app)
2020
{
2121
//Registration the files
22-
app.MapPost("/Documents/ImportDocument", async (IFormFile file,
22+
app.MapPost("/Documents/ImportDocument", async (HttpContext httpContext,
23+
IFormFile file,
2324
DPS.API.KernelMemory kernelMemory,
2425
TelemetryHelper telemetryHelper,
2526
ILogger<KernelMemory> logger
2627
) =>
2728
{
29+
// Generate unique request ID for tracking
30+
var requestId = httpContext.TraceIdentifier;
31+
telemetryHelper.SetActivityTag("requestId", requestId);
32+
2833
try
2934
{
3035
var fileStream = file.OpenReadStream();
@@ -48,6 +53,7 @@ ILogger<KernelMemory> logger
4853
{
4954
telemetryHelper.TrackEvent("DocumentImportUnsupportedFileType", new Dictionary<string, string>
5055
{
56+
{ "requestId", requestId },
5157
{ "fileExtension", fileExtension },
5258
{ "contentType", contentType }
5359
});
@@ -61,6 +67,7 @@ ILogger<KernelMemory> logger
6167
{
6268
telemetryHelper.TrackEvent("DocumentImportEmptyFile", new Dictionary<string, string>
6369
{
70+
{ "requestId", requestId },
6471
{ "fileName", file?.FileName ?? "unknown" }
6572
});
6673
return Results.BadRequest(new DocumentImportedResult()
@@ -76,6 +83,7 @@ ILogger<KernelMemory> logger
7683
// Track successful document import
7784
telemetryHelper.TrackEvent("DocumentImportSuccess", new Dictionary<string, string>
7885
{
86+
{ "requestId", requestId },
7987
{ "documentId", result.DocumentId },
8088
{ "mimeType", result.MimeType ?? "unknown" },
8189
{ "fileSize", file.Length.ToString() }
@@ -94,9 +102,10 @@ ILogger<KernelMemory> logger
94102
catch (IOException ex)
95103
{
96104
// Log the exception
97-
logger.LogError(ex, "An error occurred while uploading the document");
105+
logger.LogError(ex, "An error occurred while uploading the document. RequestId: {RequestId}", requestId);
98106
telemetryHelper.TrackException(ex, new Dictionary<string, string>
99107
{
108+
{ "requestId", requestId },
100109
{ "endpoint", "/Documents/ImportDocument" },
101110
{ "errorType", "IOException" }
102111
});
@@ -105,9 +114,10 @@ ILogger<KernelMemory> logger
105114
catch (Exception ex)
106115
{
107116
// Log the exception
108-
logger.LogError(ex, "An unexpected error occurred");
117+
logger.LogError(ex, "An unexpected error occurred. RequestId: {RequestId}", requestId);
109118
telemetryHelper.TrackException(ex, new Dictionary<string, string>
110119
{
120+
{ "requestId", requestId },
111121
{ "endpoint", "/Documents/ImportDocument" },
112122
{ "errorType", ex.GetType().Name }
113123
});
@@ -117,27 +127,34 @@ ILogger<KernelMemory> logger
117127
})
118128
.DisableAntiforgery();
119129

120-
app.MapDelete("/Documents/{documentId}", async (string documentId,
130+
app.MapDelete("/Documents/{documentId}", async (HttpContext httpContext,
131+
string documentId,
121132
DPS.API.KernelMemory kernelMemory,
122133
TelemetryHelper telemetryHelper,
123134
ILogger<KernelMemory> logger) =>
124135
{
136+
// Generate unique request ID for tracking
137+
var requestId = httpContext.TraceIdentifier;
138+
telemetryHelper.SetActivityTag("requestId", requestId);
139+
125140
try
126141
{
127142
await kernelMemory.DeleteDocument(documentId);
128143

129144
telemetryHelper.TrackEvent("DocumentDeleteSuccess", new Dictionary<string, string>
130145
{
146+
{ "requestId", requestId },
131147
{ "documentId", documentId }
132148
});
133149

134150
return Results.Ok(new DocumentDeletedResult() { IsDeleted = true });
135151
}
136152
catch (Exception ex)
137153
{
138-
logger.LogError(ex, "Error deleting document: {DocumentId}", documentId);
154+
logger.LogError(ex, "Error deleting document: {DocumentId}. RequestId: {RequestId}", documentId, requestId);
139155
telemetryHelper.TrackException(ex, new Dictionary<string, string>
140156
{
157+
{ "requestId", requestId },
141158
{ "endpoint", "/Documents/{documentId}" },
142159
{ "documentId", documentId },
143160
{ "errorType", ex.GetType().Name }

‎infra/main.parameters.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
"enableTelemetry": {
3939
"value": "${AZURE_ENV_ENABLE_TELEMETRY}"
4040
},
41-
"enableMonitoring": {
42-
"value": true
43-
},
4441
"tags": {
4542
"value": {
4643
"solutionName": "${AZURE_ENV_NAME}"

0 commit comments

Comments
 (0)