Skip to content

Upated to latest versions of NSB and MT #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phatboyg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upated to latest versions of NSB and MT #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="ServerUri" value="rabbitmq://localhost/"/>
<add key="Username" value="guest"/>
<add key="Password" value="guest"/>
<add key="MessageSize" value="2048"/>
<add key="ExpectReply" value="true"/>
<add key="NoOfThreads" value="10"/>
<add key="MessagesPerThread" value="5000"/>

<add key="ExpectReply" value="false"/>
<add key="NoOfThreads" value="20"/>
<add key="MessagesPerThread" value="4000"/>
<add key="PublisherConfirmation" value="false"/>
<add key="PrefetchCount" value="50"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
</startup>
</configuration>
</configuration>
27 changes: 16 additions & 11 deletions ...itMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/MassTransitTestClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MassTransitTestClient</RootNamespace>
<AssemblyName>MassTransitTestClient</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -32,24 +33,28 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MassTransit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.3.1.2\lib\net45\MassTransit.dll</HintPath>
<Reference Include="GreenPipes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
<HintPath>..\packages\GreenPipes.1.0.9\lib\net452\GreenPipes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MassTransit.RabbitMqTransport, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.RabbitMQ.3.1.2\lib\net45\MassTransit.RabbitMqTransport.dll</HintPath>
<Reference Include="MassTransit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.3.5.4\lib\net452\MassTransit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NewId, Version=2.1.3.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\NewId.2.1.3\lib\net45\NewId.dll</HintPath>
<Reference Include="MassTransit.RabbitMqTransport, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.RabbitMQ.3.5.4\lib\net452\MassTransit.RabbitMqTransport.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="NewId, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\NewId.3.0.0\lib\net452\NewId.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
19 changes: 15 additions & 4 deletions src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ private static void Main(string[] args)
{
var taskCount = int.Parse(ConfigurationManager.AppSettings["NoOfThreads"]);

var prefetchCount = ushort.Parse(ConfigurationManager.AppSettings["PrefetchCount"] ?? "50");

var publisherConfirmation = bool.Parse(ConfigurationManager.AppSettings["PublisherConfirmation"] ?? "true");

var busControl = Bus.Factory.CreateUsingRabbitMq(cfg =>
{
cfg.PrefetchCount = 50;
cfg.PrefetchCount = prefetchCount;
cfg.Durable = false;
cfg.AutoDelete = true;

var host = cfg.Host(new Uri(ConfigurationManager.AppSettings["ServerUri"]), h =>
{
h.Username(ConfigurationManager.AppSettings["Username"]);
h.Password(ConfigurationManager.AppSettings["Password"]);

h.PublisherConfirmation = publisherConfirmation;
});
});

Expand All @@ -32,15 +38,20 @@ private static void Main(string[] args)
var serviceUri =
new Uri(ConfigurationManager.AppSettings["ServerUri"] +
(!expectReply
? "masstransit_message_service"
? "masstransit_message_service?durable=false&autodelete=true"
: "masstransit_message_service_rpc?durable=false&autodelete=true"));
var iterationsPerTask = int.Parse(ConfigurationManager.AppSettings["MessagesPerThread"]);

ISendEndpoint endpoint = null;
IRequestClient<Message, Message> client = null;
if (expectReply)
{
client = busControl.CreateRequestClient<Message, Message>(serviceUri, timeout);
}
else
{
endpoint = busControl.GetSendEndpoint(serviceUri).Result;
}

var tasks = new Task[taskCount];
for (var t = 0; t < taskCount; t++)
Expand All @@ -53,11 +64,11 @@ private static void Main(string[] args)
msg = new Message {Body = BodyGenerator.GetNext()};
if (expectReply)
{
var res = client.Request(msg).Result;
client.Request(msg).Wait();
}
else
{
busControl.Publish(msg).Wait();
endpoint.Send(msg).Wait();
}
}
}, TaskCreationOptions.LongRunning);
Expand Down
11 changes: 6 additions & 5 deletions ...nchmarks/RabbitMQ/MassTransit/MassTransitTestClient/MassTransitTestClient/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MassTransit" version="3.1.2" targetFramework="net45" />
<package id="MassTransit.RabbitMQ" version="3.1.2" targetFramework="net45" />
<package id="NewId" version="2.1.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
<package id="RabbitMQ.Client" version="3.6.0" targetFramework="net45" />
<package id="GreenPipes" version="1.0.9" targetFramework="net452" />
<package id="MassTransit" version="3.5.4" targetFramework="net452" />
<package id="MassTransit.RabbitMQ" version="3.5.4" targetFramework="net452" />
<package id="NewId" version="3.0.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
<package id="RabbitMQ.Client" version="4.1.1" targetFramework="net452" />
</packages>
3 changes: 2 additions & 1 deletion src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestCommon/MassTransitTestCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MassTransitTestCommon</RootNamespace>
<AssemblyName>MassTransitTestCommon</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
10 changes: 6 additions & 4 deletions src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="ServerUri" value="rabbitmq://localhost/"/>
<add key="Username" value="guest"/>
<add key="Password" value="guest"/>
<add key="MessageSize" value="2048"/>
<add key="Reply" value="true"/>
<add key="Reply" value="false"/>
<add key="PublisherConfirmation" value="false"/>
<add key="PrefetchCount" value="50"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
</startup>
</configuration>
</configuration>
27 changes: 16 additions & 11 deletions ...itMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/MassTransitTestServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MassTransitTestServer</RootNamespace>
<AssemblyName>MassTransitTestServer</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -32,24 +33,28 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="MassTransit, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.3.1.2\lib\net45\MassTransit.dll</HintPath>
<Reference Include="GreenPipes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
<HintPath>..\packages\GreenPipes.1.0.9\lib\net452\GreenPipes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MassTransit.RabbitMqTransport, Version=3.1.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.RabbitMQ.3.1.2\lib\net45\MassTransit.RabbitMqTransport.dll</HintPath>
<Reference Include="MassTransit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.3.5.4\lib\net452\MassTransit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NewId, Version=2.1.3.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\NewId.2.1.3\lib\net45\NewId.dll</HintPath>
<Reference Include="MassTransit.RabbitMqTransport, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\MassTransit.RabbitMQ.3.5.4\lib\net452\MassTransit.RabbitMqTransport.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="NewId, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b8e0e9f2f1e657fa, processorArchitecture=MSIL">
<HintPath>..\packages\NewId.3.0.0\lib\net452\NewId.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RabbitMQ.Client, Version=3.6.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.3.6.0\lib\net45\RabbitMQ.Client.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
62 changes: 31 additions & 31 deletions src/Benchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
using MassTransit;
using MassTransitTestCommon;
using System;
using System.Configuration;
using System.Threading.Tasks;

namespace MassTransitTestServer
namespace MassTransitTestServer
{
using System;
using System.Configuration;
using System.Threading.Tasks;
using MassTransit;
using MassTransitTestCommon;


class Program
{
static void Main(string[] args)
{
{
var busControl = Bus.Factory.CreateUsingRabbitMq(cfg =>
{
var host = cfg.Host(new Uri(ConfigurationManager.AppSettings["ServerUri"]), h =>
{
h.Username(ConfigurationManager.AppSettings["Username"]);
h.Password(ConfigurationManager.AppSettings["Password"]);
});

var reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");

var queueName = !reply ? "masstransit_message_service" : "masstransit_message_service_rpc";
cfg.ReceiveEndpoint(host, queueName, e =>
{
e.AutoDelete = true;
e.Durable = false;
e.PrefetchCount = 50;
e.Consumer<MessageConsumer>();
});
});
{
var host = cfg.Host(new Uri(ConfigurationManager.AppSettings["ServerUri"]), h =>
{
h.Username(ConfigurationManager.AppSettings["Username"]);
h.Password(ConfigurationManager.AppSettings["Password"]);
});

var reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");
var prefetchCount = ushort.Parse(ConfigurationManager.AppSettings["PrefetchCount"] ?? "50");

var queueName = !reply ? "masstransit_message_service" : "masstransit_message_service_rpc";
cfg.ReceiveEndpoint(host, queueName, e =>
{
e.AutoDelete = true;
e.Durable = false;
e.PrefetchCount = prefetchCount;
e.Consumer<MessageConsumer>();
});
});

busControl.Start();

Expand All @@ -40,14 +42,12 @@ static void Main(string[] args)

public class MessageConsumer : IConsumer<Message>
{
private static bool reply = bool.Parse(ConfigurationManager.AppSettings["Reply"] ?? "false");

public async Task Consume(ConsumeContext<Message> context)
{
if (reply)
if (context.ResponseAddress != null)
{
await context.RespondAsync(new Message { Body = BodyGenerator.GetNext() });
context.Respond(new Message {Body = BodyGenerator.GetNext()});
}
}
}
}
}
11 changes: 6 additions & 5 deletions ...nchmarks/RabbitMQ/MassTransit/MassTransitTestServer/MassTransitTestServer/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MassTransit" version="3.1.2" targetFramework="net45" />
<package id="MassTransit.RabbitMQ" version="3.1.2" targetFramework="net45" />
<package id="NewId" version="2.1.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
<package id="RabbitMQ.Client" version="3.6.0" targetFramework="net45" />
<package id="GreenPipes" version="1.0.9" targetFramework="net452" />
<package id="MassTransit" version="3.5.4" targetFramework="net452" />
<package id="MassTransit.RabbitMQ" version="3.5.4" targetFramework="net452" />
<package id="NewId" version="3.0.0" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
<package id="RabbitMQ.Client" version="4.1.1" targetFramework="net452" />
</packages>
12 changes: 6 additions & 6 deletions src/Benchmarks/RabbitMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
</configSections>

<appSettings>
<add key="ServerConnectionString" value="host=localhost;PrefetchCount=50;UsePublisherConfirms=false" />
<add key="ServerConnectionString" value="host=localhost" />
<add key="MessageSize" value="2048" />
<add key="ExpectReply" value="true" />
<add key="ExpectReply" value="false" />

<add key="NoOfThreads" value="10" />
<add key="MessagesPerThread" value="5000" />
<add key="NoOfThreads" value="20" />
<add key="MessagesPerThread" value="4000" />

</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>

<!--
Expand All @@ -31,4 +31,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
15 changes: 8 additions & 7 deletions ...itMQ/NServiceBus/NServiceBusTestClient/NServiceBusTestClient/NServiceBusTestClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NServiceBusTestClient</RootNamespace>
<AssemblyName>NServiceBusTestClient</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -32,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.5.2.12\lib\net45\NServiceBus.Core.dll</HintPath>
<Reference Include="NServiceBus.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.6.1.2\lib\net452\NServiceBus.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NServiceBus.Transports.RabbitMQ, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.RabbitMQ.3.0.1\lib\net45\NServiceBus.Transports.RabbitMQ.dll</HintPath>
<Reference Include="NServiceBus.Transports.RabbitMQ, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.RabbitMQ.4.2.0\lib\net452\NServiceBus.Transports.RabbitMQ.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RabbitMQ.Client, Version=3.5.7.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.3.5.7\lib\net40\RabbitMQ.Client.dll</HintPath>
<Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.4.1.0\lib\net451\RabbitMQ.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
Loading