Improve performance and drop support for old frameworks (#2068)

* Remove WebSocket4Net extension library * Remove UWP support * Drop support for all old frameworks * Update CI * Update CI * Update CI * Update CI * Remove obsolete code * Set default protocol version to 5.0.0 * Remove obsolete tests * Remove old dependencies * Reset release notes * Move server to dedicated project * Fix unit tests * Update and cleanup nuget packages * Fix unit tests Refactor code * No longer throw exception when receiving non success CONNACK * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable nuget signing * Enable code signing * Enable code signing * Enable code signing * Fix client endpoint handling * Improve CI * Fix CI * Fix CI * Fix CI * Fix CI * Import changes from version 4 * Cleanup target frameworks and remove obsolete code * Drop support for dotnet7.0 * Remove managed client * Version5 auditmode (#2016) Added NuGet audit mode and some other settings to get informed about security issues. * Address warnings from analyzers * Support for ReadOnlySequence as payload (#2046) * use ReadOnlySequence as payload * fix build * fix build * skip sign in forks * remove unnecessary owner * tests and extensions * remove test * simplify WritePacketBuffer, remove unused helper * Adjust namespaces * Fix build errors * Import latest fixes from main branch * Adjust namespaces --------- Co-authored-by: SeppPenner <HansM2013@gmx.de> Co-authored-by: Martin Regen <mregen@microsoft.com>
2026-10-22 04:43:04 +08:00 · 2024-08-24 11:47:21 +02:00
parent e18a91a4b5
commit 980a5d0a6d
459 changed files with 12197 additions and 16662 deletions
@@ -7,7 +7,7 @@ using System.IO;
 using System.Threading;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Tests.Mockups;
@@ -4,7 +4,7 @@

 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;

 namespace MQTTnet.Benchmarks
 {
@@ -15,13 +15,13 @@ namespace MQTTnet.Benchmarks
    {
        MqttNetNullLogger _nullLogger;
        MqttNetSourceLogger _sourceNullLogger;
-        
+
        MqttNetEventLogger _eventLogger;
        MqttNetSourceLogger _sourceEventLogger;
-        
+
        MqttNetEventLogger _eventLoggerNoListener;
        MqttNetSourceLogger _sourceEventLoggerNoListener;
-        
+
        bool _useHandler;

        [GlobalSetup]
@@ -29,11 +29,11 @@ namespace MQTTnet.Benchmarks
        {
            _nullLogger = new MqttNetNullLogger();
            _sourceNullLogger = _nullLogger.WithSource("Source");
-            
+
            _eventLogger = new MqttNetEventLogger();
            _eventLogger.LogMessagePublished += OnLogMessagePublished;
            _sourceEventLogger = _eventLogger.WithSource("Source");
-            
+
            _eventLoggerNoListener = new MqttNetEventLogger();
            _sourceEventLoggerNoListener = _eventLoggerNoListener.WithSource("Source");
        }
@@ -50,7 +50,7 @@ namespace MQTTnet.Benchmarks
        public void Log_10000_Messages_No_Listener()
        {
            _useHandler = false;
-            
+
            for (var i = 0; i < 10000; i++)
            {
                _sourceEventLoggerNoListener.Verbose("test log message {0}", "parameter");
@@ -61,24 +61,24 @@ namespace MQTTnet.Benchmarks
        public void Log_10000_Messages_With_To_String()
        {
            _useHandler = true;
-            
+
            for (var i = 0; i < 10000; i++)
            {
                _sourceEventLogger.Verbose("test log message {0}", "parameter");
            }
        }
-        
+
        [Benchmark]
        public void Log_10000_Messages_Without_To_String()
        {
            _useHandler = false;
-            
+
            for (var i = 0; i < 10000; i++)
            {
                _sourceEventLogger.Verbose("test log message {0}", "parameter");
            }
        }
-        
+
        [Benchmark]
        public void Log_10000_Messages_With_NullLogger()
        {
@@ -4,35 +4,27 @@
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <OutputType>Exe</OutputType>
        <DebugType>Full</DebugType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-        <LangVersion>7.2</LangVersion>
+        <TargetFrameworks>net8.0</TargetFrameworks>
        <IsPackable>false</IsPackable>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902;CS8892</NoWarn>
+        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <NuGetAuditMode>all</NuGetAuditMode>
+        <NuGetAudit>true</NuGetAudit>
+        <AnalysisLevel>latest-Recommended</AnalysisLevel>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
-        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    </ItemGroup>
-    
-    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-        <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-        <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.12"/>
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
-        <ProjectReference Include="..\MQTTnet.Tests\MQTTnet.Tests.csproj" />
+        <ProjectReference Include="..\..\Source\MQTTnet.Server\MQTTnet.Server.csproj"/>
+        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj"/>
+        <ProjectReference Include="..\MQTTnet.Tests\MQTTnet.Tests.csproj"/>
+        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj"/>
    </ItemGroup>

 </Project>
@@ -2,232 +2,216 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using BenchmarkDotNet.Attributes;
-using MQTTnet.Client;
-using MQTTnet.Server;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using MQTTnet.Packets;
+using MQTTnet.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[MemoryDiagnoser]
+public class MessageDeliveryBenchmark : BaseBenchmark
 {
-    [MemoryDiagnoser]
-    public class MessageDeliveryBenchmark : BaseBenchmark
+    List<string> _allSubscribedTopics; // Keep track of the subset of topics that are subscribed
+    CancellationTokenSource _cancellationTokenSource;
+
+    object _lockMsgCount;
+    int _messagesExpectedCount;
+    int _messagesReceivedCount;
+    Dictionary<string, IMqttClient> _mqttPublisherClientsByPublisherName;
+
+    MqttServer _mqttServer;
+    List<IMqttClient> _mqttSubscriberClients;
+    Dictionary<string, string> _publisherByTopic;
+    List<MqttApplicationMessage> _topicPublishMessages;
+
+    Dictionary<string, List<string>> _topicsByPublisher;
+
+    [Params(1000, 10000)] public int NumPublishers;
+
+    [Params(5, 10, 20, 50)] public int NumSubscribedTopicsPerSubscriber;
+
+    [Params(10)] public int NumSubscribers;
+
+    [Params(1, 5)] public int NumTopicsPerPublisher;
+
+    [GlobalCleanup]
+    public void Cleanup()
    {
-        List<MqttApplicationMessage> _topicPublishMessages;
-
-        [Params(1, 5)]
-        public int NumTopicsPerPublisher;
-
-        [Params(1000, 10000)]
-        public int NumPublishers;
-
-        [Params(10)]
-        public int NumSubscribers;
-
-        [Params(5, 10, 20, 50)]
-        public int NumSubscribedTopicsPerSubscriber;
-
-        object _lockMsgCount;
-        int _messagesReceivedCount;
-        int _messagesExpectedCount;
-        CancellationTokenSource _cancellationTokenSource;
-
-        MqttServer _mqttServer;
-        List<IMqttClient> _mqttSubscriberClients;
-        Dictionary<string, IMqttClient> _mqttPublisherClientsByPublisherName;
-
-        Dictionary<string, List<string>> _topicsByPublisher;
-        Dictionary<string, string> _publisherByTopic;        
-        List<string> _allSubscribedTopics; // Keep track of the subset of topics that are subscribed
-
-
-        [GlobalSetup]
-        public void Setup()
+        foreach (var mp in _mqttPublisherClientsByPublisherName)
        {
-            _lockMsgCount = new object();
-
-            Dictionary<string, List<string>> singleWildcardTopicsByPublisher;
-            Dictionary<string, List<string>> multiWildcardTopicsByPublisher;
-
-            TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out singleWildcardTopicsByPublisher, out multiWildcardTopicsByPublisher);
-
-            var topics = _topicsByPublisher.First().Value;
-            _topicPublishMessages = new List<MqttApplicationMessage>();
-            // Prepare messages, same for each publisher
-            foreach (var topic in topics)
-            {
-                var message = new MqttApplicationMessageBuilder()
-                    .WithTopic(topic)
-                    .WithPayload(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 })
-                    .Build();
-                _topicPublishMessages.Add(message);
-            }
-
-            // Create server
-            var factory = new MqttFactory();
-            var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-            _mqttServer = factory.CreateMqttServer(serverOptions);
-            _mqttServer.StartAsync().GetAwaiter().GetResult();
-
-            // Create publisher clients
-            _mqttPublisherClientsByPublisherName = new Dictionary<string, IMqttClient>();
-            foreach (var pt in _topicsByPublisher)
-            {
-                var publisherName = pt.Key;
-                var mqttClient = factory.CreateMqttClient();
-                var publisherOptions = new MqttClientOptionsBuilder()
-                    .WithTcpServer("localhost")
-                    .WithClientId(publisherName)
-                    .WithKeepAlivePeriod(TimeSpan.FromSeconds(30))
-                    .Build();
-                mqttClient.ConnectAsync(publisherOptions).GetAwaiter().GetResult();
-                _mqttPublisherClientsByPublisherName.Add(publisherName, mqttClient);
-            }
-
-            // Create subscriber clients
-            _mqttSubscriberClients = new List<IMqttClient>();
-            for (var i = 0; i < NumSubscribers; i++)
-            {
-                var mqttSubscriberClient = factory.CreateMqttClient();
-                _mqttSubscriberClients.Add(mqttSubscriberClient);
-
-                var subscriberOptions = new MqttClientOptionsBuilder()
-                       .WithTcpServer("localhost")
-                       .WithClientId("subscriber" + i)
-                       .Build();
-                mqttSubscriberClient.ApplicationMessageReceivedAsync += r =>
-                {
-                    // count messages and signal cancellation when expected message count is reached
-                    lock (_lockMsgCount)
-                    {
-                        ++_messagesReceivedCount;
-                        if (_messagesReceivedCount == _messagesExpectedCount)
-                        {
-                            _cancellationTokenSource.Cancel();
-                        }
-                    }
-                    return Task.CompletedTask;
-                };
-                mqttSubscriberClient.ConnectAsync(subscriberOptions).GetAwaiter().GetResult();
-            }
-
-
-            List<string> allTopics = new List<string>();
-            _publisherByTopic = new Dictionary<string, string>();
-            foreach (var t in _topicsByPublisher)
-            {
-                foreach (var topic in t.Value)
-                {
-                    _publisherByTopic.Add(topic, t.Key);
-                    allTopics.Add(topic);
-                }
-            }
-
-            // Subscribe to NumSubscribedTopics topics spread across all topics
-            _allSubscribedTopics = new List<string>();
-
-            var totalNumTopics = NumPublishers * NumTopicsPerPublisher;
-            int topicIndexStep = totalNumTopics / (NumSubscribedTopicsPerSubscriber * NumSubscribers);
-            if (topicIndexStep * NumSubscribedTopicsPerSubscriber * NumSubscribers != totalNumTopics)
-            {
-                throw new System.Exception(
-                    String.Format("The total number of topics must be divisible by the number of subscribed topics across all subscribers. Total number of topics: {0}, topic step: {1}", 
-                    totalNumTopics, topicIndexStep
-                    ));
-            }
-
-            var topicIndex = 0;
-            foreach (var mqttSubscriber in _mqttSubscriberClients)
-            {
-                for (var i = 0; i < NumSubscribedTopicsPerSubscriber; ++i, topicIndex += topicIndexStep)
-                {
-                    var topic = allTopics[topicIndex];
-                    _allSubscribedTopics.Add(topic);
-                    var subOptions = new Client.MqttClientSubscribeOptionsBuilder().WithTopicFilter(
-                        new Packets.MqttTopicFilter() { Topic = topic })
-                        .Build();
-                    mqttSubscriber.SubscribeAsync(subOptions).GetAwaiter().GetResult();
-                }
-            }
-
-            Task.Delay(1000).GetAwaiter().GetResult();
+            var mqttPublisherClient = mp.Value;
+            mqttPublisherClient.DisconnectAsync().GetAwaiter().GetResult();
+            mqttPublisherClient.Dispose();
        }

-        /// <summary>
-        /// Publish messages and wait for messages sent to subscribers
-        /// </summary>
-        [Benchmark]
-        public void DeliverMessages()
+        _mqttPublisherClientsByPublisherName.Clear();
+
+        foreach (var mqttSubscriber in _mqttSubscriberClients)
        {
-            // There should be one message received per publish for each subscribed topic
-            _messagesExpectedCount = NumSubscribedTopicsPerSubscriber * NumSubscribers;
-
-            // Loop for a while and exchange messages
-
-            _messagesReceivedCount = 0;
-
-            _cancellationTokenSource = new CancellationTokenSource();
-
-            // same payload for all messages
-            var payload = new byte[] { 1, 2, 3, 4 };
-
-            var tasks = new List<Task>();
-
-            // publish a message for each subscribed topic
-            foreach (var topic in _allSubscribedTopics)
-            {
-                var message = new MqttApplicationMessageBuilder()
-                    .WithTopic(topic)
-                    .WithPayload(payload)
-                    .Build();
-                // pick the correct publisher
-                var publisherName = _publisherByTopic[topic];
-                var publisherClient = _mqttPublisherClientsByPublisherName[publisherName];
-                _ = publisherClient.PublishAsync(message);
-            }
-      
-            // Wait one message per publish to be received by subscriber (in the subscriber's application message handler)
-            try
-            {
-                Task.Delay(30000, _cancellationTokenSource.Token).GetAwaiter().GetResult();
-            }
-            catch
-            {
-
-            }
-
-            _cancellationTokenSource.Dispose();
-
-            if (_messagesReceivedCount < _messagesExpectedCount)
-            {
-                throw new Exception(string.Format("Messages Received Count mismatch, expected {0}, received {1}", _messagesExpectedCount, _messagesReceivedCount));
-            }
+            mqttSubscriber.DisconnectAsync().GetAwaiter().GetResult();
+            mqttSubscriber.Dispose();
        }

-        [GlobalCleanup]
-        public void Cleanup()
+        _mqttSubscriberClients.Clear();
+
+        _mqttServer.StopAsync().GetAwaiter().GetResult();
+        _mqttServer.Dispose();
+        _mqttServer = null;
+    }
+
+    /// <summary>
+    ///     Publish messages and wait for messages sent to subscribers
+    /// </summary>
+    [Benchmark]
+    public void DeliverMessages()
+    {
+        // There should be one message received per publish for each subscribed topic
+        _messagesExpectedCount = NumSubscribedTopicsPerSubscriber * NumSubscribers;
+
+        // Loop for a while and exchange messages
+
+        _messagesReceivedCount = 0;
+
+        _cancellationTokenSource = new CancellationTokenSource();
+
+        // same payload for all messages
+        var payload = new byte[] { 1, 2, 3, 4 };
+
+        var tasks = new List<Task>();
+
+        // publish a message for each subscribed topic
+        foreach (var topic in _allSubscribedTopics)
        {
-            foreach (var mp in _mqttPublisherClientsByPublisherName)
-            {
-                var mqttPublisherClient = mp.Value;
-                mqttPublisherClient.DisconnectAsync().GetAwaiter().GetResult();
-                mqttPublisherClient.Dispose();
-            }
-            _mqttPublisherClientsByPublisherName.Clear();
+            var message = new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(payload).Build();
+            // pick the correct publisher
+            var publisherName = _publisherByTopic[topic];
+            var publisherClient = _mqttPublisherClientsByPublisherName[publisherName];
+            _ = publisherClient.PublishAsync(message);
+        }

-            foreach (var mqttSubscriber in _mqttSubscriberClients)
-            {
-                mqttSubscriber.DisconnectAsync().GetAwaiter().GetResult();
-                mqttSubscriber.Dispose();
-            }
-            _mqttSubscriberClients.Clear();
+        // Wait one message per publish to be received by subscriber (in the subscriber's application message handler)
+        try
+        {
+            Task.Delay(30000, _cancellationTokenSource.Token).GetAwaiter().GetResult();
+        }
+        catch
+        {
+        }

-            _mqttServer.StopAsync().GetAwaiter().GetResult();
-            _mqttServer.Dispose();
-            _mqttServer = null;
+        _cancellationTokenSource.Dispose();
+
+        if (_messagesReceivedCount < _messagesExpectedCount)
+        {
+            throw new Exception(string.Format("Messages Received Count mismatch, expected {0}, received {1}", _messagesExpectedCount, _messagesReceivedCount));
        }
    }
-}
+
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        _lockMsgCount = new object();
+
+        Dictionary<string, List<string>> singleWildcardTopicsByPublisher;
+        Dictionary<string, List<string>> multiWildcardTopicsByPublisher;
+
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out singleWildcardTopicsByPublisher, out multiWildcardTopicsByPublisher);
+
+        var topics = _topicsByPublisher.First().Value;
+        _topicPublishMessages = new List<MqttApplicationMessage>();
+        // Prepare messages, same for each publisher
+        foreach (var topic in topics)
+        {
+            var message = new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }).Build();
+            _topicPublishMessages.Add(message);
+        }
+
+        // Create server
+        var serverFactory = new MqttServerFactory();
+        var clientFactory = new MqttClientFactory();
+        var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
+        _mqttServer = serverFactory.CreateMqttServer(serverOptions);
+        _mqttServer.StartAsync().GetAwaiter().GetResult();
+
+        // Create publisher clients
+        _mqttPublisherClientsByPublisherName = new Dictionary<string, IMqttClient>();
+        foreach (var pt in _topicsByPublisher)
+        {
+            var publisherName = pt.Key;
+            var mqttClient = clientFactory.CreateMqttClient();
+            var publisherOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").WithClientId(publisherName).WithKeepAlivePeriod(TimeSpan.FromSeconds(30)).Build();
+            mqttClient.ConnectAsync(publisherOptions).GetAwaiter().GetResult();
+            _mqttPublisherClientsByPublisherName.Add(publisherName, mqttClient);
+        }
+
+        // Create subscriber clients
+        _mqttSubscriberClients = new List<IMqttClient>();
+        for (var i = 0; i < NumSubscribers; i++)
+        {
+            var mqttSubscriberClient = clientFactory.CreateMqttClient();
+            _mqttSubscriberClients.Add(mqttSubscriberClient);
+
+            var subscriberOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").WithClientId("subscriber" + i).Build();
+            mqttSubscriberClient.ApplicationMessageReceivedAsync += r =>
+            {
+                // count messages and signal cancellation when expected message count is reached
+                lock (_lockMsgCount)
+                {
+                    ++_messagesReceivedCount;
+                    if (_messagesReceivedCount == _messagesExpectedCount)
+                    {
+                        _cancellationTokenSource.Cancel();
+                    }
+                }
+
+                return Task.CompletedTask;
+            };
+            mqttSubscriberClient.ConnectAsync(subscriberOptions).GetAwaiter().GetResult();
+        }
+
+
+        var allTopics = new List<string>();
+        _publisherByTopic = new Dictionary<string, string>();
+        foreach (var t in _topicsByPublisher)
+        {
+            foreach (var topic in t.Value)
+            {
+                _publisherByTopic.Add(topic, t.Key);
+                allTopics.Add(topic);
+            }
+        }
+
+        // Subscribe to NumSubscribedTopics topics spread across all topics
+        _allSubscribedTopics = new List<string>();
+
+        var totalNumTopics = NumPublishers * NumTopicsPerPublisher;
+        var topicIndexStep = totalNumTopics / (NumSubscribedTopicsPerSubscriber * NumSubscribers);
+        if (topicIndexStep * NumSubscribedTopicsPerSubscriber * NumSubscribers != totalNumTopics)
+        {
+            throw new Exception(
+                string.Format(
+                    "The total number of topics must be divisible by the number of subscribed topics across all subscribers. Total number of topics: {0}, topic step: {1}",
+                    totalNumTopics,
+                    topicIndexStep));
+        }
+
+        var topicIndex = 0;
+        foreach (var mqttSubscriber in _mqttSubscriberClients)
+        {
+            for (var i = 0; i < NumSubscribedTopicsPerSubscriber; ++i, topicIndex += topicIndexStep)
+            {
+                var topic = allTopics[topicIndex];
+                _allSubscribedTopics.Add(topic);
+                var subOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(new MqttTopicFilter { Topic = topic }).Build();
+                mqttSubscriber.SubscribeAsync(subOptions).GetAwaiter().GetResult();
+            }
+        }
+
+        Task.Delay(1000).GetAwaiter().GetResult();
+    }
+}
@@ -4,48 +4,45 @@

 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.Client;
 using MQTTnet.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter]
+[RankColumn]
+[MemoryDiagnoser]
+public class MessageProcessingBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class MessageProcessingBenchmark : BaseBenchmark
+    MqttApplicationMessage _message;
+    IMqttClient _mqttClient;
+    MqttServer _mqttServer;
+
+    [Benchmark]
+    public void Send_10000_Messages()
    {
-        MqttServer _mqttServer;
-        IMqttClient _mqttClient;
-        MqttApplicationMessage _message;
-
-        [GlobalSetup]
-        public void Setup()
+        for (var i = 0; i < 10000; i++)
        {
-            var serverOptions = new MqttServerOptionsBuilder().Build();
-            
-            var factory = new MqttFactory();
-            _mqttServer = factory.CreateMqttServer(serverOptions);
-            _mqttClient = factory.CreateMqttClient();
-
-            _mqttServer.StartAsync().GetAwaiter().GetResult();
-
-            var clientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("localhost").Build();
-
-            _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
-
-            _message = new MqttApplicationMessageBuilder()
-                .WithTopic("A")
-                .Build();
-        }
-
-        [Benchmark]
-        public void Send_10000_Messages()
-        {
-            for (var i = 0; i < 10000; i++)
-            {
-                _mqttClient.PublishAsync(_message).GetAwaiter().GetResult();
-            }
+            _mqttClient.PublishAsync(_message).GetAwaiter().GetResult();
        }
    }
-}
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        var serverOptions = new MqttServerOptionsBuilder().Build();
+
+        var serverFactory = new MqttServerFactory();
+        _mqttServer = serverFactory.CreateMqttServer(serverOptions);
+        var clientFactory = new MqttClientFactory();
+        _mqttClient = clientFactory.CreateMqttClient();
+
+        _mqttServer.StartAsync().GetAwaiter().GetResult();
+
+        var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").Build();
+
+        _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
+
+        _message = new MqttApplicationMessageBuilder().WithTopic("A").Build();
+    }
+}
@@ -4,12 +4,10 @@

 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.Client;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using MQTTnet.AspNetCore.Client;
 using MQTTnet.AspNetCore;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;

 namespace MQTTnet.Benchmarks
 {
@@ -38,7 +36,7 @@ namespace MQTTnet.Benchmarks
                   })
                   .Build();

-            var factory = new MqttFactory();
+            var factory = new MqttClientFactory();
            _mqttClient = factory.CreateMqttClient(new MqttNetEventLogger(), new MqttClientConnectionContextFactory());

            _host.StartAsync().GetAwaiter().GetResult();
@@ -3,89 +3,86 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using BenchmarkDotNet.Attributes;
-using MQTTnet.Channel;
-using MQTTnet.Implementations;
-using MQTTnet.Server;
+using System.Buffers;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
+using MQTTnet.Channel;
+using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Implementations;
+using MQTTnet.Server;
+using MQTTnet.Server.Internal.Adapter;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[MemoryDiagnoser]
+public class MqttTcpChannelBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class MqttTcpChannelBenchmark : BaseBenchmark
+    IMqttChannel _clientChannel;
+    MqttServer _mqttServer;
+    IMqttChannel _serverChannel;
+
+    [Benchmark]
+    public async Task Send_10000_Chunks()
    {
-        MqttServer _mqttServer;
-        IMqttChannel _serverChannel;
-        IMqttChannel _clientChannel;
+        var size = 5;
+        var iterations = 10000;

-        [GlobalSetup]
-        public void Setup()
+        await Task.WhenAll(WriteAsync(iterations, size), ReadAsync(iterations, size));
+    }
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        var serverFactory = new MqttServerFactory();
+        var tcpServer = new MqttTcpServerAdapter();
+        tcpServer.ClientHandler += args =>
        {
-            var factory = new MqttFactory();
-            var tcpServer = new MqttTcpServerAdapter();
-            tcpServer.ClientHandler += args =>
-            {
-                _serverChannel =
-                    (IMqttChannel)args.GetType().GetField("_channel",
-                            System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
-                        .GetValue(args);
+            _serverChannel = (IMqttChannel)args.GetType().GetField("_channel", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(args);

-                return Task.CompletedTask;
-            };
+            return Task.CompletedTask;
+        };

-            var serverOptions = new MqttServerOptionsBuilder().Build();
-            _mqttServer = factory.CreateMqttServer(serverOptions, new[] { tcpServer }, new MqttNetEventLogger());
+        var serverOptions = new MqttServerOptionsBuilder().Build();
+        _mqttServer = serverFactory.CreateMqttServer(serverOptions, new[] { tcpServer }, new MqttNetEventLogger());

-            
-            _mqttServer.StartAsync().GetAwaiter().GetResult();

-            var clientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("localhost").Build();
+        _mqttServer.StartAsync().GetAwaiter().GetResult();

-            var tcpOptions = (MqttClientTcpOptions)clientOptions.ChannelOptions;
-            _clientChannel = new MqttTcpChannel(new MqttClientOptions { ChannelOptions = tcpOptions });
+        var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").Build();

-            _clientChannel.ConnectAsync(CancellationToken.None).GetAwaiter().GetResult();
+        var tcpOptions = (MqttClientTcpOptions)clientOptions.ChannelOptions;
+        _clientChannel = new MqttTcpChannel(new MqttClientOptions { ChannelOptions = tcpOptions });
+
+        _clientChannel.ConnectAsync(CancellationToken.None).GetAwaiter().GetResult();
+    }
+
+    async Task ReadAsync(int iterations, int size)
+    {
+        await Task.Yield();
+
+        var expected = iterations * size;
+        long read = 0;
+
+        while (read < expected)
+        {
+            var readResult = await _clientChannel.ReadAsync(new byte[size], 0, size, CancellationToken.None).ConfigureAwait(false);
+            read += readResult;
        }
+    }

-        [Benchmark]
-        public async Task Send_10000_Chunks()
+    async Task WriteAsync(int iterations, int size)
+    {
+        await Task.Yield();
+
+        var buffer = new ReadOnlySequence<byte>(new byte[size]);
+
+        for (var i = 0; i < iterations; i++)
        {
-            var size = 5;
-            var iterations = 10000;
-
-            await Task.WhenAll(WriteAsync(iterations, size), ReadAsync(iterations, size));
-        }
-
-        async Task ReadAsync(int iterations, int size)
-        {
-            await Task.Yield();
-
-            var expected = iterations * size;
-            long read = 0;
-
-            while (read < expected)
-            {
-                var readResult = await _clientChannel.ReadAsync(new byte[size], 0, size, CancellationToken.None).ConfigureAwait(false);
-                read += readResult;
-            }
-        }
-
-        async Task WriteAsync(int iterations, int size)
-        {
-            await Task.Yield();
-
-            var buffer = new ArraySegment<byte>(new byte[size]);
-            
-            for (var i = 0; i < iterations; i++)
-            {
-                await _serverChannel.WriteAsync(buffer, true, CancellationToken.None).ConfigureAwait(false);
-            }
+            await _serverChannel.WriteAsync(buffer, true, CancellationToken.None).ConfigureAwait(false);
        }
    }
 }
@@ -71,7 +71,7 @@ namespace MQTTnet.Benchmarks
                {
                    if (type != typeof(BaseBenchmark))
                    {
-                        benchmarks.Add(type);        
+                        benchmarks.Add(type);
                    }
                }
            }
@@ -87,7 +87,7 @@ namespace MQTTnet.Benchmarks
            }

            // Allow for preselection to avoid developer frustration.
-            
+
            if (int.TryParse(arguments[0], out var benchmarkIndex))
            {
                _selectedBenchmarkIndex = benchmarkIndex;
@@ -111,7 +111,7 @@ namespace MQTTnet.Benchmarks
        {
            Console.Clear();

-            Console.WriteLine($"MQTTnet - Benchmarks ({TargetFrameworkProvider.TargetFramework})");
+            Console.WriteLine($"MQTTnet - Benchmarks");
            Console.WriteLine("-----------------------------------------------");
            Console.ForegroundColor = ConsoleColor.Yellow;
            Console.WriteLine("Press arrow keys for benchmark selection");
@@ -31,12 +31,12 @@ namespace MQTTnet.Benchmarks
            .WithPayload(new byte[10 * 1024])
            .Build();

-            var packet = MqttPacketFactories.Publish.Create(mqttMessage);
+            var packet = MqttPublishPacketFactory.Create(mqttMessage);

            var buffer = mqttPacketFormatter.Encode(packet);
            stream = new MemoryStream();
            stream.Write(buffer.Packet);
-            stream.Write(buffer.Payload);
+            stream.Write(buffer.Payload.ToArray());
            mqttPacketFormatter.Cleanup();
        }

@@ -2,6 +2,7 @@ using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Formatter;
 using System;
+using System.Buffers;
 using System.IO;
 using System.IO.Pipelines;
 using System.Threading.Tasks;
@@ -40,7 +41,7 @@ namespace MQTTnet.Benchmarks
            stream.Position = 0;
            var output = PipeWriter.Create(stream);

-            if (buffer.Payload.Count == 0)
+            if (buffer.Payload.Length == 0)
            {
                await output.WriteAsync(buffer.Packet).ConfigureAwait(false);
            }
@@ -60,7 +61,7 @@ namespace MQTTnet.Benchmarks
            var span = output.GetSpan(buffer.Length);

            buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.AsSpan().CopyTo(span.Slice(buffer.Packet.Count));
+            buffer.Payload.CopyTo(span.Slice(buffer.Packet.Count));

            output.Advance(buffer.Length);
        }
@@ -13,7 +13,8 @@ using MQTTnet.Channel;
 using MQTTnet.Formatter;
 using MQTTnet.Formatter.V3;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
+using System.Buffers;

 namespace MQTTnet.Benchmarks
 {
@@ -104,7 +105,7 @@ namespace MQTTnet.Benchmarks
                return Task.FromResult(count);
            }

-            public Task WriteAsync(ArraySegment<byte> buffer, bool isEndOfPacket, CancellationToken cancellationToken)
+            public Task WriteAsync(ReadOnlySequence<byte> buffer, bool isEndOfPacket, CancellationToken cancellationToken)
            {
                throw new NotSupportedException();
            }
@@ -2,65 +2,59 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Client;
-using MQTTnet.Server;
 using System.Collections.Generic;
 using System.Linq;
+using BenchmarkDotNet.Attributes;
+using MQTTnet.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[MemoryDiagnoser]
+public class SubscribeBenchmark : BaseBenchmark
 {
-    [MemoryDiagnoser]
-    public class SubscribeBenchmark : BaseBenchmark
+    const int NumPublishers = 1;
+    const int NumTopicsPerPublisher = 10000;
+    IMqttClient _mqttClient;
+    MqttServer _mqttServer;
+
+    List<string> _topics;
+
+    [GlobalCleanup]
+    public void Cleanup()
    {
-        MqttServer _mqttServer;
-        IMqttClient _mqttClient;
+        _mqttClient.DisconnectAsync().GetAwaiter().GetResult();
+        _mqttServer.StopAsync().GetAwaiter().GetResult();
+        _mqttServer.Dispose();
+    }

-        const int NumPublishers = 1;
-        const int NumTopicsPerPublisher = 10000;
+    [GlobalSetup]
+    public void Setup()
+    {
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
+        _topics = topicsByPublisher.Values.First();

-        List<string> _topics;
+        var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        [GlobalSetup]
-        public void Setup()
+        var serverFactory = new MqttServerFactory();
+        _mqttServer = serverFactory.CreateMqttServer(serverOptions);
+        var clientFactory = new MqttClientFactory();
+        _mqttClient = clientFactory.CreateMqttClient();
+
+        _mqttServer.StartAsync().GetAwaiter().GetResult();
+
+        var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").Build();
+
+        _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
+    }
+
+    [Benchmark]
+    public void Subscribe_10000_Topics()
+    {
+        foreach (var topic in _topics)
        {
-            TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
-            _topics = topicsByPublisher.Values.First();
+            var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(topic).Build();

-            var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-
-            var factory = new MqttFactory();
-            _mqttServer = factory.CreateMqttServer(serverOptions);
-            _mqttClient = factory.CreateMqttClient();
-
-            _mqttServer.StartAsync().GetAwaiter().GetResult();
-
-            var clientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("localhost").Build();
-
-            _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
-        }
-
-        [GlobalCleanup]
-        public void Cleanup()
-        {
-            _mqttClient.DisconnectAsync().GetAwaiter().GetResult();
-            _mqttServer.StopAsync().GetAwaiter().GetResult();
-            _mqttServer.Dispose();
-        }
-
-        [Benchmark]
-        public void Subscribe_10000_Topics()
-        {
-            foreach (var topic in _topics)
-            {
-                var subscribeOptions = new MqttClientSubscribeOptionsBuilder()
-                       .WithTopicFilter(topic, Protocol.MqttQualityOfServiceLevel.AtMostOnce)
-                       .Build();
-                
-                _mqttClient.SubscribeAsync(subscribeOptions).GetAwaiter().GetResult();
-            }
+            _mqttClient.SubscribeAsync(subscribeOptions).GetAwaiter().GetResult();
        }
    }
-}
+}
@@ -9,7 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using MQTTnet.AspNetCore.Client.Tcp;
+using MQTTnet.AspNetCore;

 namespace MQTTnet.Benchmarks
 {
@@ -2,63 +2,56 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using BenchmarkDotNet.Attributes;
-using MQTTnet.Client;
-using MQTTnet.Server;
 using System.Collections.Generic;
 using System.Linq;
+using BenchmarkDotNet.Attributes;
+using MQTTnet.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[MemoryDiagnoser]
+public class UnsubscribeBenchmark : BaseBenchmark
 {
-    [MemoryDiagnoser]
-    public class UnsubscribeBenchmark : BaseBenchmark 
+    const int NumPublishers = 1;
+    const int NumTopicsPerPublisher = 10000;
+    IMqttClient _mqttClient;
+    MqttServer _mqttServer;
+
+    List<string> _topics;
+
+    [GlobalSetup]
+    public void Setup()
    {
-        MqttServer _mqttServer;
-        IMqttClient _mqttClient;
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
+        _topics = topicsByPublisher.Values.First();

-        const int NumPublishers = 1;
-        const int NumTopicsPerPublisher = 10000;
+        var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        List<string> _topics;
+        var serverFactory = new MqttServerFactory();
+        _mqttServer = serverFactory.CreateMqttServer(serverOptions);
+        var clientFactory = new MqttClientFactory();
+        _mqttClient = clientFactory.CreateMqttClient();

-        [GlobalSetup]
-        public void Setup()
+        _mqttServer.StartAsync().GetAwaiter().GetResult();
+
+        var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").Build();
+
+        _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
+
+        foreach (var topic in _topics)
        {
-            TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
-            _topics = topicsByPublisher.Values.First();
-
-            var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-
-            var factory = new MqttFactory();
-            _mqttServer = factory.CreateMqttServer(serverOptions);
-            _mqttClient = factory.CreateMqttClient();
-
-            _mqttServer.StartAsync().GetAwaiter().GetResult();
-
-            var clientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("localhost").Build();
-
-            _mqttClient.ConnectAsync(clientOptions).GetAwaiter().GetResult();
-
-            foreach (var topic in _topics)
-            {
-                var subscribeOptions = new MqttClientSubscribeOptionsBuilder()
-                       .WithTopicFilter(topic)
-                       .Build();
-                _mqttClient.SubscribeAsync(subscribeOptions).GetAwaiter().GetResult();
-            }
-        }
-
-        [Benchmark]
-        public void Unsubscribe_10000_Topics()
-        {
-            foreach (var topic in _topics)
-            {
-                var unsubscribeOptions = new MqttClientUnsubscribeOptionsBuilder()
-                       .WithTopicFilter(topic)
-                       .Build();
-                _mqttClient.UnsubscribeAsync(unsubscribeOptions).GetAwaiter().GetResult();
-            }
+            var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(topic).Build();
+            _mqttClient.SubscribeAsync(subscribeOptions).GetAwaiter().GetResult();
        }
    }
-}
+
+    [Benchmark]
+    public void Unsubscribe_10000_Topics()
+    {
+        foreach (var topic in _topics)
+        {
+            var unsubscribeOptions = new MqttClientUnsubscribeOptionsBuilder().WithTopicFilter(topic).Build();
+            _mqttClient.UnsubscribeAsync(unsubscribeOptions).GetAwaiter().GetResult();
+        }
+    }
+}