Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Truncate webhooks for azure queue as well #2788

Merged
merged 3 commits into from
Jan 31, 2023
Merged

Truncate webhooks for azure queue as well #2788

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d4a87
Truncate for queue as well + bug fix
tevoinea Jan 30, 2023
14b41f2
Merge branch 'main' into tevoinea/SendTruncatedMessage
tevoinea Jan 30, 2023
7746558
Merge branch 'main' into tevoinea/SendTruncatedMessage
tevoinea Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/ApiService/ApiService/onefuzzlib/WebhookOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Text.Json;
using System.Threading.Tasks;
using ApiService.OneFuzzLib.Orm;
using Azure;
using Microsoft.OneFuzz.Service.OneFuzzLib.Orm;

namespace Microsoft.OneFuzz.Service;
Expand Down Expand Up @@ -49,18 +50,31 @@ async private Async.Task AddEvent(Webhook webhook, EventMessage eventMessage) {
var r = await _context.WebhookMessageLogOperations.Replace(message);
if (!r.IsOk) {
if (r.ErrorV.Reason.Contains("The entity is larger than the maximum allowed size") && eventMessage.Event is ITruncatable<BaseEvent> truncatableEvent) {
_logTracer.WithTags(tags).Warning($"The WebhookMessageLog was too long. Truncating event data and trying again.");
var truncatedEventMessage = message with {
_logTracer.WithTags(tags).Warning($"The WebhookMessageLog was too long for Azure Table. Truncating event data and trying again.");
message = message with {
Event = truncatableEvent.Truncate(1000)
};
r = await _context.WebhookMessageLogOperations.Replace(truncatedEventMessage);
r = await _context.WebhookMessageLogOperations.Replace(message);
}
if (!r.IsOk) {
_logTracer.WithHttpStatus(r.ErrorV).WithTags(tags).Error($"Failed to replace webhook message log {webhook.WebhookId:Tag:WebhookId} - {eventMessage.EventId:Tag:EventId}");
}
}

await _context.WebhookMessageLogOperations.QueueWebhook(message);
try {
await _context.WebhookMessageLogOperations.QueueWebhook(message);
} catch (RequestFailedException ex) {
if (ex.Message.Contains("The request body is too large") && eventMessage.Event is ITruncatable<BaseEvent> truncatableEvent) {
_logTracer.WithTags(tags).Warning($"The WebhookMessageLog was too long for Azure Queue. Truncating event data and trying again.");
message = message with {
Event = truncatableEvent.Truncate(1000)
};
await _context.WebhookMessageLogOperations.QueueWebhook(message);
} else {
// Not handled
throw ex;
}
}
}

public async Async.Task<bool> Send(WebhookMessageLog messageLog) {
Expand Down