fix logging

Author: reakaleek

src/Elastic.Markdown/Links/CrossLinks/CrossLinkResolver.cs

@@ -38,6 +38,7 @@ public record LinkIndexEntry
 	[JsonPropertyName("etag")]
 	public required string ETag { get; init; }
 
+	// TODO can be made required after all doc_sets have published again
 	[JsonPropertyName("updated_at")]
 	public DateTime UpdatedAt { get; init; } = DateTime.MinValue;
 

src/infra/docs-lambda-index-publisher/Program.cs

@@ -49,10 +49,10 @@ static async Task<SQSBatchResponse> Handler(SQSEvent ev, ILambdaContext context)
 				UpdateLinkIndex(linkIndex, linkReference, record, context);
 			processedMessageCount++;
 		}
-		catch (Exception)
+		catch (Exception e)
 		{
 			//Add failed message identifier to the batchItemFailures list
-
+			context.Logger.LogWarning(e, "Failed to process message {MessageId}", message.MessageId);
 			batchItemFailures.Add(new SQSBatchResponse.BatchItemFailure
 			{
 				ItemIdentifier = message.MessageId
@@ -74,26 +74,26 @@ static async Task<SQSBatchResponse> Handler(SQSEvent ev, ILambdaContext context)
 	try
 	{
 		_ = await s3Client.PutObjectAsync(putObjectRequest);
-		context.Logger.LogInformation($"Successfully updated {bucketName}/{indexFile}.");
-		context.Logger.LogInformation($"Processed {processedMessageCount} messages.");
+		context.Logger.LogInformation("Successfully updated {bucketName}/{indexFile}.", bucketName, indexFile);
+		context.Logger.LogInformation("Processed {processedMessageCount} messages.", processedMessageCount);
 		var response = new SQSBatchResponse(batchItemFailures);
-		var jsonString = JsonSerializer.Serialize(response, LinkIndexUpdaterSerializerContext.Default.SQSBatchResponse);
 		if (batchItemFailures.Count > 0)
 		{
-			context.Logger.LogInformation($"Failed to process {batchItemFailures.Count}  messages. Returning them to the queue.");
-			context.Logger.LogInformation(jsonString);
+			var jsonString = JsonSerializer.Serialize(response, LinkIndexUpdaterSerializerContext.Default.SQSBatchResponse);
+			context.Logger.LogInformation("Failed to process {batchItemFailuresCount}  messages. Returning them to the queue.", batchItemFailures.Count);
+			context.Logger.LogDebug(jsonString);
 		}
 
 		return response;
 	}
 	catch (Exception ex)
 	{
 		// if we fail to update the object, we need to return all the messages
-		context.Logger.LogError($"Failed to update {bucketName}/{indexFile}. Returning all {ev.Records.Count} messages to the queue.");
+		context.Logger.LogError("Failed to update {bucketName}/{indexFile}. Returning all {recordCount} messages to the queue.", bucketName, indexFile, ev.Records.Count);
 		context.Logger.LogError(ex, ex.Message);
 		ev.Records.ForEach(m =>
 		{
-			context.Logger.LogInformation($"Returning message {m.MessageId} to the queue.");
+			context.Logger.LogInformation("Returning message {messageId} to the queue.", m.MessageId);
 		});
 
 		var response = new SQSBatchResponse(ev.Records.Select(r => new SQSBatchResponse.BatchItemFailure
@@ -110,7 +110,7 @@ static async Task<SQSBatchResponse> Handler(SQSEvent ev, ILambdaContext context)
 {
 	if (string.IsNullOrEmpty(message.Body))
 		throw new Exception("No Body in SQS Message.");
-	context.Logger.LogInformation($"Received message {message.Body}");
+	context.Logger.LogDebug("Received message {messageBody}", message.Body);
 	var s3Event = JsonSerializer.Deserialize<S3EventNotification>(message.Body, LinkIndexUpdaterSerializerContext.Default.S3EventNotification);
 	if (s3Event?.Records == null || s3Event.Records.Count == 0)
 		throw new Exception("Invalid S3 event message format");
@@ -119,15 +119,14 @@ await Parallel.ForEachAsync(s3Event.Records, async (record, ctx) =>
 	{
 		var s3Bucket = record.S3.Bucket;
 		var s3Object = record.S3.Obj;
-		context.Logger.LogInformation($"Get object {s3Object.Key} from bucket {s3Bucket.Name}");
+		context.Logger.LogInformation("Get object {key} from bucket {bucketName}", s3Object.Key, s3Bucket.Name);
 		var getObjectResponse = await s3Client.GetObjectAsync(s3Bucket.Name, s3Object.Key, ctx);
 		await using var stream = getObjectResponse.ResponseStream;
-		context.Logger.LogInformation($"Deserializing link reference from {s3Object.Key}");
+		context.Logger.LogInformation("Deserializing link reference from {key}", s3Object.Key);
 		var linkReference = LinkReference.Deserialize(stream);
-		context.Logger.LogInformation($"Link reference deserialized: {linkReference}");
 		linkReferences.Add((record, linkReference));
 	});
-	context.Logger.LogInformation($"Deserialized {linkReferences.Count} link references from S3 event");
+	context.Logger.LogInformation("Deserialized {linkReferenceCount} link references from S3 event", linkReferences.Count);
 	return linkReferences;
 }
 
@@ -152,29 +151,23 @@ static void UpdateLinkIndex(LinkIndex linkIndex, LinkReference linkReference, S3
 		UpdatedAt = s3EventRecord.EventTime,
 		GitReference = linkReference.Origin.Ref
 	};
-
-	if (repository == "docs-content")
-	{
-		throw new Exception("This is a test exception");
-	}
-
 	if (linkIndex.Repositories.TryGetValue(repository, out var existingEntry))
 	{
 		var newEntryIsNewer = DateTime.Compare(newEntry.UpdatedAt, existingEntry[branch].UpdatedAt) > 0;
 		if (newEntryIsNewer)
 		{
 			existingEntry[branch] = newEntry;
-			context.Logger.LogInformation($"Updated existing entry for {repository}@{branch}");
+			context.Logger.LogInformation("Updated existing entry for {repository}@{branch}", repository, branch);
 		}
 		else
-			context.Logger.LogInformation($"Skipping update for {repository}@{branch} because the existing entry is newer");
+			context.Logger.LogInformation("Skipping update for {repository}@{branch} because the existing entry is newer", repository, branch);
 	}
 	else
 	{
 		linkIndex.Repositories.Add(repository, new Dictionary<string, LinkIndexEntry>
 		{
 			{ branch, newEntry }
 		});
-		context.Logger.LogInformation($"Added new entry for {repository}@{branch}");
+		context.Logger.LogInformation("Added new entry for {repository}@{branch}", repository, branch);
 	}
 }