Merge pull request #37 from ElifBayrakdar/feature/issue-36

#36 Add Acks to ProducerConfig if exists in configuration as Producer
Trendyol · Feb 9, 2024 · d49097c · d49097c
2 parents ae7d973 + affca85
commit d49097c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
  name: Build & push Docker image
  with:
  image: kafka-retry-job
- tags: 1.12.0, latest
+ tags: 1.12.1, latest
  registry: ghcr.io
  username: ${{ secrets.GHCR_USERNAME }}
  password: ${{ secrets.GHCR_TOKEN }}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 
 variables:
- VERSION: "1.12.0"
+ VERSION: "1.12.1"
  DOCKER_IMAGE_VERSION: $GITLAB_REGISTRY_HOST/$CI_PROJECT_PATH:$VERSION
  DOCKER_IMAGE_LATEST: $GITLAB_REGISTRY_HOST/$CI_PROJECT_PATH
 

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.12.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.16.4) (2024-02)
+
+**Closed issues:**
+
+- [\#36](https://github.com/Trendyol/kafka-retry-job/issues/36) Add Acks to ProducerConfig if exists in configuration as ProducerAcks
+
+**Merged pull requests:**
+
+- Pull Request for the issues #36 [\#37](https://github.com/Trendyol/kafka-retry-job/pull/37) ([elifbayrakdar](https://github.com/elifbayrakdar))
+
+
 ## [1.12.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.16.4) (2024-01)
 
 **Closed issues:**

diff --git a/src/Helpers/Constants.cs b/src/Helpers/Constants.cs
@@ -1,13 +1,10 @@
-using Confluent.Kafka;
-
 namespace KafkaRetry.Job.Helpers;
 
 public static class Constants
 {
  public static class ProducerConfigDefaults
  {
  public const bool EnableIdempotence = true;
- public const Acks Acks = Confluent.Kafka.Acks.Leader;
  public const int BatchSize = 1000000;
  public const string ClientId = "rdkafka";
  public const double LingerMs = 5;

diff --git a/src/Services/Implementations/ConfigurationService.cs b/src/Services/Implementations/ConfigurationService.cs
@@ -37,7 +37,7 @@ public ConfigurationService(IConfiguration configuration)
  public bool EnableIdempotence => GetValue<bool?>("ProducerEnableIdempotence") ??
  Constants.ProducerConfigDefaults.EnableIdempotence;
 
- public Acks? Acks => GetValue<Acks?>("ProducerAcks") ?? Constants.ProducerConfigDefaults.Acks;
+ public Acks? Acks => GetValue<Acks?>("ProducerAcks");
 
  public int BatchSize =>
  GetValue<int?>("ProducerBatchSize") ?? Constants.ProducerConfigDefaults.BatchSize;

diff --git a/src/Services/Implementations/KafkaService.cs b/src/Services/Implementations/KafkaService.cs
@@ -57,7 +57,7 @@ private AdminClientConfig CreateAdminClientConfig(string bootstrapServers)
 
  private ProducerConfig CreateProducerConfig(string bootstrapServers)
  {
- return new ProducerConfig
+ var producerConfig = new ProducerConfig
  {
  BootstrapServers = bootstrapServers,
  SaslUsername = _configuration.SaslUsername ?? string.Empty,
@@ -67,14 +67,19 @@ private ProducerConfig CreateProducerConfig(string bootstrapServers)
  SecurityProtocol = _configuration.SecurityProtocol,
  SslKeystorePassword = _configuration.SslKeystorePassword ?? string.Empty,
  EnableIdempotence = _configuration.EnableIdempotence,
- Acks = _configuration.Acks,
  BatchSize = _configuration.BatchSize,
  ClientId = _configuration.ClientId,
  LingerMs = _configuration.LingerMs,
  MessageTimeoutMs = _configuration.MessageTimeoutMs,
  RequestTimeoutMs = _configuration.RequestTimeoutMs,
  MessageMaxBytes = _configuration.MessageMaxBytes
  };
+
+ if (_configuration.Acks is not null)
+ {
+ producerConfig.Acks = _configuration.Acks;
+ }
+ return producerConfig;
  }
 
  private ConsumerConfig CreateConsumerConfig(string bootstrapServers, string groupId)