Auto-detect AutoComplete setting

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/FunctionEndpoint.cs

@@ -11,6 +11,7 @@
     using Logging;
     using Microsoft.Azure.ServiceBus;
     using Microsoft.Azure.ServiceBus.Core;
+    using Microsoft.Azure.WebJobs;
     using Microsoft.Extensions.Logging;
     using Transport;
     using ExecutionContext = Microsoft.Azure.WebJobs.ExecutionContext;
@@ -29,8 +30,17 @@ internal FunctionEndpoint(IStartableEndpointWithExternallyManagedContainer exter
             endpointFactory = _ => externallyManagedContainerEndpoint.Start(serviceProvider);
         }
 
+        /// <summary>
+        /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline. This method will lookup the <see cref="ServiceBusTriggerAttribute.AutoComplete"/> setting to determine whether to use transactional or non-transactional processing.
+        /// </summary>
+        public Task Process(Message message, ExecutionContext executionContext, IMessageReceiver messageReceiver, ILogger functionsLogger = null) =>
+            ReflectionHelper.GetAutoCompleteValue()
+                ? ProcessNonTransactional(message, executionContext, messageReceiver, functionsLogger)
+                : ProcessTransactional(message, executionContext, messageReceiver, functionsLogger);
+
         /// <summary>
         /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline. All messages are committed transactionally with the successful processing of the incoming message.
+        /// <remarks>Requires <see cref="ServiceBusTriggerAttribute.AutoComplete"/> to be set to false!</remarks>
         /// </summary>
         public async Task ProcessTransactional(Message message, ExecutionContext executionContext, IMessageReceiver messageReceiver, ILogger functionsLogger = null)
         {
@@ -57,6 +67,15 @@ await InitializeEndpointIfNecessary(functionExecutionContext, CancellationToken.
         /// <summary>
         /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline.
         /// </summary>
+        public Task ProcessNonTransactional(Message message, ExecutionContext executionContext, IMessageReceiver messageReceiver, ILogger functionsLogger = null) => Process(message, executionContext, functionsLogger);
+
+        /// <summary>
+        /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline.
+        /// </summary>
+        [ObsoleteEx(
+            ReplacementTypeOrMember = "Process(Message, ExecutionContext, IMessageReceiver, ILogger)",
+            TreatAsErrorFromVersion = "2",
+            RemoveInVersion = "3")]
         public async Task Process(Message message, ExecutionContext executionContext, ILogger functionsLogger = null)
         {
             FunctionsLoggerFactory.Instance.SetCurrentLogger(functionsLogger);

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/IFunctionEndpoint.cs

@@ -14,13 +14,17 @@
     public interface IFunctionEndpoint
     {
         /// <summary>
-        /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline. All messages are committed transactionally with the successful processing of the incoming message.
+        /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline. This method will lookup the <see cref="ServiceBusTriggerAttribute.AutoComplete"/> setting to determine whether to use transactional or non-transactional processing.
         /// </summary>
-        Task ProcessTransactional(Message message, ExecutionContext executionContext, IMessageReceiver messageReceiver, ILogger functionsLogger = null);
+        Task Process(Message message, ExecutionContext executionContext, IMessageReceiver messageReceiver, ILogger functionsLogger = null);
 
         /// <summary>
         /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline.
         /// </summary>
+        [ObsoleteEx(
+            ReplacementTypeOrMember = "Process(Message, ExecutionContext, IMessageReceiver, ILogger)",
+            TreatAsErrorFromVersion = "2",
+            RemoveInVersion = "3")]
         Task Process(Message message, ExecutionContext executionContext, ILogger functionsLogger = null);
 
         /// <summary>

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/ReflectionHelper.cs

@@ -0,0 +1,50 @@
+namespace NServiceBus.AzureFunctions.InProcess.ServiceBus
+{
+    using System;
+    using System.Diagnostics;
+    using System.Reflection;
+    using Microsoft.Azure.ServiceBus;
+    using Microsoft.Azure.WebJobs;
+
+    class ReflectionHelper
+    {
+        public static bool GetAutoCompleteValue()
+        {
+            var triggerAttribute = FindTriggerAttributeInternal();
+            if (triggerAttribute != null)
+            {
+                return triggerAttribute.AutoComplete;
+            }
+
+            throw new Exception($"Could not locate {nameof(ServiceBusTriggerAttribute)} to infer the AutoComplete setting. Make sure that the function trigger contains a parameter decorated with {nameof(ServiceBusTriggerAttribute)} or use the advanced APIs exposed via the {nameof(FunctionEndpoint)} type instead.");
+        }
+
+        public static ServiceBusTriggerAttribute FindBusTriggerAttribute() => FindTriggerAttributeInternal();
+
+        static ServiceBusTriggerAttribute FindTriggerAttributeInternal()
+        {
+            var st = new StackTrace(skipFrames: 2); // skip first two frames because it is this method + the public method
+            var frames = st.GetFrames();
+            foreach (var frame in frames)
+            {
+                var method = frame?.GetMethod();
+                if (method?.GetCustomAttribute<FunctionNameAttribute>(false) != null)
+                {
+                    foreach (var parameter in method.GetParameters())
+                    {
+                        ServiceBusTriggerAttribute serviceBusTriggerAttribute;
+                        if (parameter.ParameterType == typeof(Message)
+                            && (serviceBusTriggerAttribute = parameter.GetCustomAttribute<ServiceBusTriggerAttribute>(false)) != null)
+                        {
+                            return serviceBusTriggerAttribute;
+                        }
+                    }
+
+                    return null;
+                }
+            }
+
+            return null;
+        }
+    }
+}

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/ServiceBusTriggeredEndpointConfiguration.cs

@@ -4,7 +4,6 @@
     using System.Threading.Tasks;
     using AzureFunctions.InProcess.ServiceBus;
     using Logging;
-    using Microsoft.Azure.WebJobs;
     using Serialization;
     using Transport;
 
@@ -77,10 +76,10 @@ public ServiceBusTriggeredEndpointConfiguration(string endpointName, string conn
         /// </summary>
         public static ServiceBusTriggeredEndpointConfiguration FromAttributes()
         {
-            var configuration = TriggerDiscoverer.TryGet<ServiceBusTriggerAttribute>();
-            if (configuration != null)
+            var serviceBusTriggerAttribute = ReflectionHelper.FindBusTriggerAttribute();
+            if (serviceBusTriggerAttribute != null)
             {
-                return new ServiceBusTriggeredEndpointConfiguration(configuration.QueueName, configuration.Connection);
+                return new ServiceBusTriggeredEndpointConfiguration(serviceBusTriggerAttribute.QueueName, serviceBusTriggerAttribute.Connection);
             }
 
             throw new Exception(

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.Can_enable_transactions.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.Can_override_trigger_function_name.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }
@@ -23,6 +23,6 @@ class FunctionEndpointTrigger
         ILogger logger,
         ExecutionContext executionContext)
     {
-        await endpoint.Process(message, executionContext, logger);
+        await endpoint.ProcessNonTransactional(message, executionContext, messageReceiver, logger);
     }
 }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.NameIsStringValue.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }
@@ -23,6 +23,6 @@ class FunctionEndpointTrigger
         ILogger logger,
         ExecutionContext executionContext)
     {
-        await endpoint.Process(message, executionContext, logger);
+        await endpoint.ProcessNonTransactional(message, executionContext, messageReceiver, logger);
     }
 }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.Two_optionals_out_of_order.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.Use_two_optionals.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.UsingFullyQualifiedAttributeName.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }
@@ -23,6 +23,6 @@ class FunctionEndpointTrigger
         ILogger logger,
         ExecutionContext executionContext)
     {
-        await endpoint.Process(message, executionContext, logger);
+        await endpoint.ProcessNonTransactional(message, executionContext, messageReceiver, logger);
     }
 }

src/NServiceBus.AzureFunctions.SourceGenerator.Tests/ApprovalFiles/SourceGeneratorApprovals2.UsingNamespace.approved.txt

@@ -8,9 +8,9 @@ using NServiceBus;
 
 class FunctionEndpointTrigger
 {
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {
         this.endpoint = endpoint;
     }
@@ -23,6 +23,6 @@ class FunctionEndpointTrigger
         ILogger logger,
         ExecutionContext executionContext)
     {
-        await endpoint.Process(message, executionContext, logger);
+        await endpoint.ProcessNonTransactional(message, executionContext, messageReceiver, logger);
     }
 }

src/NServiceBus.AzureFunctions.SourceGenerator/TriggerFunctionGenerator2.cs

@@ -116,9 +116,9 @@ public void Execute(GeneratorExecutionContext context)
 
 class FunctionEndpointTrigger
 {{
-    readonly IFunctionEndpoint endpoint;
+    readonly FunctionEndpoint endpoint;
 
-    public FunctionEndpointTrigger(IFunctionEndpoint endpoint)
+    public FunctionEndpointTrigger(FunctionEndpoint endpoint)
     {{
         this.endpoint = endpoint;
     }}
@@ -133,7 +133,7 @@ public async Task Run(
     {{
         {(syntaxReceiver.enableCrossEntityTransactions
             ? "await endpoint.ProcessTransactional(message, executionContext, messageReceiver, logger);"
-            : "await endpoint.Process(message, executionContext, logger);")}
+            : "await endpoint.ProcessNonTransactional(message, executionContext, messageReceiver, logger);")}
     }}
 }}";
             context.AddSource("NServiceBus__FunctionEndpointTrigger", SourceText.From(source, Encoding.UTF8));

src/ServiceBus.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -3,7 +3,11 @@ namespace NServiceBus
 {
     public class FunctionEndpoint : NServiceBus.IFunctionEndpoint
     {
+        [System.Obsolete("Use `Process(Message, ExecutionContext, IMessageReceiver, ILogger)` instead. Will" +
+            " be treated as an error from version 2.0.0. Will be removed in version 3.0.0.", false)]
         public System.Threading.Tasks.Task Process(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
+        public System.Threading.Tasks.Task Process(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Azure.ServiceBus.Core.IMessageReceiver messageReceiver, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
+        public System.Threading.Tasks.Task ProcessNonTransactional(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Azure.ServiceBus.Core.IMessageReceiver messageReceiver, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
         public System.Threading.Tasks.Task ProcessTransactional(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Azure.ServiceBus.Core.IMessageReceiver messageReceiver, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
         public System.Threading.Tasks.Task Publish(object message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
         public System.Threading.Tasks.Task Publish(object message, NServiceBus.PublishOptions options, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null) { }
@@ -30,8 +34,10 @@ namespace NServiceBus
     }
     public interface IFunctionEndpoint
     {
+        [System.Obsolete("Use `Process(Message, ExecutionContext, IMessageReceiver, ILogger)` instead. Will" +
+            " be treated as an error from version 2.0.0. Will be removed in version 3.0.0.", false)]
         System.Threading.Tasks.Task Process(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null);
-        System.Threading.Tasks.Task ProcessTransactional(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Azure.ServiceBus.Core.IMessageReceiver messageReceiver, Microsoft.Extensions.Logging.ILogger functionsLogger = null);
+        System.Threading.Tasks.Task Process(Microsoft.Azure.ServiceBus.Message message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Azure.ServiceBus.Core.IMessageReceiver messageReceiver, Microsoft.Extensions.Logging.ILogger functionsLogger = null);
         System.Threading.Tasks.Task Publish(object message, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null);
         System.Threading.Tasks.Task Publish(object message, NServiceBus.PublishOptions options, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null);
         System.Threading.Tasks.Task Publish<T>(System.Action<T> messageConstructor, Microsoft.Azure.WebJobs.ExecutionContext executionContext, Microsoft.Extensions.Logging.ILogger functionsLogger = null);

src/ServiceBus.Tests/FunctionEndpointComponent.cs

@@ -100,7 +100,7 @@ public override async Task ComponentsStarted(CancellationToken token)
                 {
                     var transportMessage = MessageHelper.GenerateMessage(message);
                     var context = new ExecutionContext();
-                    await endpoint.Process(transportMessage, context);
+                    await endpoint.ProcessNonTransactional(transportMessage, context, null);
                 }
             }