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

feat: enable Kafka configuration via the environment or convict #143

Merged
merged 3 commits into from
May 24, 2024
Merged

feat: enable Kafka configuration via the environment or convict #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe3e279
feat: enable Kafka configuration via the environment
kalinkrustev May 21, 2024
e019104
test: coverage
kalinkrustev May 21, 2024
20c9204
feat: enable Kafka configuration via the environment
kalinkrustev May 22, 2024
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
7 changes: 7 additions & 0 deletions src/kafka/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const insertDots = object => Object.fromEntries(Object.entries(object).map(([key, value]) => [key.replace(/[A-Z]/g, s => '.' + s.toLowerCase()), value]))

module.exports = config => config && ({
...config,
rdkafkaConf: config.rdkafkaConf && insertDots(config.rdkafkaConf),
topicConf: config.topicConf && insertDots(config.topicConf)
})
2 changes: 2 additions & 0 deletions src/kafka/consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const Logger = require('@mojaloop/central-services-logger')
const Kafka = require('node-rdkafka')

const Protocol = require('./protocol')
const getConfig = require('./config')

const connectedClients = new Set()
require('async-exit-hook')(callback => Promise.allSettled(
Expand Down Expand Up @@ -205,6 +206,7 @@ exports.ENUMS = ENUMS
class Consumer extends EventEmitter {
constructor (topics = [], config = {}) {
super()
config = getConfig(config)
if (!config.options) {
config.options = {
mode: CONSUMER_MODES.recursive,
Expand Down
2 changes: 2 additions & 0 deletions src/kafka/producer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const EventEmitter = require('events')
const Logger = require('@mojaloop/central-services-logger')
const Kafka = require('node-rdkafka')
const Protocol = require('./protocol')
const getConfig = require('./config')

const connectedClients = new Set()
require('async-exit-hook')(callback => Promise.allSettled(
Expand Down Expand Up @@ -153,6 +154,7 @@ const
class Producer extends EventEmitter {
constructor (config = {}) {
super()
config = getConfig(config)
if (!config) {
config = {}
}
Expand Down
3 changes: 3 additions & 0 deletions src/util/consumer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ const createHandler = async (topicName, config, command) => {
if (config.rdkafkaConf !== undefined && config.rdkafkaConf['enable.auto.commit'] !== undefined) {
autoCommitEnabled = config.rdkafkaConf['enable.auto.commit']
}
if (config.rdkafkaConf !== undefined && config.rdkafkaConf.enableAutoCommit !== undefined) {
autoCommitEnabled = config.rdkafkaConf.enableAutoCommit
}

let connectedTimeStamp = 0
try {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/kafka/consumer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Test('Consumer test', (consumerTests) => {
consumeTimeout: 1000
},
rdkafkaConf: {
'client.id': 'default-client',
clientId: 'default-client',
'group.id': 'kafka-test',
'metadata.broker.list': 'localhost:9092',
'enable.auto.commit': false
Expand Down