Skip to content

Commit a20252e

Browse files
emasabanchitj
emasab
and
anchitj
authored
2.4.0-RC2 release (#2212)
[KIP-848] Make Kafka integration test run with new protocol too * 2.4.0-RC2 release * PR Feedback * [KIP-848] Make Kafka integration test run with new protocol too * Dedicated docker-compose for KRaft * Increase sleep * CHANGELOG * Use a fixed commit even if a tag is still not available * Revert log file append * Fix flaky tests with KRaft --------- Co-authored-by: Anchit Jain <[email protected]>
1 parent c251c6c commit a20252e

File tree

118 files changed

+603
-228
lines changed

Some content is hidden

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

118 files changed

+603
-228
lines changed

‎.semaphore/semaphore.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,21 @@ blocks:
119119
commands:
120120
- docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY
121121
jobs:
122-
- name: 'Build and test'
122+
- name: 'Build and test with "classic" protocol'
123123
commands:
124124
- cd test/docker && docker-compose up -d && sleep 30 && cd ../..
125-
- export SEMAPHORE_SKIP_FLAKY_TETSTS='true'
125+
- export SEMAPHORE_SKIP_FLAKY_TESTS='true'
126126
- dotnet restore
127127
- cd test/Confluent.Kafka.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
128+
- name: 'Build and test with "consumer" protocol'
129+
commands:
130+
- cd test/docker && docker-compose -f docker-compose-kraft.yaml up -d && cd ../..
131+
- sleep 300
132+
- export SEMAPHORE_SKIP_FLAKY_TESTS='true'
133+
- export TEST_CONSUMER_GROUP_PROTOCOL=consumer
134+
- dotnet restore
135+
- cd test/Confluent.Kafka.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
136+
128137
- name: 'Schema registry and serdes integration tests'
129138
dependencies: [ ]
130139
task:
@@ -138,7 +147,7 @@ blocks:
138147
- name: 'Build and test'
139148
commands:
140149
- cd test/docker && docker-compose up -d && cd ../..
141-
- export SEMAPHORE_SKIP_FLAKY_TETSTS='true'
150+
- export SEMAPHORE_SKIP_FLAKY_TESTS='true'
142151
- dotnet restore
143152
- cd test/Confluent.SchemaRegistry.Serdes.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
144153
# - cd test/Confluent.SchemaRegistry.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 2.4.0
2+
3+
## Enhancements
4+
5+
- References librdkafka.redist 2.4.0. Refer to the [librdkafka v2.4.0 release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.4.0) for more information.
6+
- [KIP-848 EA](https://cwiki.apache.org/confluence/display/KAFKA/KIP-848%3A+The+Next+Generation+of+the+Consumer+Rebalance+Protocol):
7+
Integration tests running with the new consumer group protocol. The feature is an Early Access: not production ready, still not supported (#2212).
8+
9+
110
# 2.3.0
211

312
## Enhancements

‎Confluent.Kafka.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthProducer", "examples\O
7171
EndProject
7272
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonWithReferences", "examples\JsonWithReferences\JsonWithReferences.csproj", "{2931D890-9420-4EA7-BCEE-AAD53108A629}"
7373
EndProject
74+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confluent.Kafka.TestsCommon", "test\Confluent.Kafka.TestsCommon\Confluent.Kafka.TestsCommon.csproj", "{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}"
75+
EndProject
7476
Global
7577
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7678
Debug|Any CPU = Debug|Any CPU
@@ -456,6 +458,18 @@ Global
456458
{2931D890-9420-4EA7-BCEE-AAD53108A629}.Release|x64.Build.0 = Release|Any CPU
457459
{2931D890-9420-4EA7-BCEE-AAD53108A629}.Release|x86.ActiveCfg = Release|Any CPU
458460
{2931D890-9420-4EA7-BCEE-AAD53108A629}.Release|x86.Build.0 = Release|Any CPU
461+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
462+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|Any CPU.Build.0 = Debug|Any CPU
463+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|x64.ActiveCfg = Debug|Any CPU
464+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|x64.Build.0 = Debug|Any CPU
465+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|x86.ActiveCfg = Debug|Any CPU
466+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Debug|x86.Build.0 = Debug|Any CPU
467+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|Any CPU.ActiveCfg = Release|Any CPU
468+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|Any CPU.Build.0 = Release|Any CPU
469+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|x64.ActiveCfg = Release|Any CPU
470+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|x64.Build.0 = Release|Any CPU
471+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|x86.ActiveCfg = Release|Any CPU
472+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356}.Release|x86.Build.0 = Release|Any CPU
459473
EndGlobalSection
460474
GlobalSection(NestedProjects) = preSolution
461475
{09C3255B-1972-4EB8-91D0-FB9F5CD82BCB} = {1EFCD839-0726-4BCE-B745-1E829991B1BC}
@@ -486,5 +500,6 @@ Global
486500
{98D7F3E1-80EE-437C-8915-528BFD80E9B2} = {1EFCD839-0726-4BCE-B745-1E829991B1BC}
487501
{8F582FFF-EA30-47F1-89D2-81A37F5E7E0C} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8}
488502
{2931D890-9420-4EA7-BCEE-AAD53108A629} = {9CE4B5F7-9251-4340-BACB-207066A5DBE8}
503+
{1DDD2809-5B7B-4B95-80D3-A3A516D6D356} = {90058283-1F8F-465D-89E4-D4374A27E612}
489504
EndGlobalSection
490505
EndGlobal

‎examples/AdminClient/AdminClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.3.0" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.4.0-RC2" /> -->
1313
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1414
</ItemGroup>
1515

‎examples/AvroBlogExamples/AvroBlogExamples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.3.0" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.4.0-RC2" /> -->
1212
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1313
</ItemGroup>
1414

‎examples/AvroGeneric/AvroGeneric.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.3.0" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.4.0-RC2" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1414
</ItemGroup>
1515

‎examples/AvroSpecific/AvroSpecific.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.3.0" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.4.0-RC2" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1414
</ItemGroup>
1515

‎examples/Configuration/Configuration.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.3.0" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.4.0-RC2" /> -->
1212
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1313
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />

‎examples/ConfluentCloud/ConfluentCloud.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.3.0" /> -->
10+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.4.0-RC2" /> -->
1111
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1212
</ItemGroup>
1313

‎examples/Consumer/Consumer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.3.0" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="2.4.0-RC2" /> -->
1212
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)