Add Hint support

src/Sentry/Protocol/Envelopes/Envelope.cs

@@ -240,6 +240,13 @@ public static Envelope FromEvent(
         {
             foreach (var attachment in attachments)
             {
+                // Safety check, in case the user forcefully added a null attachment.
+                if (attachment.IsNull())
+                {
+                    logger?.LogWarning("Encountered a null attachment.  Skipping.");
+                    continue;
+                }
+
                 try
                 {
                     // We pull the stream out here so we can length check

src/Sentry/SentryClient.cs

@@ -276,9 +276,9 @@ private SentryId DoSendEvent(SentryEvent @event, Hint? hint, Scope? scope)
             return SentryId.Empty;
         }
 
-        return CaptureEnvelope(Envelope.FromEvent(processedEvent, _options.DiagnosticLogger, scope.Attachments, scope.SessionUpdate))
-            ? processedEvent.EventId
-            : SentryId.Empty;
+        var attachments = hint.Attachments.ToList();
+        var envelope = Envelope.FromEvent(processedEvent, _options.DiagnosticLogger, attachments, scope.SessionUpdate);
+        return CaptureEnvelope(envelope) ? processedEvent.EventId : SentryId.Empty;
     }
 
     private IReadOnlyCollection<Exception>? ApplyExceptionFilters(Exception? exception)

test/Sentry.Tests/SentryClientTests.cs

@@ -1,4 +1,3 @@
-using FluentAssertions.Execution;
 using Sentry.Internal.Http;
 using BackgroundWorker = Sentry.Internal.BackgroundWorker;
 
@@ -368,7 +367,7 @@ public void CaptureEvent_EventProcessor_Gets_ScopeAttachments()
         processor.Process(Arg.Any<SentryEvent>(), Arg.Do<Hint>(h => hint = h)).Returns(new SentryEvent());
         _fixture.SentryOptions.AddEventProcessor(processor);
 
-        Scope scope = new Scope(_fixture.SentryOptions);
+        var scope = new Scope(_fixture.SentryOptions);
         scope.AddAttachment(AttachmentHelper.FakeAttachment("foo.txt"));
 
         // Act
@@ -380,6 +379,91 @@ public void CaptureEvent_EventProcessor_Gets_ScopeAttachments()
         hint.Attachments.Should().Contain(scope.Attachments);
     }
 
+    [Fact]
+    public void CaptureEvent_Gets_ScopeAttachments()
+    {
+        // Arrange
+        var scope = new Scope(_fixture.SentryOptions);
+        scope.AddAttachment(AttachmentHelper.FakeAttachment("foo.txt"));
+        scope.AddAttachment(AttachmentHelper.FakeAttachment("bar.txt"));
+
+        var sut = _fixture.GetSut();
+
+        // Act
+        sut.CaptureEvent(new SentryEvent(), scope);
+
+        // Assert
+        sut.Worker.Received(1).EnqueueEnvelope(Arg.Is<Envelope>(envelope =>
+            envelope.Items.Count(item => item.TryGetType() == "attachment") == 2));
+    }
+
+    [Fact]
+    public void CaptureEvent_Gets_HintAttachments()
+    {
+        // Arrange
+        var scope = new Scope(_fixture.SentryOptions);
+        _fixture.SentryOptions.SetBeforeSend((e, h) => {
+            h.Attachments.Add(AttachmentHelper.FakeAttachment("foo.txt"));
+            h.Attachments.Add(AttachmentHelper.FakeAttachment("bar.txt"));
+            return e;
+        });
+
+        var sut = _fixture.GetSut();
+
+        // Act
+        sut.CaptureEvent(new SentryEvent(), scope);
+
+        // Assert
+        sut.Worker.Received(1).EnqueueEnvelope(Arg.Is<Envelope>(envelope =>
+            envelope.Items.Count(item => item.TryGetType() == "attachment") == 2));
+    }
+
+    [Fact]
+    public void CaptureEvent_Gets_ScopeAndHintAttachments()
+    {
+        // Arrange
+        var scope = new Scope(_fixture.SentryOptions);
+        scope.AddAttachment(AttachmentHelper.FakeAttachment("foo.txt"));
+        _fixture.SentryOptions.SetBeforeSend((e, h) => {
+            h.Attachments.Add(AttachmentHelper.FakeAttachment("bar.txt"));
+            return e;
+        });
+
+        var sut = _fixture.GetSut();
+
+        // Act
+        sut.CaptureEvent(new SentryEvent(), scope);
+
+        // Assert
+        sut.Worker.Received(1).EnqueueEnvelope(Arg.Is<Envelope>(envelope =>
+            envelope.Items.Count(item => item.TryGetType() == "attachment") == 2));
+    }
+
+    [Fact]
+    public void CaptureEvent_CanRemove_ScopetAttachment()
+    {
+        // Arrange
+        var scope = new Scope(_fixture.SentryOptions);
+        scope.AddAttachment(AttachmentHelper.FakeAttachment("foo.txt"));
+        scope.AddAttachment(AttachmentHelper.FakeAttachment("bar.txt"));
+        _fixture.SentryOptions.SetBeforeSend((e, h) =>
+        {
+            var attachment = h.Attachments.FirstOrDefault(a => a.FileName == "bar.txt");
+            h.Attachments.Remove(attachment);
+
+            return e;
+        });
+
+        var sut = _fixture.GetSut();
+
+        // Act
+        sut.CaptureEvent(new SentryEvent(), scope);
+
+        // Assert
+        sut.Worker.Received(1).EnqueueEnvelope(Arg.Is<Envelope>(envelope =>
+            envelope.Items.Count(item => item.TryGetType() == "attachment") == 1));
+    }
+
     [Fact]
     public void CaptureEvent_BeforeSend_ModifyEvent()
     {