Skip to content

Commit 3e12279

Browse files
reformatted (#482)
1 parent 1aeacf5 commit 3e12279

File tree

135 files changed

+11457
-10372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+11457
-10372
lines changed

.editorconfig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ dotnet_style_null_propagation = true:warning
4848
dotnet_style_explicit_tuple_names = true:warning
4949

5050
# Naming
51-
dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods
52-
dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
51+
dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods
52+
dotnet_naming_rule.async_methods_end_in_async.style = end_in_async
5353
dotnet_naming_rule.async_methods_end_in_async.severity = warning
54-
dotnet_naming_symbols.any_async_methods.applicable_kinds = method
54+
dotnet_naming_symbols.any_async_methods.applicable_kinds = method
5555
dotnet_naming_symbols.any_async_methods.applicable_accessibilities = *
56-
dotnet_naming_symbols.any_async_methods.required_modifiers = async
56+
dotnet_naming_symbols.any_async_methods.required_modifiers = async
5757
dotnet_naming_style.end_in_async.required_suffix = Async
58-
dotnet_naming_style.end_in_async.capitalization = pascal_case
58+
dotnet_naming_style.end_in_async.capitalization = pascal_case
5959

6060
# CSharp code style settings:
6161
[*.cs]
@@ -90,7 +90,7 @@ csharp_preserve_single_line_statements = false
9090

9191
# VS 2017 15.5
9292
[*.cs]
93-
csharp_prefer_inferred_tuple_names = true:warning
93+
csharp_prefer_inferred_tuple_names = true:warning
9494
csharp_prefer_inferred_anonymous_type_member_names = true:warning
9595
csharp_style_pattern_local_over_anonymous_function = true:warning
9696
csharp_style_deconstructed_variable_declaration = true:warning

Akka.Streams.Kafka.sln.DotSettings

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Full_0020cleanup_0020with_0020file_0020header/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Full cleanup with file header"&gt;&lt;CppReformatCode&gt;True&lt;/CppReformatCode&gt;&lt;FSharpReformatCode&gt;True&lt;/FSharpReformatCode&gt;&lt;ShaderLabReformatCode&gt;True&lt;/ShaderLabReformatCode&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CppCodeStyleCleanupDescriptor ArrangeBraces="True" ArrangeAuto="True" ArrangeFunctionDeclarations="True" ArrangeNestedNamespaces="True" ArrangeTypeAliases="True" ArrangeCVQualifiers="True" ArrangeSlashesInIncludeDirectives="True" ArrangeOverridingFunctions="True" SortIncludeDirectives="True" SortMemberInitializers="True" /&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CppUpdateFileHeader&gt;True&lt;/CppUpdateFileHeader&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
3+
&amp;lt;option name="myName" value="Full cleanup with file header" /&amp;gt;&#xD;
4+
&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;RIDER_SETTINGS&gt;&amp;lt;profile&amp;gt;&#xD;
5+
&amp;lt;Language id="CSS"&amp;gt;&#xD;
6+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
7+
&amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
8+
&amp;lt;/Language&amp;gt;&#xD;
9+
&amp;lt;Language id="EditorConfig"&amp;gt;&#xD;
10+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
11+
&amp;lt;/Language&amp;gt;&#xD;
12+
&amp;lt;Language id="HTML"&amp;gt;&#xD;
13+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
14+
&amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
15+
&amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
16+
&amp;lt;/Language&amp;gt;&#xD;
17+
&amp;lt;Language id="HTTP Request"&amp;gt;&#xD;
18+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
19+
&amp;lt;/Language&amp;gt;&#xD;
20+
&amp;lt;Language id="Handlebars"&amp;gt;&#xD;
21+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
22+
&amp;lt;/Language&amp;gt;&#xD;
23+
&amp;lt;Language id="Ini"&amp;gt;&#xD;
24+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
25+
&amp;lt;/Language&amp;gt;&#xD;
26+
&amp;lt;Language id="JSON"&amp;gt;&#xD;
27+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
28+
&amp;lt;/Language&amp;gt;&#xD;
29+
&amp;lt;Language id="Jade"&amp;gt;&#xD;
30+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
31+
&amp;lt;/Language&amp;gt;&#xD;
32+
&amp;lt;Language id="JavaScript"&amp;gt;&#xD;
33+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
34+
&amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
35+
&amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
36+
&amp;lt;/Language&amp;gt;&#xD;
37+
&amp;lt;Language id="Markdown"&amp;gt;&#xD;
38+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
39+
&amp;lt;/Language&amp;gt;&#xD;
40+
&amp;lt;Language id="PowerShell"&amp;gt;&#xD;
41+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
42+
&amp;lt;/Language&amp;gt;&#xD;
43+
&amp;lt;Language id="Properties"&amp;gt;&#xD;
44+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
45+
&amp;lt;/Language&amp;gt;&#xD;
46+
&amp;lt;Language id="RELAX-NG"&amp;gt;&#xD;
47+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
48+
&amp;lt;/Language&amp;gt;&#xD;
49+
&amp;lt;Language id="Razor"&amp;gt;&#xD;
50+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
51+
&amp;lt;/Language&amp;gt;&#xD;
52+
&amp;lt;Language id="SQL"&amp;gt;&#xD;
53+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
54+
&amp;lt;/Language&amp;gt;&#xD;
55+
&amp;lt;Language id="VueExpr"&amp;gt;&#xD;
56+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
57+
&amp;lt;/Language&amp;gt;&#xD;
58+
&amp;lt;Language id="XML"&amp;gt;&#xD;
59+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
60+
&amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
61+
&amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
62+
&amp;lt;/Language&amp;gt;&#xD;
63+
&amp;lt;Language id="yaml"&amp;gt;&#xD;
64+
&amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
65+
&amp;lt;/Language&amp;gt;&#xD;
66+
&amp;lt;/profile&amp;gt;&lt;/RIDER_SETTINGS&gt;&lt;/Profile&gt;</s:String>
67+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">-----------------------------------------------------------------------
68+
&lt;copyright file="${File.FileName}" company="Akka.NET Project"&gt;
69+
Copyright (C) ${File.CreatedYear} - ${CurrentDate.Year} .NET Foundation &lt;https://github.com/akkadotnet/akka.net&gt;
70+
&lt;/copyright&gt;
71+
-----------------------------------------------------------------------</s:String></wpf:ResourceDictionary>

Directory.Build.props

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,55 @@
1010
<VersionPrefix>1.5.39</VersionPrefix>
1111
<PackageReleaseNotes>Akka.Streams.Kafka 1.5.39 represents a major improvement in stability and performance for Kafka stream processing, particularly for applications using manual partition assignment and rebalancing scenarios. This release includes critical fixes for partition management and introduces new performance tuning capabilities that give users more control over their Kafka consumer behavior.
1212

13-
**Key Improvements**
13+
**Key Improvements**
1414

15-
* Improved stability during partition rebalancing operations
16-
* Enhanced manual partition assignment behavior
17-
* Significantly more reliable and improved committing performance
18-
* New performance tuning capabilities for consumer polling
19-
* Better handling of partition revocation scenarios
20-
* Improved memory efficiency through C# record types
15+
* Improved stability during partition rebalancing operations
16+
* Enhanced manual partition assignment behavior
17+
* Significantly more reliable and improved committing performance
18+
* New performance tuning capabilities for consumer polling
19+
* Better handling of partition revocation scenarios
20+
* Improved memory efficiency through C# record types
2121

22-
**Breaking Changes**
23-
* Manual partition assignment now uses `IncrementalAssign` instead of `Assign` - this prevents offset resets for users running `ManualSubscription`s. If you're using manual partition assignment, you'll need to verify your offset management logic is compatible with incremental assignment behavior.
24-
* Several internal types have been converted from classes to C# `record`s for better performance and nullability support. This change should be transparent for most users as records are fully compatible with standard class usage patterns. The only potential impact would be if you're using inheritance on these types (which is not a recommended pattern for Akka.Streams.Kafka types).
25-
* We removed some extension methods that should have never been made `public` in the first place.
26-
* We made some changes to `ICommittable` interface and others.
22+
**Breaking Changes**
23+
* Manual partition assignment now uses `IncrementalAssign` instead of `Assign` - this prevents offset resets for users running `ManualSubscription`s. If you're using manual partition assignment, you'll need to verify your offset management logic is compatible with incremental assignment behavior.
24+
* Several internal types have been converted from classes to C# `record`s for better performance and nullability support. This change should be transparent for most users as records are fully compatible with standard class usage patterns. The only potential impact would be if you're using inheritance on these types (which is not a recommended pattern for Akka.Streams.Kafka types).
25+
* We removed some extension methods that should have never been made `public` in the first place.
26+
* We made some changes to `ICommittable` interface and others.
2727

28-
**Major Bug Fixes and Improvements**
29-
* [Fixed critical issue: Exception inside SelectAsync with null cancellation cause](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/426)
30-
* [Resolved: System.ArgumentException during rebalance operations](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/415)
31-
* [Added performance tuning capability through ConsumerSettings.MaxPollRecords](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/453)
32-
* [Improved partition management: filtering messages from revoked partitions](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/452)
33-
* [Enhanced stability: filtering out buffered records from recently revoked partitions](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/450)
28+
**Major Bug Fixes and Improvements**
29+
* [Fixed critical issue: Exception inside SelectAsync with null cancellation cause](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/426)
30+
* [Resolved: System.ArgumentException during rebalance operations](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/415)
31+
* [Added performance tuning capability through ConsumerSettings.MaxPollRecords](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/453)
32+
* [Improved partition management: filtering messages from revoked partitions](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/452)
33+
* [Enhanced stability: filtering out buffered records from recently revoked partitions](https://github.com/akkadotnet/Akka.Streams.Kafka/pull/450)
3434

35-
**Performance Data**
35+
**Performance Data**
3636

37-
For the `PlainSource`:
37+
For the `PlainSource`:
3838

39-
```
40-
41-
BenchmarkDotNet v0.14.0, Pop!_OS 22.04 LTS
42-
13th Gen Intel Core i7-1360P, 1 CPU, 16 logical and 12 physical cores
43-
.NET SDK 9.0.100
44-
[Host] : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
45-
LongRun : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
46-
47-
Job=LongRun EvaluateOverhead=False Concurrent=True
48-
Server=True InvocationCount=1 IterationCount=10
49-
LaunchCount=3 RunStrategy=Monitoring UnrollFactor=1
50-
WarmupCount=3 Categories=MacroBenchmark,Consumer,Plain
51-
52-
```
53-
| Method | PollBatchSize | Mean | Error | StdDev | msg/sec |
54-
|-------------------- |-------------- |---------:|---------:|---------:|----------:|
55-
| ConsumeMessageAsync | 500 | 41.29 μs | 1.960 μs | 2.933 μs | 24,217.30 |
39+
```
5640

57-
This is a ~2.5x improvement over what v1.5.38 was able to achieve.
41+
BenchmarkDotNet v0.14.0, Pop!_OS 22.04 LTS
42+
13th Gen Intel Core i7-1360P, 1 CPU, 16 logical and 12 physical cores
43+
.NET SDK 9.0.100
44+
[Host] : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
45+
LongRun : .NET 9.0.0 (9.0.24.52809), X64 RyuJIT AVX2
5846

59-
**Dependencies**
60-
* [Upgraded to Akka.NET v1.5.39](https://github.com/akkadotnet/akka.net/releases/tag/1.5.39)</PackageReleaseNotes>
47+
Job=LongRun EvaluateOverhead=False Concurrent=True
48+
Server=True InvocationCount=1 IterationCount=10
49+
LaunchCount=3 RunStrategy=Monitoring UnrollFactor=1
50+
WarmupCount=3 Categories=MacroBenchmark,Consumer,Plain
51+
52+
```
53+
| Method | PollBatchSize | Mean | Error | StdDev | msg/sec |
54+
|-------------------- |-------------- |---------:|---------:|---------:|----------:|
55+
| ConsumeMessageAsync | 500 | 41.29 μs | 1.960 μs | 2.933 μs | 24,217.30 |
56+
57+
This is a ~2.5x improvement over what v1.5.38 was able to achieve.
58+
59+
**Dependencies**
60+
* [Upgraded to Akka.NET v1.5.39](https://github.com/akkadotnet/akka.net/releases/tag/1.5.39)
61+
</PackageReleaseNotes>
6162
</PropertyGroup>
6263
<PropertyGroup>
6364
<!-- Visual Studio C# settings -->
@@ -66,11 +67,11 @@ This is a ~2.5x improvement over what v1.5.38 was able to achieve.
6667
<NetCoreTestVersion>net9.0</NetCoreTestVersion>
6768
</PropertyGroup>
6869
<ItemGroup>
69-
<Using Include="Akka.Event" />
70+
<Using Include="Akka.Event"/>
7071
</ItemGroup>
7172
<!-- GitHub SourceLink -->
7273
<ItemGroup>
73-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
74+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
7475
</ItemGroup>
7576
<!-- NuGet package properties -->
7677
<PropertyGroup>
@@ -84,6 +85,7 @@ This is a ~2.5x improvement over what v1.5.38 was able to achieve.
8485
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Streams.Kafka</PackageProjectUrl>
8586
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8687
<PackageReleaseNotes>* [Upgraded to Akka.NET v1.5.39](https://github.com/akkadotnet/akka.net/releases/tag/1.5.39)
87-
* [Resolved: Kafka Producer - Exception occured inside SelectAsync - Cancellation cause must not be null](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/426)</PackageReleaseNotes>
88+
* [Resolved: Kafka Producer - Exception occured inside SelectAsync - Cancellation cause must not be null](https://github.com/akkadotnet/Akka.Streams.Kafka/issues/426)
89+
</PackageReleaseNotes>
8890
</PropertyGroup>
8991
</Project>

Directory.Packages.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@
99
</PropertyGroup>
1010
<!-- App dependencies -->
1111
<ItemGroup>
12-
<PackageVersion Include="Akka.Streams" Version="$(AkkaVersion)" />
13-
<PackageVersion Include="Confluent.Kafka" Version="2.8.0" />
14-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
15-
<PackageVersion Include="Polyfill" Version="7.21.0" />
16-
<PackageVersion Include="Testcontainers.Kafka" Version="4.1.0" />
12+
<PackageVersion Include="Akka.Streams" Version="$(AkkaVersion)"/>
13+
<PackageVersion Include="Confluent.Kafka" Version="2.8.0"/>
14+
<PackageVersion Include="coverlet.collector" Version="6.0.4"/>
15+
<PackageVersion Include="Polyfill" Version="7.21.0"/>
16+
<PackageVersion Include="Testcontainers.Kafka" Version="4.1.0"/>
1717
</ItemGroup>
1818
<!-- Test dependencies -->
1919
<ItemGroup>
20-
<PackageVersion Include="EntityFramework" Version="6.4.4" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
22-
<PackageVersion Include="xunit" Version="2.8.1" />
23-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
24-
<PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
25-
<PackageVersion Include="Akka.Streams.TestKit" Version="$(AkkaVersion)" />
26-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
27-
<PackageVersion Include="Docker.DotNet" Version="3.125.15" />
28-
<PackageVersion Include="NDesk.Options.Core" Version="1.2.5" />
29-
<PackageVersion Include="Tmds.ExecFunction" Version="0.6.0" />
30-
<PackageVersion Include="Universe.CpuUsage" Version="2.2.497.598" />
31-
<PackageVersion Include="FakeItEasy" Version="7.4.0" />
32-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
20+
<PackageVersion Include="EntityFramework" Version="6.4.4"/>
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
22+
<PackageVersion Include="xunit" Version="2.8.1"/>
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1"/>
24+
<PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)"/>
25+
<PackageVersion Include="Akka.Streams.TestKit" Version="$(AkkaVersion)"/>
26+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0"/>
27+
<PackageVersion Include="Docker.DotNet" Version="3.125.15"/>
28+
<PackageVersion Include="NDesk.Options.Core" Version="1.2.5"/>
29+
<PackageVersion Include="Tmds.ExecFunction" Version="0.6.0"/>
30+
<PackageVersion Include="Universe.CpuUsage" Version="2.2.497.598"/>
31+
<PackageVersion Include="FakeItEasy" Version="7.4.0"/>
32+
<PackageVersion Include="FluentAssertions" Version="6.12.0"/>
3333
</ItemGroup>
3434
<!-- SourceLink support for all Akka.NET projects -->
3535
<ItemGroup>
36-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
36+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
3737
</ItemGroup>
3838
</Project>

0 commit comments

Comments
 (0)