dont fail for attachment read error

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Dont fail for attachment read error ([#1378](https://github.com/getsentry/sentry-dotnet/pull/1378))
 - Fix file locking in attachments ([#1377](https://github.com/getsentry/sentry-dotnet/pull/1377))
 
 ## 3.12.1

src/Sentry/Envelopes/Envelope.cs

@@ -5,6 +5,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Sentry.Extensibility;
 using Sentry.Internal;
 using Sentry.Internal.Extensions;
 
@@ -110,6 +111,7 @@ public async Task SerializeAsync(Stream stream, CancellationToken cancellationTo
         /// </summary>
         public static Envelope FromEvent(
             SentryEvent @event,
+            IDiagnosticLogger? logger = null,
             IReadOnlyCollection<Attachment>? attachments = null,
             SessionUpdate? sessionUpdate = null)
         {
@@ -122,7 +124,22 @@ public static Envelope FromEvent(
 
             if (attachments is not null)
             {
-                items.AddRange(attachments.Select(EnvelopeItem.FromAttachment));
+                foreach (var attachment in attachments)
+                {
+                    try
+                    {
+                        items.Add(EnvelopeItem.FromAttachment(attachment));
+                    }
+                    catch (Exception exception)
+                    {
+                        if (logger is null)
+                        {
+                            throw;
+                        }
+
+                        logger.LogError("Failed to add attachment: {0}.", exception, attachment.FileName);
+                    }
+                }
             }
 
             if (sessionUpdate is not null)

src/Sentry/SentryClient.cs

@@ -237,7 +237,7 @@ private SentryId DoSendEvent(SentryEvent @event, Scope? scope)
                 return SentryId.Empty;
             }
 
-            return CaptureEnvelope(Envelope.FromEvent(processedEvent, scope.Attachments, scope.SessionUpdate))
+            return CaptureEnvelope(Envelope.FromEvent(processedEvent, _options.DiagnosticLogger, scope.Attachments, scope.SessionUpdate))
                 ? processedEvent.EventId
                 : SentryId.Empty;
         }

test/Sentry.Tests/Internals/Http/HttpTransportTests.cs

@@ -325,6 +325,52 @@ public async Task SendEnvelopeAsync_ItemRateLimit_DropsItem()
         actualEnvelopeSerialized.Should().BeEquivalentTo(expectedEnvelopeSerialized);
     }
 
+    [Fact]
+    public async Task SendEnvelopeAsync_AttachmentFail_DropsItem()
+    {
+        // Arrange
+        using var httpHandler = new RecordingHttpMessageHandler(
+            new FakeHttpMessageHandler());
+
+        var logger = new InMemoryDiagnosticLogger();
+
+        var httpTransport = new HttpTransport(
+            new SentryOptions
+            {
+                Dsn = DsnSamples.ValidDsnWithSecret,
+                MaxAttachmentSize = 1,
+                DiagnosticLogger = logger,
+                Debug = true
+            },
+            new HttpClient(httpHandler));
+
+        var attachment = new Attachment(
+            AttachmentType.Default,
+            new FileAttachmentContent("test1.txt"),
+            "test1.txt",
+            null);
+
+        using var envelope = Envelope.FromEvent(
+            new SentryEvent(),
+            logger,
+            new[] { attachment });
+
+        // Act
+        await httpTransport.SendEnvelopeAsync(envelope);
+
+        var lastRequest = httpHandler.GetRequests().Last();
+        var actualEnvelopeSerialized = await lastRequest.Content.ReadAsStringAsync();
+
+        // Assert
+        // (the envelope should have only one item)
+
+        logger.Entries.Should().Contain(e =>
+            e.Message == "Failed to add attachment: {0}." &&
+            (string)e.Args[0] == "test1.txt");
+
+        actualEnvelopeSerialized.Should().NotContain("test2.txt");
+    }
+
     [Fact]
     public async Task SendEnvelopeAsync_AttachmentTooLarge_DropsItem()
     {
@@ -358,6 +404,7 @@ public async Task SendEnvelopeAsync_AttachmentTooLarge_DropsItem()
 
         using var envelope = Envelope.FromEvent(
             new SentryEvent(),
+            null,
             new[] { attachmentNormal, attachmentTooBig });
 
         // Act
@@ -399,7 +446,7 @@ public async Task SendEnvelopeAsync_ItemRateLimit_PromotesNextSessionWithSameId(
         await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent()));
 
         // Send session update with init=true
-        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, session.CreateUpdate(true, DateTimeOffset.Now)));
+        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, null, session.CreateUpdate(true, DateTimeOffset.Now)));
 
         // Pretend the rate limit has already passed
         foreach (var (category, _) in httpTransport.CategoryLimitResets)
@@ -410,7 +457,7 @@ public async Task SendEnvelopeAsync_ItemRateLimit_PromotesNextSessionWithSameId(
         // Act
 
         // Send another update with init=false (should get promoted)
-        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, session.CreateUpdate(false, DateTimeOffset.Now)));
+        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, null, session.CreateUpdate(false, DateTimeOffset.Now)));
 
         var lastRequest = httpHandler.GetRequests().Last();
         var actualEnvelopeSerialized = await lastRequest.Content.ReadAsStringAsync();
@@ -441,7 +488,7 @@ public async Task SendEnvelopeAsync_ItemRateLimit_DoesNotAffectNextSessionWithDi
         await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent()));
 
         // Send session update with init=true
-        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, session.CreateUpdate(true, DateTimeOffset.Now)));
+        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, null, session.CreateUpdate(true, DateTimeOffset.Now)));
 
         // Pretend the rate limit has already passed
         foreach (var (category, _) in httpTransport.CategoryLimitResets)
@@ -453,7 +500,7 @@ public async Task SendEnvelopeAsync_ItemRateLimit_DoesNotAffectNextSessionWithDi
 
         // Send an update for different session with init=false (should NOT get promoted)
         var nextSession = new Session("foo2", "bar2", "baz2");
-        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, nextSession.CreateUpdate(false, DateTimeOffset.Now)));
+        await httpTransport.SendEnvelopeAsync(Envelope.FromEvent(new SentryEvent(), null, null, nextSession.CreateUpdate(false, DateTimeOffset.Now)));
 
         var lastRequest = httpHandler.GetRequests().Last();
         var actualEnvelopeSerialized = await lastRequest.Content.ReadAsStringAsync();

test/Sentry.Tests/Protocol/Envelopes/EnvelopeTests.cs

@@ -391,7 +391,7 @@ public async Task Roundtrip_WithEvent_WithAttachment_Success()
             "file.txt",
             null);
 
-        using var envelope = Envelope.FromEvent(@event, new[] { attachment });
+        using var envelope = Envelope.FromEvent(@event, null, new[] { attachment });
 
         using var stream = new MemoryStream();
 
@@ -428,7 +428,7 @@ public async Task Roundtrip_WithEvent_WithSession_Success()
 
         var sessionUpdate = new Session("foo", "bar", "baz").CreateUpdate(false, DateTimeOffset.Now);
 
-        using var envelope = Envelope.FromEvent(@event, new[] { attachment }, sessionUpdate);
+        using var envelope = Envelope.FromEvent(@event, null, new[] { attachment }, sessionUpdate);
 
         using var stream = new MemoryStream();