Skip to content

Commit c57354d

Browse files
JotaDobleEseJotaDobleEse
authored
Merge branch 'master' into fix/produce-memory-leak
2 parents 5eca111 + 0fc9356 commit c57354d

File tree

65 files changed

+827
-628
lines changed

Some content is hidden

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

65 files changed

+827
-628
lines changed

‎.editorconfig‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# editorconfig.org
22

3+
root = true
4+
5+
[*]
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
311
[*.cs]
412
# Naming rules for fields
513
dotnet_naming_rule.private_fields_with_underscore.symbols = private_field
@@ -35,20 +43,20 @@ dotnet_naming_rule.style_dotnet_naming_rule_DotNetNamingStyle.DoNotUseThisForPri
3543

3644
# name all constant fields using PascalCase
3745
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = warning
38-
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
39-
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
46+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
47+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
4048

41-
dotnet_naming_symbols.constant_fields.applicable_kinds = field
49+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
4250
dotnet_naming_symbols.constant_fields.required_modifiers = const
4351

4452
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
4553

4654
# static fields should have s_ prefix
4755
dotnet_naming_rule.static_fields_should_have_prefix.severity = warning
48-
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
49-
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
56+
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
57+
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
5058

51-
dotnet_naming_symbols.static_fields.applicable_kinds = field
59+
dotnet_naming_symbols.static_fields.applicable_kinds = field
5260
dotnet_naming_symbols.static_fields.required_modifiers = static
5361

5462
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
@@ -74,11 +82,8 @@ csharp_style_expression_bodied_accessors = true:silent
7482
csharp_style_expression_bodied_lambdas = true:silent
7583
csharp_style_expression_bodied_local_functions = false:silent
7684

77-
[*.{cs,vb}]
85+
[*.cs]
7886
dotnet_style_operator_placement_when_wrapping = beginning_of_line
79-
tab_width = 4
80-
indent_size = 4
81-
end_of_line = crlf
8287
dotnet_style_coalesce_expression = true:suggestion
8388
dotnet_style_null_propagation = true:suggestion
8489
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
@@ -93,4 +98,23 @@ dotnet_style_explicit_tuple_names = true:suggestion
9398
dotnet_style_prefer_inferred_tuple_names = true:suggestion
9499
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
95100
dotnet_style_prefer_compound_assignment = true:suggestion
96-
dotnet_style_prefer_simplified_interpolation = true:suggestion
101+
dotnet_style_prefer_simplified_interpolation = true:suggestion
102+
103+
[Makefile]
104+
indent_style = tab
105+
indent_size = 2
106+
107+
[*.csproj]
108+
indent_size = 2
109+
110+
[*.props]
111+
indent_size = 2
112+
113+
[*.js]
114+
indent_size = 2
115+
116+
[*.json]
117+
indent_size = 2
118+
119+
[*.{yaml,yml}]
120+
indent_size = 2

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
failOnWarnings: true
3131

3232
- name: Setup .NET
33-
uses: actions/setup-dotnet@v3
33+
uses: actions/setup-dotnet@v4
3434
with:
35-
dotnet-version: '6.0.x'
35+
dotnet-version: '8.x'
3636

3737
- name: Setup Node
3838
uses: actions/setup-node@v1

‎.github/workflows/deploy-website.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- master
77
- release-*
8-
8+
99
workflow_dispatch:
1010

1111
jobs:
@@ -17,9 +17,9 @@ jobs:
1717
- uses: actions/checkout@v4
1818

1919
- name: Setup .NET
20-
uses: actions/setup-dotnet@v3
20+
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '6.0.x'
22+
dotnet-version: '8.x'
2323

2424
- run: dotnet tool install --global gsferreira.XmlDocMarkdown.Docusaurus --version 0.0.1-beta2 # using this version while the Pull Request isn't accepted here: https://github.com/ejball/XmlDocMarkdown/pull/126
2525
shell: bash
@@ -84,7 +84,7 @@ jobs:
8484
- name: Install dependencies
8585
working-directory: ./website
8686
run: yarn install --frozen-lockfile
87-
87+
8888
- name: Build website
8989
working-directory: ./website
9090
run: yarn build
@@ -93,4 +93,4 @@ jobs:
9393
uses: peaceiris/actions-gh-pages@v3
9494
with:
9595
github_token: ${{ secrets.GITHUB_TOKEN }}
96-
publish_dir: ./website/build
96+
publish_dir: ./website/build

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
- uses: actions/checkout@v4
1313

1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: '6.0.x'
17+
dotnet-version: '8.x'
1818

1919
- name: Setup Node
2020
uses: actions/setup-node@v1

‎.github/workflows/test-deploy-website.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
- uses: actions/checkout@v4
1212

1313
- name: Setup .NET
14-
uses: actions/setup-dotnet@v3
14+
uses: actions/setup-dotnet@v4
1515
with:
16-
dotnet-version: '6.0.x'
16+
dotnet-version: '8.x'
1717

1818
- run: dotnet tool install --global gsferreira.XmlDocMarkdown.Docusaurus --version 0.0.1-beta2 # using this version while the Pull Request isn't accepted here: https://github.com/ejball/XmlDocMarkdown/pull/126
1919
shell: bash
@@ -76,7 +76,7 @@ jobs:
7676
- name: Install dependencies
7777
working-directory: ./website
7878
run: yarn install --frozen-lockfile
79-
79+
8080
- name: Test build website
8181
working-directory: ./website
82-
run: yarn build
82+
run: yarn build

‎KafkaFlow.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaFlow.Sample.OpenTeleme
9898
EndProject
9999
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaFlow.Sample.CooperativeSticky", "samples\KafkaFlow.Sample.CooperativeSticky\KafkaFlow.Sample.CooperativeSticky.csproj", "{DBF7B091-11AE-402F-9F36-7E7EB3901B0B}"
100100
EndProject
101+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KafkaFlow.Sample.WildcardConsumer", "samples\KafkaFlow.Sample.WildcardConsumer\KafkaFlow.Sample.WildcardConsumer.csproj", "{8F6CDF12-5316-4AAF-A1F1-264337585698}"
102+
EndProject
101103
Global
102104
GlobalSection(SolutionConfigurationPlatforms) = preSolution
103105
Debug|Any CPU = Debug|Any CPU
@@ -228,6 +230,10 @@ Global
228230
{DBF7B091-11AE-402F-9F36-7E7EB3901B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
229231
{DBF7B091-11AE-402F-9F36-7E7EB3901B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
230232
{DBF7B091-11AE-402F-9F36-7E7EB3901B0B}.Release|Any CPU.Build.0 = Release|Any CPU
233+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
234+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Debug|Any CPU.Build.0 = Debug|Any CPU
235+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Release|Any CPU.ActiveCfg = Release|Any CPU
236+
{8F6CDF12-5316-4AAF-A1F1-264337585698}.Release|Any CPU.Build.0 = Release|Any CPU
231237
EndGlobalSection
232238
GlobalSection(SolutionProperties) = preSolution
233239
HideSolutionNode = FALSE
@@ -272,6 +278,7 @@ Global
272278
{80080C1D-579E-4AB2-935D-5CFFC51843D8} = {7A9B997B-DAAC-4004-94F3-32F6B88E0068}
273279
{E9E8B374-4165-45F2-8DF5-F141E141AC1D} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
274280
{DBF7B091-11AE-402F-9F36-7E7EB3901B0B} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
281+
{8F6CDF12-5316-4AAF-A1F1-264337585698} = {303AE78F-6C96-4DF4-AC89-5C4FD53AFF0B}
275282
EndGlobalSection
276283
GlobalSection(ExtensibilityGlobals) = postSolution
277284
SolutionGuid = {6AE955B5-16B0-41CF-9F12-66D15B3DD1AB}

‎docker-compose.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
services:
22
zookeeper:
3-
image: confluentinc/cp-zookeeper:7.2.1
3+
image: confluentinc/cp-zookeeper:7.8.0
44
hostname: zookeeper
55
container_name: zookeeper
66
ports:
77
- "2181:2181"
88
environment:
99
ZOOKEEPER_CLIENT_PORT: 2181
1010
ZOOKEEPER_TICK_TIME: 2000
11-
11+
1212
broker:
13-
image: confluentinc/cp-server:7.2.1
13+
image: confluentinc/cp-server:7.8.0
1414
hostname: broker
1515
container_name: broker
1616
depends_on:
@@ -42,9 +42,9 @@ services:
4242
interval: 10s
4343
timeout: 5s
4444
retries: 5
45-
45+
4646
schema-registry:
47-
image: confluentinc/cp-schema-registry:7.2.1
47+
image: confluentinc/cp-schema-registry:7.8.0
4848
hostname: schema-registry
4949
container_name: schema-registry
5050
depends_on:
@@ -56,10 +56,10 @@ services:
5656
SCHEMA_REGISTRY_HOST_NAME: schema-registry
5757
SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'broker:29092'
5858
SCHEMA_REGISTRY_LISTENERS: http://0.0.0.0:8081
59-
59+
6060
kafka-tools:
61-
image: confluentinc/cp-kafka:7.0.5
61+
image: confluentinc/cp-kafka:7.8.0
6262
hostname: kafka
6363
container_name: kafka
6464
command: ["tail", "-f", "/dev/null"]
65-
network_mode: "host"
65+
network_mode: "host"

‎samples/KafkaFlow.Sample.BatchOperations/KafkaFlow.Sample.BatchOperations.csproj‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<IsPackable>false</IsPackable>
7-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8-
<InvariantGlobalization>true</InvariantGlobalization>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<IsPackable>false</IsPackable>
7+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8+
<InvariantGlobalization>true</InvariantGlobalization>
9+
</PropertyGroup>
1010

11-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12-
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
13-
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12+
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
13+
</PropertyGroup>
1414

15-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
16-
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
17-
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
16+
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
17+
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
21-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
21+
</ItemGroup>
2222

23-
<ItemGroup>
24-
<ProjectReference Include="..\..\src\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
25-
<ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
26-
<ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
27-
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
28-
<ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
29-
</ItemGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\..\src\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
25+
<ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
26+
<ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
27+
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
28+
<ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
29+
</ItemGroup>
3030

3131
</Project>

‎samples/KafkaFlow.Sample.ConsumerThrottling/KafkaFlow.Sample.ConsumerThrottling.csproj‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<IsPackable>false</IsPackable>
7-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8-
<InvariantGlobalization>true</InvariantGlobalization>
9-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<IsPackable>false</IsPackable>
7+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8+
<InvariantGlobalization>true</InvariantGlobalization>
9+
</PropertyGroup>
1010

11-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12-
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
13-
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
12+
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
13+
</PropertyGroup>
1414

15-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
16-
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
17-
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
16+
<NoWarn>1701;1702;CS1591;SA1600</NoWarn>
17+
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<ProjectReference Include="..\..\src\KafkaFlow.Extensions.Hosting\KafkaFlow.Extensions.Hosting.csproj" />
21-
<ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
22-
<ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
23-
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
24-
<ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
25-
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\..\src\KafkaFlow.Extensions.Hosting\KafkaFlow.Extensions.Hosting.csproj" />
21+
<ProjectReference Include="..\..\src\KafkaFlow.LogHandler.Console\KafkaFlow.LogHandler.Console.csproj" />
22+
<ProjectReference Include="..\..\src\KafkaFlow.Microsoft.DependencyInjection\KafkaFlow.Microsoft.DependencyInjection.csproj" />
23+
<ProjectReference Include="..\..\src\KafkaFlow.Serializer.JsonCore\KafkaFlow.Serializer.JsonCore.csproj" />
24+
<ProjectReference Include="..\..\src\KafkaFlow\KafkaFlow.csproj" />
25+
</ItemGroup>
2626

27-
<ItemGroup>
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
30-
</ItemGroup>
27+
<ItemGroup>
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
30+
</ItemGroup>
3131

3232
</Project>

‎samples/KafkaFlow.Sample.CooperativeSticky/KafkaFlow.Sample.CooperativeSticky.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
3030
</ItemGroup>
3131

3232

0 commit comments

Comments
 (0)