Skip to content

Commit d6bf8b1

Browse files
serkantkaracaserkantkaraca
authored
Merge pull request #472 from spelluru/ehubegridintegration1207
updated to use Azure.Messaging.EventHubs 5.2 - latest stable version
2 parents 3af21a2 + e9e01dd commit d6bf8b1

File tree

4 files changed

+48
-28
lines changed

4 files changed

+48
-28
lines changed

‎samples/e2e/EventHubsCaptureEventGridDemo/WindTurbineDataGenerator/App.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
2222
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
2323
</dependentAssembly>
24+
<dependentAssembly>
25+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
26+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
27+
</dependentAssembly>
28+
<dependentAssembly>
29+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
31+
</dependentAssembly>
2432
</assemblyBinding>
2533
</runtime>
2634
</configuration>

‎samples/e2e/EventHubsCaptureEventGridDemo/WindTurbineDataGenerator/Program.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Threading.Tasks;
88
using Newtonsoft.Json;
99
using Azure.Messaging.EventHubs;
10+
using Azure.Messaging.EventHubs.Producer;
1011

1112
namespace WindTurbineDataGenerator
1213
{
@@ -39,31 +40,30 @@ private static async Task StartEventGenerationAsync(CancellationToken cancellati
3940
{
4041
var random = new Random((int)DateTimeOffset.UtcNow.Ticks);
4142

42-
// create an Event Hubs client using the namespace connection string and the event hub name
43-
EventHubClient client = new EventHubClient(EventHubConnectionString, EventHubName);
44-
45-
// create a producer object to send messages to the event hub
46-
EventHubProducer producer = client.CreateProducer();
43+
// create an Event Hubs Producer client using the namespace connection string and the event hub name
44+
EventHubProducerClient producerClient = new EventHubProducerClient(EventHubConnectionString, EventHubName);
4745

4846
while (!cancellationToken.IsCancellationRequested)
4947
{
5048
try
5149
{
5250
// Simulate sending data from 100 weather sensors
53-
var devicesData = new List<EventData>();
54-
51+
// prepare a batch of events to send to the event hub.
52+
EventDataBatch eventBatch = await producerClient.CreateBatchAsync();
5553
for (int i = 0; i < 100; i++)
5654
{
5755
int scaleFactor = random.Next(0, 25);
5856
var windTurbineMeasure = GenerateTurbineMeasure("Turbine_" + i, scaleFactor);
5957
EventData evData = SerializeWindTurbineToEventData(windTurbineMeasure);
60-
devicesData.Add(evData);
58+
// add the event to the batch
59+
if (eventBatch.TryAdd(evData) == false)
60+
break;
6161
}
6262

6363
Console.Write(".");
6464

65-
// send the message to the event hub
66-
await producer.SendAsync(devicesData);
65+
// send the batch of events to the event hub
66+
await producerClient.SendAsync(eventBatch);
6767
}
6868
catch (Exception ex)
6969
{
@@ -73,7 +73,7 @@ private static async Task StartEventGenerationAsync(CancellationToken cancellati
7373

7474
await Task.Delay(1000, cancellationToken);
7575
}
76-
}
76+
}
7777

7878
private static WindTurbineMeasure GenerateTurbineMeasure(string turbineId, int scaleFactor)
7979
{

‎samples/e2e/EventHubsCaptureEventGridDemo/WindTurbineDataGenerator/WindTurbineDataGenerator.csproj‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Azure.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Azure.Core.1.0.0-preview.9\lib\netstandard2.0\Azure.Core.dll</HintPath>
35+
<Reference Include="Azure.Core, Version=1.5.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
36+
<HintPath>..\packages\Azure.Core.1.5.0\lib\net461\Azure.Core.dll</HintPath>
3737
</Reference>
38-
<Reference Include="Azure.Messaging.EventHubs, Version=5.0.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Azure.Messaging.EventHubs.5.0.0-preview.4\lib\netstandard2.0\Azure.Messaging.EventHubs.dll</HintPath>
38+
<Reference Include="Azure.Messaging.EventHubs, Version=5.2.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Azure.Messaging.EventHubs.5.2.0\lib\netstandard2.0\Azure.Messaging.EventHubs.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Microsoft.Azure.Amqp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Microsoft.Azure.Amqp.2.4.2\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
42+
<HintPath>..\packages\Microsoft.Azure.Amqp.2.4.5\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Microsoft.Azure.EventHubs, Version=1.0.2.0, Culture=neutral, PublicKeyToken=7e34167dcc6d6d8c, processorArchitecture=MSIL">
4545
<HintPath>..\packages\Microsoft.Azure.EventHubs.1.0.2\lib\net451\Microsoft.Azure.EventHubs.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0-rc1.19456.4\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
48+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -56,7 +56,7 @@
5656
</Reference>
5757
<Reference Include="System.Core" />
5858
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0-rc1.19456.4\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
59+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
6060
</Reference>
6161
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
6262
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
@@ -78,8 +78,8 @@
7878
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
7979
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.1\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
8080
</Reference>
81-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
81+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
8383
</Reference>
8484
<Reference Include="System.Runtime.Serialization" />
8585
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -107,12 +107,21 @@
107107
<Private>True</Private>
108108
<Private>True</Private>
109109
</Reference>
110+
<Reference Include="System.Text.Encodings.Web, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
111+
<HintPath>..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
112+
</Reference>
113+
<Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
114+
<HintPath>..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
115+
</Reference>
110116
<Reference Include="System.Threading.Channels, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
111-
<HintPath>..\packages\System.Threading.Channels.4.6.0-rc1.19456.4\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
117+
<HintPath>..\packages\System.Threading.Channels.4.6.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
112118
</Reference>
113119
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
114120
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
115121
</Reference>
122+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
123+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
124+
</Reference>
116125
<Reference Include="System.Xml.Linq" />
117126
<Reference Include="System.Data.DataSetExtensions" />
118127
<Reference Include="Microsoft.CSharp" />

‎samples/e2e/EventHubsCaptureEventGridDemo/WindTurbineDataGenerator/packages.config‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Azure.Core" version="1.0.0-preview.9" targetFramework="net461" />
4-
<package id="Azure.Messaging.EventHubs" version="5.0.0-preview.4" targetFramework="net461" />
5-
<package id="Microsoft.Azure.Amqp" version="2.4.2" targetFramework="net461" />
3+
<package id="Azure.Core" version="1.5.0" targetFramework="net461" />
4+
<package id="Azure.Messaging.EventHubs" version="5.2.0" targetFramework="net461" />
5+
<package id="Microsoft.Azure.Amqp" version="2.4.5" targetFramework="net461" />
66
<package id="Microsoft.Azure.EventHubs" version="1.0.2" targetFramework="net461" />
7-
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0-rc1.19456.4" targetFramework="net461" />
7+
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net461" />
88
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
99
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
10-
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0-rc1.19456.4" targetFramework="net461" />
10+
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net461" />
1111
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
1212
<package id="System.Net.WebSockets" version="4.0.0" targetFramework="net461" />
1313
<package id="System.Net.WebSockets.Client" version="4.0.2" targetFramework="net461" />
1414
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
1515
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="net461" />
16-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
16+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
1717
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
1818
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
1919
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
2020
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
2121
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
22-
<package id="System.Threading.Channels" version="4.6.0-rc1.19456.4" targetFramework="net461" />
22+
<package id="System.Text.Encodings.Web" version="4.6.0" targetFramework="net461" />
23+
<package id="System.Text.Json" version="4.6.0" targetFramework="net461" />
24+
<package id="System.Threading.Channels" version="4.6.0" targetFramework="net461" />
2325
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
26+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
2427
</packages>

0 commit comments

Comments
 (0)