diff --git a/src/Orleans.Core/Runtime/InvokableObjectManager.cs b/src/Orleans.Core/Runtime/InvokableObjectManager.cs index f45a8881aa6..1e0dd9dbd19 100644 --- a/src/Orleans.Core/Runtime/InvokableObjectManager.cs +++ b/src/Orleans.Core/Runtime/InvokableObjectManager.cs @@ -383,7 +383,7 @@ private async Task ProcessMessageAsync(Message message) var filters = _manager.GrainCallFilters; Response response; - if (filters is { Count: > 0 } || LocalObject is IIncomingGrainCallFilter) + if (filters is { Count: > 0 } || LocalObject.Target is IIncomingGrainCallFilter) { var invoker = new GrainMethodInvoker(message, this, request, filters, _manager._interfaceToImplementationMapping, _manager._responseCopier); await invoker.Invoke(); diff --git a/test/Orleans.Core.Tests/Runtime/DrainTestHelpers.cs b/test/Orleans.Core.Tests/Runtime/DrainTestHelpers.cs index 605053ca223..b0a8056190c 100644 --- a/test/Orleans.Core.Tests/Runtime/DrainTestHelpers.cs +++ b/test/Orleans.Core.Tests/Runtime/DrainTestHelpers.cs @@ -93,7 +93,6 @@ protected virtual async ValueTask InvokeCoreAsync() string IInvokable.GetMethodName() => nameof(IInvokable.Invoke); string IInvokable.GetInterfaceName() => InterfaceType.FullName!; string IInvokable.GetActivityName() => $"{InterfaceType.FullName}.{nameof(IInvokable.Invoke)}"; - // IInvokable permits null metadata; these fixtures use the no-incoming-filters fast path. MethodInfo IInvokable.GetMethod() => null!; CancellationToken IInvokable.GetCancellationToken() => RequestCancellationToken; bool IInvokable.TryCancel() => CancelRequest(); diff --git a/test/Orleans.Core.Tests/Runtime/InvokableObjectManagerTests.cs b/test/Orleans.Core.Tests/Runtime/InvokableObjectManagerTests.cs index 9b78e9f8cba..5778c84a355 100644 --- a/test/Orleans.Core.Tests/Runtime/InvokableObjectManagerTests.cs +++ b/test/Orleans.Core.Tests/Runtime/InvokableObjectManagerTests.cs @@ -23,6 +23,23 @@ namespace UnitTests.Runtime; [TestCategory("BVT")] public class InvokableObjectManagerTests { + [Fact] + public async Task Dispatch_InvokesObserverFilterWithoutSystemWideFilters() + { + var observer = new FilteringObserver(); + await using var fixture = new ManagerFixture(observer: observer); + var body = new TestInvokable("observer-result"); + body.Release.TrySetResult(); + var message = fixture.Request(11, body); + + fixture.Manager.Dispatch(message); + await fixture.WaitAsync(fixture.StopAsync(), "observer filter and invocation drain"); + + Assert.Equal(1, observer.InvocationCount); + fixture.AssertSuccess(message, body, "filtered-observer-result"); + fixture.AssertResponseCount(1); + } + [Fact] public async Task StopAsync_WaitsForRunningNormalInvocation() { @@ -545,6 +562,19 @@ public async Task StopAsync_WaitsForTerminalResponseHandling() } } + private sealed class FilteringObserver : IGrainObserver, IIncomingGrainCallFilter + { + internal int InvocationCount { get; private set; } + + async Task IIncomingGrainCallFilter.Invoke(IIncomingGrainCallContext context) + { + InvocationCount++; + Assert.Same(this, context.Grain); + await context.Invoke(); + context.Result = $"filtered-{context.Result}"; + } + } + private sealed class ManagerFixture : IAsyncDisposable { private readonly ServiceProvider _services; @@ -555,9 +585,10 @@ private sealed class ManagerFixture : IAsyncDisposable private readonly ConcurrentDictionary _responseSignals = new(); private readonly List _stops = []; - internal ManagerFixture(bool registerObserver = true, [CallerMemberName] string testName = "") + internal ManagerFixture(bool registerObserver = true, IGrainObserver? observer = null, [CallerMemberName] string testName = "") { _testName = testName; + Observer = observer ?? new DrainObserver(); var services = new ServiceCollection(); services.AddSerializer(); services.AddLogging(); @@ -586,7 +617,7 @@ internal ManagerFixture(bool registerObserver = true, [CallerMemberName] string } } - internal DrainObserver Observer { get; } = new(); + internal IGrainObserver Observer { get; } internal ObserverGrainId ObserverId { get; } = ObserverGrainId.Create(ClientGrainId.Create("observer-drain"), IdSpan.Create("observer")); internal GrainId Sender { get; } = ClientGrainId.Create("observer-drain-sender").GrainId;