- Renamed Contextual processors to ProcessorWithHint (more specific)

- Added overload to CaptureEvent to allow passing both Hint and ConfigureScope callback

src/Sentry/Extensibility/ISentryEventProcessor.cs

@@ -22,7 +22,7 @@ internal static class ISentryEventProcessorExtensions
 {
     internal static SentryEvent? DoProcessEvent(this ISentryEventProcessor processor, SentryEvent @event, Hint hint)
     {
-        return (processor is IContextualSentryEventProcessor contextualProcessor)
+        return (processor is ISentryEventProcessorWithHint contextualProcessor)
             ? contextualProcessor.Process(@event, hint)
             : processor.Process(@event);
     }

src/Sentry/Extensibility/IContextualSentryEventProcessor.cs → src/Sentry/Extensibility/ISentryEventProcessorWithHint.cs

@@ -3,7 +3,7 @@ namespace Sentry.Extensibility;
 /// <summary>
 /// Process a SentryEvent during the prepare phase.
 /// </summary>
-public interface IContextualSentryEventProcessor: ISentryEventProcessor
+public interface ISentryEventProcessorWithHint: ISentryEventProcessor
 {
     /// <summary>
     /// Process the <see cref="SentryEvent"/>
@@ -18,3 +18,4 @@ public interface IContextualSentryEventProcessor: ISentryEventProcessor
     /// </remarks>
     SentryEvent? Process(SentryEvent @event, Hint hint);
 }
+

src/Sentry/Extensibility/ISentryTransactionProcessor.cs

@@ -21,7 +21,7 @@ internal static class ISentryTransactionProcessorExtensions
 {
     internal static Transaction? DoProcessTransaction(this ISentryTransactionProcessor processor, Transaction transaction, Hint hint)
     {
-        return (processor is IContextualSentryTransactionProcessor contextualProcessor)
+        return (processor is ISentryTransactionProcessorWithHint contextualProcessor)
             ? contextualProcessor.Process(transaction, hint)
             : processor.Process(transaction);
     }

src/Sentry/Extensibility/IContextualSentryTransactionProcessor.cs → src/Sentry/Extensibility/ISentryTransactionProcessorWithHint.cs

@@ -3,7 +3,7 @@ namespace Sentry.Extensibility;
 /// <summary>
 /// Process a <see cref="Transaction"/> during the prepare phase.
 /// </summary>
-public interface IContextualSentryTransactionProcessor: ISentryTransactionProcessor
+public interface ISentryTransactionProcessorWithHint: ISentryTransactionProcessor
 {
     /// <summary>
     /// Process the <see cref="Transaction"/>

src/Sentry/Internal/Hub.cs

@@ -294,7 +294,10 @@ public void EndSession(SessionEndStatus status = SessionEndStatus.Exited) =>
         return null;
     }
 
-    public SentryId CaptureEvent(SentryEvent evt, Action<Scope> configureScope)
+    public SentryId CaptureEvent(SentryEvent evt, Action<Scope> configureScope) =>
+        CaptureEvent(evt, null, configureScope);
+
+    public SentryId CaptureEvent(SentryEvent evt, Hint? hint, Action<Scope> configureScope)
     {
         if (!IsEnabled)
         {
@@ -306,7 +309,7 @@ public SentryId CaptureEvent(SentryEvent evt, Action<Scope> configureScope)
             var clonedScope = ScopeManager.GetCurrent().Key.Clone();
             configureScope(clonedScope);
 
-            return CaptureEvent(evt, clonedScope);
+            return CaptureEvent(evt, hint, clonedScope);
         }
         catch (Exception e)
         {

test/Sentry.Tests/ApiApprovalTests.Run.Core3_1.verified.txt

@@ -1255,14 +1255,6 @@ namespace Sentry.Extensibility
         bool EnqueueEnvelope(Sentry.Protocol.Envelopes.Envelope envelope);
         System.Threading.Tasks.Task FlushAsync(System.TimeSpan timeout);
     }
-    public interface IContextualSentryEventProcessor : Sentry.Extensibility.ISentryEventProcessor
-    {
-        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
-    }
-    public interface IContextualSentryTransactionProcessor : Sentry.Extensibility.ISentryTransactionProcessor
-    {
-        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
-    }
     public interface IDiagnosticLogger
     {
         bool IsEnabled(Sentry.SentryLevel level);
@@ -1296,6 +1288,10 @@ namespace Sentry.Extensibility
     {
         Sentry.SentryEvent? Process(Sentry.SentryEvent @event);
     }
+    public interface ISentryEventProcessorWithHint : Sentry.Extensibility.ISentryEventProcessor
+    {
+        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
+    }
     public interface ISentryStackTraceFactory
     {
         Sentry.SentryStackTrace? Create(System.Exception? exception = null);
@@ -1304,6 +1300,10 @@ namespace Sentry.Extensibility
     {
         Sentry.Transaction? Process(Sentry.Transaction transaction);
     }
+    public interface ISentryTransactionProcessorWithHint : Sentry.Extensibility.ISentryTransactionProcessor
+    {
+        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
+    }
     public interface ITransport
     {
         System.Threading.Tasks.Task SendEnvelopeAsync(Sentry.Protocol.Envelopes.Envelope envelope, System.Threading.CancellationToken cancellationToken = default);

test/Sentry.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt

@@ -1256,14 +1256,6 @@ namespace Sentry.Extensibility
         bool EnqueueEnvelope(Sentry.Protocol.Envelopes.Envelope envelope);
         System.Threading.Tasks.Task FlushAsync(System.TimeSpan timeout);
     }
-    public interface IContextualSentryEventProcessor : Sentry.Extensibility.ISentryEventProcessor
-    {
-        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
-    }
-    public interface IContextualSentryTransactionProcessor : Sentry.Extensibility.ISentryTransactionProcessor
-    {
-        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
-    }
     public interface IDiagnosticLogger
     {
         bool IsEnabled(Sentry.SentryLevel level);
@@ -1297,6 +1289,10 @@ namespace Sentry.Extensibility
     {
         Sentry.SentryEvent? Process(Sentry.SentryEvent @event);
     }
+    public interface ISentryEventProcessorWithHint : Sentry.Extensibility.ISentryEventProcessor
+    {
+        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
+    }
     public interface ISentryStackTraceFactory
     {
         Sentry.SentryStackTrace? Create(System.Exception? exception = null);
@@ -1305,6 +1301,10 @@ namespace Sentry.Extensibility
     {
         Sentry.Transaction? Process(Sentry.Transaction transaction);
     }
+    public interface ISentryTransactionProcessorWithHint : Sentry.Extensibility.ISentryTransactionProcessor
+    {
+        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
+    }
     public interface ITransport
     {
         System.Threading.Tasks.Task SendEnvelopeAsync(Sentry.Protocol.Envelopes.Envelope envelope, System.Threading.CancellationToken cancellationToken = default);

test/Sentry.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt

@@ -1256,14 +1256,6 @@ namespace Sentry.Extensibility
         bool EnqueueEnvelope(Sentry.Protocol.Envelopes.Envelope envelope);
         System.Threading.Tasks.Task FlushAsync(System.TimeSpan timeout);
     }
-    public interface IContextualSentryEventProcessor : Sentry.Extensibility.ISentryEventProcessor
-    {
-        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
-    }
-    public interface IContextualSentryTransactionProcessor : Sentry.Extensibility.ISentryTransactionProcessor
-    {
-        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
-    }
     public interface IDiagnosticLogger
     {
         bool IsEnabled(Sentry.SentryLevel level);
@@ -1297,6 +1289,10 @@ namespace Sentry.Extensibility
     {
         Sentry.SentryEvent? Process(Sentry.SentryEvent @event);
     }
+    public interface ISentryEventProcessorWithHint : Sentry.Extensibility.ISentryEventProcessor
+    {
+        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
+    }
     public interface ISentryStackTraceFactory
     {
         Sentry.SentryStackTrace? Create(System.Exception? exception = null);
@@ -1305,6 +1301,10 @@ namespace Sentry.Extensibility
     {
         Sentry.Transaction? Process(Sentry.Transaction transaction);
     }
+    public interface ISentryTransactionProcessorWithHint : Sentry.Extensibility.ISentryTransactionProcessor
+    {
+        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
+    }
     public interface ITransport
     {
         System.Threading.Tasks.Task SendEnvelopeAsync(Sentry.Protocol.Envelopes.Envelope envelope, System.Threading.CancellationToken cancellationToken = default);

test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt

@@ -1254,14 +1254,6 @@ namespace Sentry.Extensibility
         bool EnqueueEnvelope(Sentry.Protocol.Envelopes.Envelope envelope);
         System.Threading.Tasks.Task FlushAsync(System.TimeSpan timeout);
     }
-    public interface IContextualSentryEventProcessor : Sentry.Extensibility.ISentryEventProcessor
-    {
-        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
-    }
-    public interface IContextualSentryTransactionProcessor : Sentry.Extensibility.ISentryTransactionProcessor
-    {
-        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
-    }
     public interface IDiagnosticLogger
     {
         bool IsEnabled(Sentry.SentryLevel level);
@@ -1295,6 +1287,10 @@ namespace Sentry.Extensibility
     {
         Sentry.SentryEvent? Process(Sentry.SentryEvent @event);
     }
+    public interface ISentryEventProcessorWithHint : Sentry.Extensibility.ISentryEventProcessor
+    {
+        Sentry.SentryEvent? Process(Sentry.SentryEvent @event, Sentry.Hint hint);
+    }
     public interface ISentryStackTraceFactory
     {
         Sentry.SentryStackTrace? Create(System.Exception? exception = null);
@@ -1303,6 +1299,10 @@ namespace Sentry.Extensibility
     {
         Sentry.Transaction? Process(Sentry.Transaction transaction);
     }
+    public interface ISentryTransactionProcessorWithHint : Sentry.Extensibility.ISentryTransactionProcessor
+    {
+        Sentry.Transaction? Process(Sentry.Transaction transaction, Sentry.Hint hint);
+    }
     public interface ITransport
     {
         System.Threading.Tasks.Task SendEnvelopeAsync(Sentry.Protocol.Envelopes.Envelope envelope, System.Threading.CancellationToken cancellationToken = default);

test/Sentry.Tests/HubTests.cs

@@ -1175,7 +1175,7 @@ public void CaptureTransaction_Client_Gets_ScopeAttachments()
     public void CaptureTransaction_EventProcessor_Gets_Hint()
     {
         // Arrange
-        var processor = Substitute.For<IContextualSentryTransactionProcessor>();
+        var processor = Substitute.For<ISentryTransactionProcessorWithHint>();
         processor.Process(Arg.Any<Transaction>(), Arg.Any<Hint>()).Returns(new Transaction("name", "operation"));
         _fixture.Options.AddTransactionProcessor(processor);
 
@@ -1192,7 +1192,7 @@ public void CaptureTransaction_EventProcessor_Gets_Hint()
     public void CaptureTransaction_EventProcessor_Gets_ScopeAttachments()
     {
         // Arrange
-        var processor = Substitute.For<IContextualSentryTransactionProcessor>();
+        var processor = Substitute.For<ISentryTransactionProcessorWithHint>();
         Hint hint = null;
         processor.Process(Arg.Any<Transaction>(), Arg.Do<Hint>(h => hint = h)).Returns(new Transaction("name", "operation"));
         _fixture.Options.AddTransactionProcessor(processor);

test/Sentry.Tests/SentryClientTests.cs

@@ -347,7 +347,7 @@ public void CaptureEvent_BeforeSend_Gets_ScopeAttachments()
     public void CaptureEvent_EventProcessor_Gets_Hint()
     {
         // Arrange
-        var processor = Substitute.For<IContextualSentryEventProcessor>();
+        var processor = Substitute.For<ISentryEventProcessorWithHint>();
         processor.Process(Arg.Any<SentryEvent>(), Arg.Any<Hint>()).Returns(new SentryEvent());
         _fixture.SentryOptions.AddEventProcessor(processor);
 
@@ -363,7 +363,7 @@ public void CaptureEvent_EventProcessor_Gets_Hint()
     public void CaptureEvent_EventProcessor_Gets_ScopeAttachments()
     {
         // Arrange
-        var processor = Substitute.For<IContextualSentryEventProcessor>();
+        var processor = Substitute.For<ISentryEventProcessorWithHint>();
         Hint hint = null;
         processor.Process(Arg.Any<SentryEvent>(), Arg.Do<Hint>(h => hint = h)).Returns(new SentryEvent());
         _fixture.SentryOptions.AddEventProcessor(processor);