Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consumer group per consumer type #GCPActive #317

Merged
merged 4 commits into from
Nov 27, 2023
Merged

consumer group per consumer type #GCPActive #317

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8f3bc0
consumer group per consumer type #GCPActive
acn-sbuad Nov 27, 2023
e927cb9
retention time set on topic generation #GCPActive
acn-sbuad Nov 27, 2023
cff0a06
support infinite retention time
acn-sbuad Nov 27, 2023
2875f70
deleted flaky test
acn-sbuad Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Altinn.Notifications.Integrations/Configuration/KafkaSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,9 @@ public class AdminSettings
/// The list of topics the admin client is responsible for ensuring that exist
/// </summary>
public List<string> TopicList { get; set; } = new List<string>();

/// <summary>
/// The retention time in days for the topics
/// </summary>
public int RetentionTime { get; set; } = 7;
}
2 changes: 1 addition & 1 deletion src/Altinn.Notifications.Integrations/Kafka/Consumers/KafkaConsumerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected KafkaConsumerBase(

var consumerConfig = new ConsumerConfig(config.ConsumerSettings)
{
GroupId = settings.Value.Consumer.GroupId,
GroupId = $"{settings.Value.Consumer.GroupId}-{GetType().Name.ToLower()}",
EnableAutoCommit = false,
EnableAutoOffsetStore = false,
AutoOffsetReset = AutoOffsetReset.Earliest,
Expand Down
3 changes: 2 additions & 1 deletion src/Altinn.Notifications.Integrations/Kafka/Producers/KafkaProducer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ private void EnsureTopicsExist()
{
Name = topic,
NumPartitions = TopicSpecification.NumPartitions,
ReplicationFactor = TopicSpecification.ReplicationFactor
ReplicationFactor = TopicSpecification.ReplicationFactor,
Configs = TopicSpecification.Configs
}
}).Wait();
_logger.LogInformation("// KafkaProducer // EnsureTopicsExists // Topic '{Topic}' created successfully.", topic);
Expand Down
6 changes: 6 additions & 0 deletions src/Altinn.Notifications.Integrations/Kafka/SharedClientConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,14 @@ public SharedClientConfig(Configuration.KafkaSettings settings)
consumerConfig.SaslUsername = settings.Consumer.SaslUsername;
consumerConfig.SaslPassword = settings.Consumer.SaslPassword;

string retentionTime = settings.Admin.RetentionTime < 0 ? "-1" : TimeSpan.FromDays(settings.Admin.RetentionTime).TotalMilliseconds.ToString();
topicSpec.NumPartitions = 6;
topicSpec.ReplicationFactor = 3;
topicSpec.Configs = new Dictionary<string, string>()
{
{ "retention.ms", retentionTime },
{ "cleanup.policy", "delete" }
};
}

AdminClientSettings = adminConfig;
Expand Down
Loading